Ver Fonte

Upgrade inline JS method to new form.

Herbert Vojčík há 8 anos atrás
pai
commit
9ff898192b
2 ficheiros alterados com 24 adições e 24 exclusões
  1. 15 15
      src/Web.js
  2. 9 9
      src/Web.st

+ 15 - 15
src/Web.js

@@ -2864,12 +2864,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-var element=self['@element'];
+var element=self["@element"];
 	if (null == element.canHaveChildren || element.canHaveChildren) {
 	if (null == element.canHaveChildren || element.canHaveChildren) {
 		element.appendChild(anElement);
 		element.appendChild(anElement);
 	} else {
 	} else {
 		element.text = String(element.text) + anElement.innerHTML;
 		element.text = String(element.text) + anElement.innerHTML;
-	} ;
+	};
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"appendChild:",{anElement:anElement},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"appendChild:",{anElement:anElement},$globals.TagBrush)});
@@ -2877,7 +2877,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anElement"],
 args: ["anElement"],
-source: "appendChild: anElement\x0a\x09\x22In IE7 and IE8 appendChild fails on several node types. So we need to check\x22\x0a\x09<var element=self['@element'];\x0a\x09if (null == element.canHaveChildren || element.canHaveChildren) {\x0a\x09\x09element.appendChild(anElement);\x0a\x09} else {\x0a\x09\x09element.text = String(element.text) + anElement.innerHTML;\x0a\x09} >",
+source: "appendChild: anElement\x0a\x09\x22In IE7 and IE8 appendChild fails on several node types. So we need to check\x22\x0a\x09<inlineJS: 'var element=self[\x22@element\x22];\x0a\x09if (null == element.canHaveChildren || element.canHaveChildren) {\x0a\x09\x09element.appendChild(anElement);\x0a\x09} else {\x0a\x09\x09element.text = String(element.text) + anElement.innerHTML;\x0a\x09}'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -2893,7 +2893,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-var element=self['@element'].appendChild(anElement["@element"]);
+var element=self["@element"].appendChild(anElement["@element"]);
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"appendDocumentFragment:",{anElement:anElement},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"appendDocumentFragment:",{anElement:anElement},$globals.TagBrush)});
@@ -2901,7 +2901,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anElement"],
 args: ["anElement"],
-source: "appendDocumentFragment: anElement\x0a\x09<var element=self['@element'].appendChild(anElement[\x22@element\x22])>",
+source: "appendDocumentFragment: anElement\x0a\x09<inlineJS: 'var element=self[\x22@element\x22].appendChild(anElement[\x22@element\x22])'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -3042,7 +3042,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-return self['@element'].hasAttribute(aString) ? self['@element'].getAttribute(aString) : aBlock._value();
+return self["@element"].hasAttribute(aString) ? self["@element"].getAttribute(aString) : aBlock._value();
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"at:ifAbsent:",{aString:aString,aBlock:aBlock},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"at:ifAbsent:",{aString:aString,aBlock:aBlock},$globals.TagBrush)});
@@ -3050,7 +3050,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "aBlock"],
 args: ["aString", "aBlock"],
-source: "at: aString ifAbsent: aBlock\x0a\x09<return self['@element'].hasAttribute(aString) ? self['@element'].getAttribute(aString) : aBlock._value()>",
+source: "at: aString ifAbsent: aBlock\x0a\x09<inlineJS: 'return self[\x22@element\x22].hasAttribute(aString) ? self[\x22@element\x22].getAttribute(aString) : aBlock._value()'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -3066,7 +3066,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-self['@element'].setAttribute(aString, aValue); return aValue;
+self["@element"].setAttribute(aString, aValue); return aValue;
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"at:put:",{aString:aString,aValue:aValue},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"at:put:",{aString:aString,aValue:aValue},$globals.TagBrush)});
@@ -3074,7 +3074,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "aValue"],
 args: ["aString", "aValue"],
-source: "at: aString put: aValue\x0a\x09<self['@element'].setAttribute(aString, aValue); return aValue>",
+source: "at: aString put: aValue\x0a\x09<inlineJS: 'self[\x22@element\x22].setAttribute(aString, aValue); return aValue'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -3090,7 +3090,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-self['@element'].className = aString;
+self["@element"].className = aString;
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"class:",{aString:aString},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"class:",{aString:aString},$globals.TagBrush)});
@@ -3098,7 +3098,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
 args: ["aString"],
