Browse Source

Use more PlatformDom convenience methods.

Herbert Vojčík 7 years ago
parent
commit
b4930c338b
2 changed files with 15 additions and 78 deletions
  1. 12 65
      src/DOMite.js
  2. 3 13
      src/DOMite.st

+ 12 - 65
src/DOMite.js

@@ -92,22 +92,17 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._class();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["class"]=1;
-//>>excludeEnd("ctx");
-return $recv($1)._wrap_($recv(self._class())._domListAsArray_($recv(self._element())._querySelectorAll_(aString)));
+return $recv(self._class())._wrap_($recv($globals.PlatformDom)._toArray_($recv(self._element())._querySelectorAll_(aString)));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allAt:",{aString:aString},$globals.Domite)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "allAt: aString\x0a\x09^ self class wrap: (self class domListAsArray: (self element querySelectorAll: aString))",
-referencedClasses: [],
+source: "allAt: aString\x0a\x09^ self class wrap: (PlatformDom toArray: (self element querySelectorAll: aString))",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["wrap:", "class", "domListAsArray:", "querySelectorAll:", "element"]
+messageSends: ["wrap:", "class", "toArray:", "querySelectorAll:", "element"]
 }),
 $globals.Domite);
 
@@ -403,7 +398,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self._fireEvent_($recv(self._class())._createCustomEvent_detail_(aString,anObject));
+self._fireEvent_($recv($globals.PlatformDom)._newCustomEvent_detail_(aString,anObject));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"fire:detail:",{aString:aString,anObject:anObject},$globals.Domite)});
@@ -411,10 +406,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString", "anObject"],
-source: "fire: aString detail: anObject\x0a\x09self fireEvent: (\x0a\x09\x09self class createCustomEvent: aString detail: anObject)",
-referencedClasses: [],
+source: "fire: aString detail: anObject\x0a\x09self fireEvent: (\x0a\x09\x09PlatformDom newCustomEvent: aString detail: anObject)",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["fireEvent:", "createCustomEvent:detail:", "class"]
+messageSends: ["fireEvent:", "newCustomEvent:detail:"]
 }),
 $globals.Domite);
 
@@ -1061,17 +1056,17 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return self._wrap_(self._domListAsArray_($recv(document)._querySelectorAll_(aString)));
+return self._wrap_($recv($globals.PlatformDom)._toArray_($recv(document)._querySelectorAll_(aString)));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allAt:",{aString:aString},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aString"],
-source: "allAt: aString\x0a\x09^ self wrap: (self domListAsArray: (document querySelectorAll: aString))",
-referencedClasses: [],
+source: "allAt: aString\x0a\x09^ self wrap: (PlatformDom toArray: (document querySelectorAll: aString))",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["wrap:", "domListAsArray:", "querySelectorAll:"]
+messageSends: ["wrap:", "toArray:", "querySelectorAll:"]
 }),
 $globals.Domite.klass);
 
@@ -1098,54 +1093,6 @@ messageSends: ["fromElement:", "querySelector:"]
 }),
 $globals.Domite.klass);
 
-$core.addMethod(
-$core.method({
-selector: "createCustomEvent:detail:",
-protocol: 'events',
-fn: function (aString,anObject){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return new CustomEvent(aString, {detail: anObject});
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"createCustomEvent:detail:",{aString:aString,anObject:anObject},$globals.Domite.klass)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aString", "anObject"],
-source: "createCustomEvent: aString detail: anObject\x0a<inlineJS: 'return new CustomEvent(aString, {detail: anObject})'>",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: []
-}),
-$globals.Domite.klass);
-
-$core.addMethod(
-$core.method({
-selector: "domListAsArray:",
-protocol: 'converting',
-fn: function (aDomList){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-return Array.prototype.slice.call(aDomList);
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"domListAsArray:",{aDomList:aDomList},$globals.Domite.klass)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aDomList"],
-source: "domListAsArray: aDomList\x0a<inlineJS: 'return Array.prototype.slice.call(aDomList)'>",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: []
-}),
-$globals.Domite.klass);
-
 $core.addMethod(
 $core.method({
 selector: "fromElement:",

+ 3 - 13
src/DOMite.st

@@ -73,7 +73,7 @@ Event API:
 !Domite methodsFor: 'accessing'!
 
 allAt: aString
-	^ self class wrap: (self class domListAsArray: (self element querySelectorAll: aString))
+	^ self class wrap: (PlatformDom toArray: (self element querySelectorAll: aString))
 !
 
 at: aString
@@ -166,7 +166,7 @@ fire: aString
 
 fire: aString detail: anObject
 	self fireEvent: (
-		self class createCustomEvent: aString detail: anObject)
+		PlatformDom newCustomEvent: aString detail: anObject)
 !
 
 fireEvent: anEvent
@@ -293,24 +293,14 @@ isInvalid
 
 !Domite class methodsFor: 'converting'!
 
-domListAsArray: aDomList
-<inlineJS: 'return Array.prototype.slice.call(aDomList)'>
-!
-
 wrap: aCollection
 	^ aCollection collect: [ :each | self fromElement: each ]
 ! !
 
-!Domite class methodsFor: 'events'!
-
-createCustomEvent: aString detail: anObject
-<inlineJS: 'return new CustomEvent(aString, {detail: anObject})'>
-! !
-
 !Domite class methodsFor: 'instance creation'!
 
 allAt: aString
-	^ self wrap: (self domListAsArray: (document querySelectorAll: aString))
+	^ self wrap: (PlatformDom toArray: (document querySelectorAll: aString))
 !
 
 at: aString