Domite => self class / self testedClass

src/DOMite-Tests.js

@@ -680,11 +680,10 @@ protocol: 'testing',
 fn: function (){
 var self=this;
 var d,tbl,tr;
-function $Domite(){return $globals.Domite||(typeof Domite=="undefined"?nil:Domite)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$7,$6,$5,$8,$11,$10,$9,$12,$14,$13,$15,$17,$16,$18,$20,$19,$21,$22;
+var $1,$2,$3,$4,$7,$6,$5,$8,$11,$10,$9,$12,$15,$14,$13,$16,$17,$20,$19,$18,$21,$24,$23,$22,$25,$26;
 $1=self._testedClass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["testedClass"]=1;
@@ -741,7 +740,11 @@ $recv($8).__lt_lt($9);
 $ctx1.sendIdx["<<"]=3;
 //>>excludeEnd("ctx");
 $12=tr;
-$14=$recv(self._testedClass())._newElement_("td");
+$15=self._testedClass();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.sendIdx["testedClass"]=6;
+//>>excludeEnd("ctx");
+$14=$recv($15)._newElement_("td");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["newElement:"]=5;
 //>>excludeEnd("ctx");
@@ -757,42 +760,54 @@ $recv(tbl).__lt_lt(tr);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=7;
 //>>excludeEnd("ctx");
-tr=$recv($Domite())._newElement_("tr");
+$16=self._testedClass();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.sendIdx["testedClass"]=7;
+//>>excludeEnd("ctx");
+tr=$recv($16)._newElement_("tr");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["newElement:"]=6;
 //>>excludeEnd("ctx");
-$15=tr;
-$17=$recv($Domite())._newElement_("td");
+$17=tr;
+$20=self._testedClass();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.sendIdx["testedClass"]=8;
+//>>excludeEnd("ctx");
+$19=$recv($20)._newElement_("td");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["newElement:"]=7;
 //>>excludeEnd("ctx");
-$16=$recv($17).__lt_lt("D");
+$18=$recv($19).__lt_lt("D");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=9;
 //>>excludeEnd("ctx");
-$recv($15).__lt_lt($16);
+$recv($17).__lt_lt($18);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=8;
 //>>excludeEnd("ctx");
-$18=tr;
-$20=$recv($Domite())._newElement_("td");
+$21=tr;
+$24=self._testedClass();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.sendIdx["testedClass"]=9;
+//>>excludeEnd("ctx");
+$23=$recv($24)._newElement_("td");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["newElement:"]=8;
 //>>excludeEnd("ctx");
-$19=$recv($20).__lt_lt("E");
+$22=$recv($23).__lt_lt("E");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=11;
 //>>excludeEnd("ctx");
-$recv($18).__lt_lt($19);
+$recv($21).__lt_lt($22);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=10;
 //>>excludeEnd("ctx");
-$21=tr;
-$22=$recv($recv($Domite())._newElement_("td")).__lt_lt("F");
+$25=tr;
+$26=$recv($recv(self._testedClass())._newElement_("td")).__lt_lt("F");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=13;
 //>>excludeEnd("ctx");
-$recv($21).__lt_lt($22);
+$recv($25).__lt_lt($26);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=12;
 //>>excludeEnd("ctx");
@@ -809,8 +824,8 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInsertTable\x0a\x09| d tbl tr |\x0a\x09d := self testedClass at: 'html body div#fixture'.\x0a\x09tbl := self testedClass newElement: 'table'.\x0a\x09\x0a\x09tr := self testedClass newElement: 'tr'.\x0a\x09tr << ((self testedClass newElement: 'td') << 'A').\x0a\x09tr << ((self testedClass newElement: 'td') << 'B').\x0a\x09tr << ((self testedClass newElement: 'td') << 'C').\x0a\x09\x0a\x09tbl << tr.\x0a\x09\x0a\x09tr := Domite newElement: 'tr'.\x0a\x09tr << ((Domite newElement: 'td') << 'D').\x0a\x09tr << ((Domite newElement: 'td') << 'E').\x0a\x09tr << ((Domite newElement: 'td') << 'F').\x0a\x09\x0a\x09tbl << tr.\x0a\x09d << tbl.\x0a\x09 \x0a\x09self assertBodyEndsWith: '>sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>'",
-referencedClasses: ["Domite"],
+source: "testInsertTable\x0a\x09| d tbl tr |\x0a\x09d := self testedClass at: 'html body div#fixture'.\x0a\x09tbl := self testedClass newElement: 'table'.\x0a\x09\x0a\x09tr := self testedClass newElement: 'tr'.\x0a\x09tr << ((self testedClass newElement: 'td') << 'A').\x0a\x09tr << ((self testedClass newElement: 'td') << 'B').\x0a\x09tr << ((self testedClass newElement: 'td') << 'C').\x0a\x09\x0a\x09tbl << tr.\x0a\x09\x0a\x09tr := self testedClass newElement: 'tr'.\x0a\x09tr << ((self testedClass newElement: 'td') << 'D').\x0a\x09tr << ((self testedClass newElement: 'td') << 'E').\x0a\x09tr << ((self testedClass newElement: 'td') << 'F').\x0a\x09\x0a\x09tbl << tr.\x0a\x09d << tbl.\x0a\x09 \x0a\x09self assertBodyEndsWith: '>sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>'",
+referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["at:", "testedClass", "newElement:", "<<", "assertBodyEndsWith:"]
 }),

