Browse Source

Use PlatformDom >> isDomNode:.

Herbert Vojčík 7 years ago
parent
commit
94ef98c931
2 changed files with 20 additions and 45 deletions
  1. 17 34
      src/DOMite.js
  2. 3 11
      src/DOMite.st

+ 17 - 34
src/DOMite.js

@@ -1,9 +1,18 @@
-define(["amber/boot", "amber_core/Kernel-Collections"], function($boot){"use strict";
+define(["amber/boot"
+//>>excludeStart("imports", pragmas.excludeImports);
+, "amber_core/Platform-DOM"
+//>>excludeEnd("imports");
+, "amber_core/Kernel-Collections"], function($boot
+//>>excludeStart("imports", pragmas.excludeImports);
+
+//>>excludeEnd("imports");
+){"use strict";
 if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
 var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage('DOMite');
 $core.packages["DOMite"].innerEval = function (expr) { return eval(expr); };
+$core.packages["DOMite"].imports = ["amber_core/Platform-DOM"];
 $core.packages["DOMite"].transport = {"type":"amd","amdNamespace":"domite"};
 
 $core.addClass('Domite', $globals.ProtoStream, ['element', 'reference'], 'DOMite');
@@ -563,7 +572,7 @@ var self=this;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv(self._class())._isDomNode_(aJSObject);
+$1=$recv($globals.PlatformDom)._isDomNode_(aJSObject);
 if($core.assert($1)){
 self._nextPutDomNode_(aJSObject);
 } else {
@@ -576,10 +585,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aJSObject"],
-source: "nextPutJSObject: aJSObject\x0a\x09(self class isDomNode: aJSObject)\x0a\x09\x09ifTrue: [ self nextPutDomNode: aJSObject ]\x0a\x09\x09ifFalse: [ self nextPut: aJSObject ]",
-referencedClasses: [],
+source: "nextPutJSObject: aJSObject\x0a\x09(PlatformDom isDomNode: aJSObject)\x0a\x09\x09ifTrue: [ self nextPutDomNode: aJSObject ]\x0a\x09\x09ifFalse: [ self nextPut: aJSObject ]",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["ifTrue:ifFalse:", "isDomNode:", "class", "nextPutDomNode:", "nextPut:"]
+messageSends: ["ifTrue:ifFalse:", "isDomNode:", "nextPutDomNode:", "nextPut:"]
 }),
 $globals.Domite);
 
@@ -1132,7 +1141,7 @@ var $1,$2,$receiver;
 if(($receiver = aDomElement) == null || $receiver.isNil){
 aDomElement;
 } else {
-$1=self._isDomNode_(aDomElement);
+$1=$recv($globals.PlatformDom)._isDomNode_(aDomElement);
 if(!$core.assert($1)){
 self._error_($recv(self._name()).__comma(": Need a DOM node"));
 }
@@ -1146,8 +1155,8 @@ return $recv($2)._yourself();
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aDomElement"],
-source: "fromElement: aDomElement\x0a\x09aDomElement ifNotNil: [\x0a\x09\x09(self isDomNode: aDomElement) ifFalse: [\x0a\x09\x09\x09self error: self name, ': Need a DOM node' ]].\x0a\x09^ self new\x0a\x09\x09element: aDomElement;\x0a\x09\x09yourself",
-referencedClasses: [],
+source: "fromElement: aDomElement\x0a\x09aDomElement ifNotNil: [\x0a\x09\x09(PlatformDom isDomNode: aDomElement) ifFalse: [\x0a\x09\x09\x09self error: self name, ': Need a DOM node' ]].\x0a\x09^ self new\x0a\x09\x09element: aDomElement;\x0a\x09\x09yourself",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
 messageSends: ["ifNotNil:", "ifFalse:", "isDomNode:", "error:", ",", "name", "element:", "new", "yourself"]
 }),
@@ -1179,32 +1188,6 @@ messageSends: ["reference:", "fromElement:", "yourself"]
 }),
 $globals.Domite.klass);
 
-$core.addMethod(
-$core.method({
-selector: "isDomNode:",
-protocol: 'testing',
-fn: function (anObject){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-
-	return anObject.nodeType > 0 &&
-		Object.prototype.toString.call(anObject) !== "[object Object]";
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"isDomNode:",{anObject:anObject},$globals.Domite.klass)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["anObject"],
-source: "isDomNode: anObject\x0a<inlineJS: '\x0a\x09return anObject.nodeType > 0 &&\x0a\x09\x09Object.prototype.toString.call(anObject) !== \x22[object Object]\x22\x0a'>",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: []
-}),
-$globals.Domite.klass);
-
 $core.addMethod(
 $core.method({
 selector: "newElement:",

+ 3 - 11
src/DOMite.st

@@ -1,4 +1,5 @@
 Smalltalk createPackage: 'DOMite'!
+(Smalltalk packageAt: 'DOMite') imports: {'amber_core/Platform-DOM'}!
 ProtoStream subclass: #Domite
 	instanceVariableNames: 'element reference'
 	package: 'DOMite'!
@@ -197,7 +198,7 @@ nextPutDomNode: aDomElement
 !
 
 nextPutJSObject: aJSObject
-	(self class isDomNode: aJSObject)
+	(PlatformDom isDomNode: aJSObject)
 		ifTrue: [ self nextPutDomNode: aJSObject ]
 		ifFalse: [ self nextPut: aJSObject ]
 !
@@ -315,7 +316,7 @@ at: aString
 
 fromElement: aDomElement
 	aDomElement ifNotNil: [
-		(self isDomNode: aDomElement) ifFalse: [
+		(PlatformDom isDomNode: aDomElement) ifFalse: [
 			self error: self name, ': Need a DOM node' ]].
 	^ self new
 		element: aDomElement;
@@ -341,15 +342,6 @@ newStream
 	^ self fromElement: document createDocumentFragment
 ! !
 
-!Domite class methodsFor: 'testing'!
-
-isDomNode: anObject
-<inlineJS: '
-	return anObject.nodeType > 0 &&
-		Object.prototype.toString.call(anObject) !!== "[object Object]"
-'>
-! !
-
 !ProtoStream methodsFor: '*DOMite'!
 
 nextPutDomNode: aNode