Browse Source

Use PlatformDom to create texts / elems / document frags.

Herbert Vojčík 7 years ago
parent
commit
a344b7aacd
4 changed files with 30 additions and 31 deletions
  1. 17 17
      src/DOMite-Tests.js
  2. 5 5
      src/DOMite-Tests.st
  3. 6 6
      src/DOMite.js
  4. 2 3
      src/DOMite.st

+ 17 - 17
src/DOMite-Tests.js

@@ -57,7 +57,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self["@fixtureDiv"]=$recv(document)._createElement_("div");
+self["@fixtureDiv"]=$recv($globals.PlatformDom)._newElement_("div");
 $recv($recv(document)._body())._appendChild_(self["@fixtureDiv"]);
 $recv(self["@fixtureDiv"])._setAttribute_to_("id","fixture");
 $recv(self["@fixtureDiv"])._innerHTML_("sentinel");
@@ -68,10 +68,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "setUp\x0a\x09fixtureDiv := document createElement: 'div'.\x0a\x09document body appendChild: fixtureDiv.\x0a\x09fixtureDiv setAttribute: 'id' to: 'fixture'.\x0a\x09fixtureDiv innerHTML: 'sentinel'",
-referencedClasses: [],
+source: "setUp\x0a\x09fixtureDiv := PlatformDom newElement: 'div'.\x0a\x09document body appendChild: fixtureDiv.\x0a\x09fixtureDiv setAttribute: 'id' to: 'fixture'.\x0a\x09fixtureDiv innerHTML: 'sentinel'",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["createElement:", "appendChild:", "body", "setAttribute:to:", "innerHTML:"]
+messageSends: ["newElement:", "appendChild:", "body", "setAttribute:to:", "innerHTML:"]
 }),
 $globals.DOMiteTest);
 
@@ -304,7 +304,7 @@ var d;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 d=$recv(self._testedClass())._fromElement_(self["@fixtureDiv"]);
-$recv(d).__lt_lt($recv(document)._createElement_("pre"));
+$recv(d).__lt_lt($recv($globals.PlatformDom)._newElement_("pre"));
 self._assertBodyEndsWith_(">sentinel<pre></pre></div>");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -313,10 +313,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInsertDomNode\x0a\x09| d |\x0a\x09d := self testedClass fromElement: fixtureDiv.\x0a\x09d << (document createElement: 'pre').\x0a\x09self assertBodyEndsWith: '>sentinel<pre></pre></div>'",
-referencedClasses: [],
+source: "testInsertDomNode\x0a\x09| d |\x0a\x09d := self testedClass fromElement: fixtureDiv.\x0a\x09d << (PlatformDom newElement: 'pre').\x0a\x09self assertBodyEndsWith: '>sentinel<pre></pre></div>'",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["fromElement:", "testedClass", "<<", "createElement:", "assertBodyEndsWith:"]
+messageSends: ["fromElement:", "testedClass", "<<", "newElement:", "assertBodyEndsWith:"]
 }),
 $globals.DOMiteTest);
 
@@ -336,7 +336,7 @@ $1=self._testedClass();
 $ctx1.sendIdx["testedClass"]=1;
 //>>excludeEnd("ctx");
 d=$recv($1)._at_("#fixture");
-$recv(d).__lt_lt($recv($recv(self._testedClass())._newStream()).__lt_lt($recv(document)._createElement_("script")));
+$recv(d).__lt_lt($recv($recv(self._testedClass())._newStream()).__lt_lt($recv($globals.PlatformDom)._newElement_("script")));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["<<"]=1;
 //>>excludeEnd("ctx");
@@ -348,10 +348,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInsertDomNodeInFragment\x0a\x09| d |\x0a\x09d := self testedClass at: '#fixture'.\x0a\x09d << (self testedClass newStream << (document createElement: 'script')).\x0a\x09self assertBodyEndsWith: '>sentinel<script></script></div>'",
-referencedClasses: [],
+source: "testInsertDomNodeInFragment\x0a\x09| d |\x0a\x09d := self testedClass at: '#fixture'.\x0a\x09d << (self testedClass newStream << (PlatformDom newElement: 'script')).\x0a\x09self assertBodyEndsWith: '>sentinel<script></script></div>'",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["at:", "testedClass", "<<", "newStream", "createElement:", "assertBodyEndsWith:"]
+messageSends: ["at:", "testedClass", "<<", "newStream", "newElement:", "assertBodyEndsWith:"]
 }),
 $globals.DOMiteTest);
 
@@ -366,8 +366,8 @@ var d,f;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 d=$recv(self._testedClass())._at_("#fixture");
-f=$recv(document)._createDocumentFragment();
-$recv(f)._appendChild_($recv(document)._createElement_("script"));
+f=[]._asDomNode();
+$recv(f)._appendChild_($recv($globals.PlatformDom)._newElement_("script"));
 $recv(d).__lt_lt(f);
 self._assertBodyEndsWith_(">sentinel<script></script></div>");
 return self;