-source: "class: aString\x0a\x09<self['@element'].className = aString>",
+source: "class: aString\x0a\x09<inlineJS: 'self[\x22@element\x22].className = aString'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -3219,7 +3219,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
 args: ["aString"],
-source: "createElementFor: aString\x0a\x09<return document.createElement(String(aString))>",
+source: "createElementFor: aString\x0a\x09<inlineJS: 'return document.createElement(String(aString))'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -3243,7 +3243,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
 args: ["aString"],
-source: "createTextNodeFor: aString\x0a\x09<return document.createTextNode(String(aString))>",
+source: "createTextNodeFor: aString\x0a\x09<inlineJS: 'return document.createTextNode(String(aString))'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []
@@ -4119,7 +4119,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 //>>excludeEnd("ctx");
-self['@element'].removeAttribute(aString);
+self["@element"].removeAttribute(aString);
 return self;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"removeAt:",{aString:aString},$globals.TagBrush)});
 }, function($ctx1) {$ctx1.fill(self,"removeAt:",{aString:aString},$globals.TagBrush)});
@@ -4127,7 +4127,7 @@ return self;
 },
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
 args: ["aString"],
-source: "removeAt: aString\x0a\x09<self['@element'].removeAttribute(aString)>",
+source: "removeAt: aString\x0a\x09<inlineJS: 'self[\x22@element\x22].removeAttribute(aString)'>",
 referencedClasses: [],
 referencedClasses: [],
 //>>excludeEnd("ide");
 //>>excludeEnd("ide");
 messageSends: []
 messageSends: []

+ 9 - 9
src/Web.st

@@ -562,12 +562,12 @@ appendBlock: aBlock
 
 
 appendChild: anElement
 appendChild: anElement
 	"In IE7 and IE8 appendChild fails on several node types. So we need to check"
 	"In IE7 and IE8 appendChild fails on several node types. So we need to check"
-	<var element=self['@element'];
+	<inlineJS: 'var element=self["@element"];
 	if (null == element.canHaveChildren || element.canHaveChildren) {
 	if (null == element.canHaveChildren || element.canHaveChildren) {
 		element.appendChild(anElement);
 		element.appendChild(anElement);
 	} else {
 	} else {
 		element.text = String(element.text) + anElement.innerHTML;
 		element.text = String(element.text) + anElement.innerHTML;
-	} >
+	}'>
 !
 !
 
 
 appendString: aString
 appendString: aString
@@ -615,15 +615,15 @@ at: aString
 !
 !
 
 
 at: aString ifAbsent: aBlock
 at: aString ifAbsent: aBlock
-	<return self['@element'].hasAttribute(aString) ? self['@element'].getAttribute(aString) : aBlock._value()>
+	<inlineJS: 'return self["@element"].hasAttribute(aString) ? self["@element"].getAttribute(aString) : aBlock._value()'>
 !
 !
 
 
 at: aString put: aValue
 at: aString put: aValue
-	<self['@element'].setAttribute(aString, aValue); return aValue>
+	<inlineJS: 'self["@element"].setAttribute(aString, aValue); return aValue'>
 !
 !
 
 
 class: aString
 class: aString
-	<self['@element'].className = aString>
+	<inlineJS: 'self["@element"].className = aString'>
 !
 !
 
 
 cols: aString
 cols: aString
@@ -683,7 +683,7 @@ rel: aString
 !
 !
 
 
 removeAt: aString
 removeAt: aString
-	<self['@element'].removeAttribute(aString)>
+	<inlineJS: 'self["@element"].removeAttribute(aString)'>
 !
 !
 
 
 rows: aString
 rows: aString
@@ -837,15 +837,15 @@ initializeFromString: aString canvas: aCanvas
 !TagBrush methodsFor: 'private'!
 !TagBrush methodsFor: 'private'!
 
 
 appendDocumentFragment: anElement
 appendDocumentFragment: anElement
-	<var element=self['@element'].appendChild(anElement["@element"])>
+	<inlineJS: 'var element=self["@element"].appendChild(anElement["@element"])'>
 !
 !
 
 
 createElementFor: aString
 createElementFor: aString
-	<return document.createElement(String(aString))>
+	<inlineJS: 'return document.createElement(String(aString))'>
 !
 !
 
 
 createTextNodeFor: aString
 createTextNodeFor: aString
-	<return document.createTextNode(String(aString))>
+	<inlineJS: 'return document.createTextNode(String(aString))'>
 ! !
 ! !
 
 
 !TagBrush class methodsFor: 'instance creation'!
 !TagBrush class methodsFor: 'instance creation'!