Browse Source

Bump amber dependency, recompile.

Herbert Vojčík 7 years ago
parent
commit
c60a5fc301
3 changed files with 56 additions and 98 deletions
  1. 1 1
      bower.json
  2. 1 2
      src/DOMite-Tests.js
  3. 54 95
      src/DOMite.js

+ 1 - 1
bower.json

@@ -26,7 +26,7 @@
   ],
   "private": false,
   "dependencies": {
-    "amber": ">=0.15.0"
+    "amber": ">0.18.1"
   },
   "devDependencies": {
     "amber-contrib-legacy": ">=0.3.0",

+ 1 - 2
src/DOMite-Tests.js

@@ -1081,8 +1081,7 @@ selector: "testedClass",
 protocol: 'fixture',
 fn: function (){
 var self=this;
-function $Domite(){return $globals.Domite||(typeof Domite=="undefined"?nil:Domite)}
-return $Domite();
+return $globals.Domite;
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 54 - 95
src/DOMite.js

@@ -83,13 +83,12 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=self._class();
+var $1;
+$1=self._class();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["class"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($2)._wrap_($recv(self._class())._domListAsArray_($recv(self._element())._querySelectorAll_(aString)));
-return $1;
+return $recv($1)._wrap_($recv(self._class())._domListAsArray_($recv(self._element())._querySelectorAll_(aString)));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allAt:",{aString:aString},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -112,9 +111,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._element())._asJQuery();
-return $1;
+return $recv(self._element())._asJQuery();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asJQuery",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -137,9 +134,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._fromElement_($recv(self._element())._querySelector_(aString));
-return $1;
+return $recv(self._class())._fromElement_($recv(self._element())._querySelector_(aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"at:",{aString:aString},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -162,9 +157,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._reference())._isNil();
-return $1;
+return $recv(self._reference())._isNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"atEnd",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -187,9 +180,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._reference()).__eq($recv(self._element())._firstChild());
-return $1;
+return $recv(self._reference()).__eq($recv(self._element())._firstChild());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"atStart",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -212,14 +203,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self["@element"])._hasAttribute_(aString);
 if($core.assert($1)){
-$2=$recv(self["@element"])._getAttribute_(aString);
-return $2;
+return $recv(self["@element"])._getAttribute_(aString);
 } else {
 return nil;
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"attrAt:",{aString:aString},$globals.Domite)});
@@ -267,9 +257,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._element())._parentNode())._notNil();
-return $1;
+return $recv($recv(self._element())._parentNode())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"canSetToUpperLevel",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -324,9 +312,7 @@ selector: "element",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@element"];
-return $1;
+return self["@element"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -440,9 +426,9 @@ return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = true, 
+$ctx1.supercall = true,
 //>>excludeEnd("ctx");
-$globals.Domite.superclass.fn.prototype._initialize.apply($recv(self), []));
+($globals.Domite.superclass||$boot.nilAsClass).fn.prototype._initialize.apply($recv(self), []));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
@@ -471,9 +457,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._element())._isNil();
-return $1;
+return $recv(self._element())._isNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isInvalid",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -496,7 +480,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._atEnd();
 if($core.assert($1)){
 return nil;
@@ -505,9 +489,8 @@ var result;
 result=self._peek();
 result;
 self._setToNext();
-$2=result;
-return $2;
-};
+return result;
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"next",{},$globals.Domite)});
@@ -585,7 +568,7 @@ if($core.assert($1)){
 self._nextPutDomNode_(aJSObject);
 } else {
 self._nextPut_(aJSObject);
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextPutJSObject:",{aJSObject:aJSObject},$globals.Domite)});
@@ -681,16 +664,15 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self._reference();
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$2;
+var $1,$receiver;
+$1=self._reference();
+if(($receiver = $1) == null || $receiver.isNil){
+return $1;
 } else {
 var ref;
 ref=$receiver;
-$1=$recv(self._class())._fromElement_(ref);
-};
-return $1;
+return $recv(self._class())._fromElement_(ref);
+}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"peek",{},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -713,15 +695,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._atStart();
 if($core.assert($1)){
 return nil;
 } else {
 self._setToPrev();
-$2=self._peek();
-return $2;
-};
+return self._peek();
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"prev",{},$globals.Domite)});
@@ -745,9 +726,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@element"])._at_(aString);
-return $1;
+return $recv(self["@element"])._at_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"propAt:",{aString:aString},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -770,9 +749,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@element"])._at_put_(aString,anObject);
-return $1;
+return $recv(self["@element"])._at_put_(aString,anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"propAt:put:",{aString:aString,anObject:anObject},$globals.Domite)});
 //>>excludeEnd("ctx");