@@ -377,10 +377,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "testInsertDomNodeInRawDomFragment\x0a\x09| d f |\x0a\x09d := self testedClass at: '#fixture'.\x0a\x09f := document createDocumentFragment.\x0a\x09f appendChild: (document createElement: 'script').\x0a\x09d << f.\x0a\x09self assertBodyEndsWith: '>sentinel<script></script></div>'",
-referencedClasses: [],
+source: "testInsertDomNodeInRawDomFragment\x0a\x09| d f |\x0a\x09d := self testedClass at: '#fixture'.\x0a\x09f := #() asDomNode.\x0a\x09f appendChild: (PlatformDom newElement: 'script').\x0a\x09d << f.\x0a\x09self assertBodyEndsWith: '>sentinel<script></script></div>'",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["at:", "testedClass", "createDocumentFragment", "appendChild:", "createElement:", "<<", "assertBodyEndsWith:"]
+messageSends: ["at:", "testedClass", "asDomNode", "appendChild:", "newElement:", "<<", "assertBodyEndsWith:"]
 }),
 $globals.DOMiteTest);
 

+ 5 - 5
src/DOMite-Tests.st

@@ -6,7 +6,7 @@ TestCase subclass: #DOMiteTest
 !DOMiteTest methodsFor: 'fixture'!
 
 setUp
-	fixtureDiv := document createElement: 'div'.
+	fixtureDiv := PlatformDom newElement: 'div'.
 	document body appendChild: fixtureDiv.
 	fixtureDiv setAttribute: 'id' to: 'fixture'.
 	fixtureDiv innerHTML: 'sentinel'
@@ -72,22 +72,22 @@ testFromBadSelectorIsInvalid
 testInsertDomNode
 	| d |
 	d := self testedClass fromElement: fixtureDiv.
-	d << (document createElement: 'pre').
+	d << (PlatformDom newElement: 'pre').
 	self assertBodyEndsWith: '>sentinel<pre></pre></div>'
 !
 
 testInsertDomNodeInFragment
 	| d |
 	d := self testedClass at: '#fixture'.
-	d << (self testedClass newStream << (document createElement: 'script')).
+	d << (self testedClass newStream << (PlatformDom newElement: 'script')).
 	self assertBodyEndsWith: '>sentinel<script></script></div>'
 !
 
 testInsertDomNodeInRawDomFragment
 	| d f |
 	d := self testedClass at: '#fixture'.
-	f := document createDocumentFragment.
-	f appendChild: (document createElement: 'script').
+	f := #() asDomNode.
+	f appendChild: (PlatformDom newElement: 'script').
 	d << f.
 	self assertBodyEndsWith: '>sentinel<script></script></div>'
 !

+ 6 - 6
src/DOMite.js

@@ -601,7 +601,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self._nextPutDomNode_($recv(document)._createTextNode_($recv(aString)._asString()));
+self._nextPutDomNode_($recv($recv(aString)._asString())._asDomNode());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextPutString:",{aString:aString},$globals.Domite)});
@@ -609,10 +609,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "nextPutString: aString\x0a\x09self nextPutDomNode: (\x0a\x09\x09document createTextNode: aString asString )",
+source: "nextPutString: aString\x0a\x09self nextPutDomNode: aString asString asDomNode",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["nextPutDomNode:", "createTextNode:", "asString"]
+messageSends: ["nextPutDomNode:", "asDomNode", "asString"]
 }),
 $globals.Domite);
 
@@ -1243,17 +1243,17 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return self._fromElement_($recv(document)._createDocumentFragment());
+return self._fromElement_([]._asDomNode());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newStream",{},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "newStream\x0a\x09^ self fromElement: document createDocumentFragment",
+source: "newStream\x0a\x09^ self fromElement: #() asDomNode",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["fromElement:", "createDocumentFragment"]
+messageSends: ["fromElement:", "asDomNode"]
 }),
 $globals.Domite.klass);
 

+ 2 - 3
src/DOMite.st

@@ -204,8 +204,7 @@ nextPutJSObject: aJSObject
 !
 
 nextPutString: aString
-	self nextPutDomNode: (
-		document createTextNode: aString asString )
+	self nextPutDomNode: aString asString asDomNode
 ! !
 
 !Domite methodsFor: 'positioning'!
@@ -339,7 +338,7 @@ newElement: aString xmlns: anotherString
 !
 
 newStream
-	^ self fromElement: document createDocumentFragment
+	^ self fromElement: #() asDomNode
 ! !
 
 !ProtoStream methodsFor: '*DOMite'!