1
0
Bläddra i källkod

Merge pull request #580 from mkroehnert/grunt-helios

Add Helios and other missing .st files to grunt amberc:all
Nicolas Petton 11 år sedan
förälder
incheckning
c740486cbb
4 ändrade filer med 15 tillägg och 7 borttagningar
  1. 9 1
      Gruntfile.js
  2. 2 2
      js/Helios-Core.deploy.js
  3. 3 3
      js/Helios-Core.js
  4. 1 1
      st/Helios-Core.st

+ 9 - 1
Gruntfile.js

@@ -39,8 +39,16 @@ module.exports = function(grunt) {
               'st/Importer-Exporter.st', 'st/Compiler-Exceptions.st', 'st/Compiler-Core.st', 'st/Compiler-AST.st',
               'st/Compiler-IR.st', 'st/Compiler-Inlining.st', 'st/Compiler-Semantic.st',
               'st/Canvas.st', 'st/SUnit.st', 'st/IDE.st',
-              'st/Kernel-Tests.st', 'st/Compiler-Tests.st', 'st/SUnit-Tests.st'
+              'st/Kernel-Tests.st', 'st/Compiler-Tests.st', 'st/SUnit-Tests.st',
+              'st/Helios-Core.st', 'st/Helios-Exceptions.st', 'st/Helios-Announcements.st',
+              'st/Helios-KeyBindings.st', 'st/Helios-Layout.st',
+              'st/Helios-Commands.st', 'st/Helios-Commands-Core.st', 'st/Helios-Commands-Browser.st', 'st/Helios-Commands-Tools.st',
+              'st/Helios-References.st', 'st/Helios-Inspector.st', 'st/Helios-Browser.st',
+              'st/Helios-Transcript.st', 'st/Helios-Workspace.st', 'st/Helios-Debugger.st',
+              'st/Helios-Workspace-Tests.st',
+              'st/Benchfib.st', 'st/Examples.st', 'st/Spaces.st'
               ],
+        jsGlobals: ['navigator'],
         deploy: true
       },
       amber_kernel: {

+ 2 - 2
js/Helios-Core.deploy.js

@@ -1637,7 +1637,7 @@ smalltalk.method({
 selector: "ensureVisible:",
 fn: function (aListItem){
 var self=this;
-var perent,position;
+var parent,position;
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
 position=self._positionOf_(aListItem);
@@ -1650,7 +1650,7 @@ $2=_st(_st(_st(_st(aListItem)._position())._top()).__plus(_st(aListItem)._height
 if(smalltalk.assert($2)){
 _st(_st(parent)._get_((0)))._scrollTop_(_st(_st(_st(_st(_st(parent)._get_((0)))._scrollTop()).__plus(_st(aListItem)._height())).__minus(_st(_st(parent)._height()).__minus(_st(_st(aListItem)._position())._top()))).__plus((10)));
 };
-return self}, function($ctx1) {$ctx1.fill(self,"ensureVisible:",{aListItem:aListItem,perent:perent,position:position},smalltalk.HLListWidget)})},
+return self}, function($ctx1) {$ctx1.fill(self,"ensureVisible:",{aListItem:aListItem,parent:parent,position:position},smalltalk.HLListWidget)})},
 messageSends: ["positionOf:", "parent", "ifTrue:", "scrollTop:", "-", "+", "top", "position", "scrollTop", "get:", "<", "height", ">"]}),
 smalltalk.HLListWidget);
 

+ 3 - 3
js/Helios-Core.js

@@ -2174,7 +2174,7 @@ selector: "ensureVisible:",
 category: 'actions',
 fn: function (aListItem){
 var self=this;
-var perent,position;
+var parent,position;
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
 position=self._positionOf_(aListItem);
@@ -2187,9 +2187,9 @@ $2=_st(_st(_st(_st(aListItem)._position())._top()).__plus(_st(aListItem)._height
 if(smalltalk.assert($2)){
 _st(_st(parent)._get_((0)))._scrollTop_(_st(_st(_st(_st(_st(parent)._get_((0)))._scrollTop()).__plus(_st(aListItem)._height())).__minus(_st(_st(parent)._height()).__minus(_st(_st(aListItem)._position())._top()))).__plus((10)));
 };
-return self}, function($ctx1) {$ctx1.fill(self,"ensureVisible:",{aListItem:aListItem,perent:perent,position:position},smalltalk.HLListWidget)})},
+return self}, function($ctx1) {$ctx1.fill(self,"ensureVisible:",{aListItem:aListItem,parent:parent,position:position},smalltalk.HLListWidget)})},
 args: ["aListItem"],
-source: "ensureVisible: aListItem\x09\x0a\x09\x22Move the scrollbar to show the active element\x22\x0a\x09\x0a\x09| perent position |\x0a\x09\x0a\x09position := self positionOf: aListItem.\x0a\x09parent := aListItem parent.\x0a\x09\x0a    aListItem position top < 0 ifTrue: [\x0a\x09\x09(parent get: 0) scrollTop: ((parent get: 0) scrollTop + aListItem position top - 10) ].\x0a    aListItem position top + aListItem height > parent height ifTrue: [ \x0a\x09\x09(parent get: 0) scrollTop: ((parent get: 0) scrollTop + aListItem height - (parent height - aListItem position top)) +10 ]",
+source: "ensureVisible: aListItem\x09\x0a\x09\x22Move the scrollbar to show the active element\x22\x0a\x09\x0a\x09| parent position |\x0a\x09\x0a\x09position := self positionOf: aListItem.\x0a\x09parent := aListItem parent.\x0a\x09\x0a    aListItem position top < 0 ifTrue: [\x0a\x09\x09(parent get: 0) scrollTop: ((parent get: 0) scrollTop + aListItem position top - 10) ].\x0a    aListItem position top + aListItem height > parent height ifTrue: [ \x0a\x09\x09(parent get: 0) scrollTop: ((parent get: 0) scrollTop + aListItem height - (parent height - aListItem position top)) +10 ]",
 messageSends: ["positionOf:", "parent", "ifTrue:", "scrollTop:", "-", "+", "top", "position", "scrollTop", "get:", "<", "height", ">"],
 referencedClasses: []
 }),

+ 1 - 1
st/Helios-Core.st

@@ -816,7 +816,7 @@ activatePreviousListItem
 ensureVisible: aListItem	
 	"Move the scrollbar to show the active element"
 	
-	| perent position |
+	| parent position |
 	
 	position := self positionOf: aListItem.
 	parent := aListItem parent.