Browse Source

window jQuery: foo -> foo asJQuery in non-Helios code

Herbert Vojčík 10 years ago
parent
commit
791ea1865c
6 changed files with 21 additions and 21 deletions
  1. 2 2
      js/Canvas.deploy.js
  2. 3 3
      js/Canvas.js
  3. 5 5
      js/IDE.deploy.js
  4. 7 7
      js/IDE.js
  5. 1 1
      st/Canvas.st
  6. 3 3
      st/IDE.st

+ 2 - 2
js/Canvas.deploy.js

@@ -1909,10 +1909,10 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(window)._jQuery_(self._element());
+$1=_st(self._element())._asJQuery();
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"asJQuery",{},smalltalk.TagBrush)})},
-messageSends: ["jQuery:", "element"]}),
+messageSends: ["asJQuery", "element"]}),
 smalltalk.TagBrush);
 
 smalltalk.addMethod(

+ 3 - 3
js/Canvas.js

@@ -2623,12 +2623,12 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(window)._jQuery_(self._element());
+$1=_st(self._element())._asJQuery();
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"asJQuery",{},smalltalk.TagBrush)})},
 args: [],
-source: "asJQuery\x0a\x09^window jQuery: self element",
-messageSends: ["jQuery:", "element"],
+source: "asJQuery\x0a\x09^self element asJQuery",
+messageSends: ["asJQuery", "element"],
 referencedClasses: []
 }),
 smalltalk.TagBrush);

+ 5 - 5
js/IDE.deploy.js

@@ -904,9 +904,9 @@ selector: "onWindowResize:",
 fn: function (aBlock){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-jQuery(window).resize(aBlock);
+_st(_st(window)._asJQuery())._resize_(aBlock);
 return self}, function($ctx1) {$ctx1.fill(self,"onWindowResize:",{aBlock:aBlock},smalltalk.TabManager)})},
-messageSends: []}),
+messageSends: ["resize:", "asJQuery"]}),
 smalltalk.TabManager);
 
 smalltalk.addMethod(
@@ -1230,11 +1230,11 @@ function $Browser(){return smalltalk.Browser||(typeof Browser=="undefined"?nil:B
 function $TabManager(){return smalltalk.TabManager||(typeof TabManager=="undefined"?nil:TabManager)}
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
-$1=_st(_st(_st(window)._jQuery_("#amber"))._length()).__eq((0));
+$1=_st(_st("#amber"._asJQuery())._length()).__eq((0));
 if(smalltalk.assert($1)){
 _st($Browser())._open();
 } else {
-$2=_st(_st(window)._jQuery_("#amber"))._is_(":visible");
+$2=_st("#amber"._asJQuery())._is_(":visible");
 if(smalltalk.assert($2)){
 _st(_st($TabManager())._current())._close();
 } else {
@@ -1242,7 +1242,7 @@ _st(_st($TabManager())._current())._open();
 };
 };
 return self}, function($ctx1) {$ctx1.fill(self,"toggleAmberIDE",{},smalltalk.TabManager.klass)})},
-messageSends: ["ifTrue:ifFalse:", "open", "close", "current", "is:", "jQuery:", "=", "length"]}),
+messageSends: ["ifTrue:ifFalse:", "open", "close", "current", "is:", "asJQuery", "=", "length"]}),
 smalltalk.TabManager.klass);
 
 

+ 7 - 7
js/IDE.js

@@ -1175,11 +1175,11 @@ category: 'actions',
 fn: function (aBlock){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-jQuery(window).resize(aBlock);
+_st(_st(window)._asJQuery())._resize_(aBlock);
 return self}, function($ctx1) {$ctx1.fill(self,"onWindowResize:",{aBlock:aBlock},smalltalk.TabManager)})},
 args: ["aBlock"],
-source: "onWindowResize: aBlock\x0a\x09<jQuery(window).resize(aBlock)>",
-messageSends: [],
+source: "onWindowResize: aBlock\x0a\x09window asJQuery resize: aBlock",
+messageSends: ["resize:", "asJQuery"],
 referencedClasses: []
 }),
 smalltalk.TabManager);
@@ -1586,11 +1586,11 @@ function $Browser(){return smalltalk.Browser||(typeof Browser=="undefined"?nil:B
 function $TabManager(){return smalltalk.TabManager||(typeof TabManager=="undefined"?nil:TabManager)}
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
-$1=_st(_st(_st(window)._jQuery_("#amber"))._length()).__eq((0));
+$1=_st(_st("#amber"._asJQuery())._length()).__eq((0));
 if(smalltalk.assert($1)){
 _st($Browser())._open();
 } else {
-$2=_st(_st(window)._jQuery_("#amber"))._is_(":visible");
+$2=_st("#amber"._asJQuery())._is_(":visible");
 if(smalltalk.assert($2)){
 _st(_st($TabManager())._current())._close();
 } else {
@@ -1599,8 +1599,8 @@ _st(_st($TabManager())._current())._open();
 };
 return self}, function($ctx1) {$ctx1.fill(self,"toggleAmberIDE",{},smalltalk.TabManager.klass)})},
 args: [],
-source: "toggleAmberIDE\x0a\x09(window jQuery: '#amber') length = 0\x0a\x09\x09ifTrue: [ Browser open ]\x0a\x09\x09ifFalse: [\x0a\x09\x09\x09((window jQuery: '#amber') is: ':visible')\x0a\x09\x09\x09\x09ifTrue: [ TabManager current close ]\x0a\x09\x09\x09\x09ifFalse: [ TabManager current open ] ]",
-messageSends: ["ifTrue:ifFalse:", "open", "close", "current", "is:", "jQuery:", "=", "length"],
+source: "toggleAmberIDE\x0a\x09'#amber' asJQuery length = 0\x0a\x09\x09ifTrue: [ Browser open ]\x0a\x09\x09ifFalse: [\x0a\x09\x09\x09('#amber' asJQuery is: ':visible')\x0a\x09\x09\x09\x09ifTrue: [ TabManager current close ]\x0a\x09\x09\x09\x09ifFalse: [ TabManager current open ] ]",
+messageSends: ["ifTrue:ifFalse:", "open", "close", "current", "is:", "asJQuery", "=", "length"],
 referencedClasses: ["Browser", "TabManager"]
 }),
 smalltalk.TabManager.klass);

+ 1 - 1
st/Canvas.st

@@ -887,7 +887,7 @@ width: aString
 !TagBrush methodsFor: 'converting'!
 
 asJQuery
-	^window jQuery: self element
+	^self element asJQuery
 ! !
 
 !TagBrush methodsFor: 'events'!

+ 3 - 3
st/IDE.st

@@ -388,7 +388,7 @@ onResize: aBlock
 !
 
 onWindowResize: aBlock
-	<jQuery(window).resize(aBlock)>
+	window asJQuery resize: aBlock
 !
 
 open
@@ -535,10 +535,10 @@ TabManager class instanceVariableNames: 'current'!
 !TabManager class methodsFor: 'actions'!
 
 toggleAmberIDE
-	(window jQuery: '#amber') length = 0
+	'#amber' asJQuery length = 0
 		ifTrue: [ Browser open ]
 		ifFalse: [
-			((window jQuery: '#amber') is: ':visible')
+			('#amber' asJQuery is: ':visible')
 				ifTrue: [ TabManager current close ]
 				ifFalse: [ TabManager current open ] ]
 ! !