@@ -816,9 +793,7 @@ selector: "reference",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@reference"];
-return $1;
+return self["@reference"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -909,14 +884,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$3;
+var $2,$1;
 $2=self._element();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["element"]=1;
 //>>excludeEnd("ctx");
 $1=$recv($2)._nextSibling();
 self._reference_($1);
-$3=self._element_($recv(self._element())._parentNode());
+self._element_($recv(self._element())._parentNode());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setToAfter",{},$globals.Domite)});
@@ -940,13 +915,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._element();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["element"]=1;
 //>>excludeEnd("ctx");
 self._reference_($1);
-$2=self._element_($recv(self._element())._parentNode());
+self._element_($recv(self._element())._parentNode());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setToBefore",{},$globals.Domite)});
@@ -998,7 +973,7 @@ var $1;
 $1=self._atEnd();
 if(!$core.assert($1)){
 self._reference_($recv(self._reference())._nextSibling());
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setToNext",{},$globals.Domite)});
@@ -1032,9 +1007,9 @@ $2=$recv(self._element())._lastChild();
 var ref;
 ref=$receiver;
 $2=$recv(ref)._previousSibling();
-};
+}
 self._reference_($2);
-};
+}
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setToPrev",{},$globals.Domite)});
@@ -1059,9 +1034,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._wrap_(self._domListAsArray_($recv(document)._querySelectorAll_(aString)));
-return $1;
+return self._wrap_(self._domListAsArray_($recv(document)._querySelectorAll_(aString)));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allAt:",{aString:aString},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1084,9 +1057,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._fromElement_($recv(document)._querySelector_(aString));
-return $1;
+return self._fromElement_($recv(document)._querySelector_(aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"at:",{aString:aString},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1157,20 +1128,18 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$2,$receiver;
+var $1,$2,$receiver;
 if(($receiver = aDomElement) == null || $receiver.isNil){
 aDomElement;
 } else {
 $1=self._isDomNode_(aDomElement);
 if(!$core.assert($1)){
 self._error_($recv(self._name()).__comma(": Need a DOM node"));
-};
-};
-$3=self._new();
-$recv($3)._element_(aDomElement);
-$4=$recv($3)._yourself();
-$2=$4;
-return $2;
+}
+}
+$2=self._new();
+$recv($2)._element_(aDomElement);
+return $recv($2)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"fromElement:",{aDomElement:aDomElement},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1193,12 +1162,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._fromElement_(aDomElement);
-$recv($2)._reference_(anotherDomElement);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._fromElement_(aDomElement);
+$recv($1)._reference_(anotherDomElement);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"fromElement:cursorBefore:",{aDomElement:aDomElement,anotherDomElement:anotherDomElement},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1247,9 +1214,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._fromElement_($recv(document)._createElement_(aString));
-return $1;
+return self._fromElement_($recv(document)._createElement_(aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newElement:",{aString:aString},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1272,9 +1237,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._fromElement_($recv(document)._createElementNS_tagName_(anotherString,aString));
-return $1;
+return self._fromElement_($recv(document)._createElementNS_tagName_(anotherString,aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newElement:xmlns:",{aString:aString,anotherString:anotherString},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1297,9 +1260,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._fromElement_($recv(document)._createDocumentFragment());
-return $1;
+return self._fromElement_($recv(document)._createDocumentFragment());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newStream",{},$globals.Domite.klass)});
 //>>excludeEnd("ctx");
@@ -1322,8 +1283,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aCollection)._collect_((function(each){
+return $recv(aCollection)._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1332,7 +1292,6 @@ return self._fromElement_(each);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"wrap:",{aCollection:aCollection},$globals.Domite.klass)});
 //>>excludeEnd("ctx");