src/DOMite-Tests.st

@@ -145,10 +145,10 @@ testInsertTable
 	
 	tbl << tr.
 	
-	tr := Domite newElement: 'tr'.
-	tr << ((Domite newElement: 'td') << 'D').
-	tr << ((Domite newElement: 'td') << 'E').
-	tr << ((Domite newElement: 'td') << 'F').
+	tr := self testedClass newElement: 'tr'.
+	tr << ((self testedClass newElement: 'td') << 'D').
+	tr << ((self testedClass newElement: 'td') << 'E').
+	tr << ((self testedClass newElement: 'td') << 'F').
 	
 	tbl << tr.
 	d << tbl.

src/DOMite.js

@@ -502,12 +502,11 @@ selector: "nextPutJSObject:",
 protocol: 'insertion',
 fn: function (aJSObject){
 var self=this;
-function $Domite(){return $globals.Domite||(typeof Domite=="undefined"?nil:Domite)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($Domite())._isDomNode_(aJSObject);
+$1=$recv(self._class())._isDomNode_(aJSObject);
 if($core.assert($1)){
 self._nextPutDomNode_(aJSObject);
 } else {
@@ -520,10 +519,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aJSObject"],
-source: "nextPutJSObject: aJSObject\x0a\x09(Domite isDomNode: aJSObject)\x0a\x09\x09ifTrue: [ self nextPutDomNode: aJSObject ]\x0a\x09\x09ifFalse: [ self nextPut: aJSObject ]",
-referencedClasses: ["Domite"],
+source: "nextPutJSObject: aJSObject\x0a\x09(self class isDomNode: aJSObject)\x0a\x09\x09ifTrue: [ self nextPutDomNode: aJSObject ]\x0a\x09\x09ifFalse: [ self nextPut: aJSObject ]",
+referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["ifTrue:ifFalse:", "isDomNode:", "nextPutDomNode:", "nextPut:"]
+messageSends: ["ifTrue:ifFalse:", "isDomNode:", "class", "nextPutDomNode:", "nextPut:"]
 }),
 $globals.Domite);
 

src/DOMite.st

@@ -171,7 +171,7 @@ nextPutDomNode: aDomElement
 !
 
 nextPutJSObject: aJSObject
-	(Domite isDomNode: aJSObject)
+	(self class isDomNode: aJSObject)
 		ifTrue: [ self nextPutDomNode: aJSObject ]
 		ifFalse: [ self nextPut: aJSObject ]
 !