Browse Source

TagBrush >> asDomNode, use it instead of element.

Herbert Vojčík 7 years ago
parent
commit
e64d7956f6
5 changed files with 26 additions and 26 deletions
  1. 2 2
      bower.json
  2. 3 3
      src/Helios-Core.js
  3. 1 1
      src/Helios-Core.st
  4. 15 15
      src/Helios-Workspace.js
  5. 5 5
      src/Helios-Workspace.st

+ 2 - 2
bower.json

@@ -18,8 +18,8 @@
     "MIT"
   ],
   "dependencies": {
-    "amber": ">=0.15.0",
-    "amber-contrib-web": ">=0.3.0",
+    "amber": ">0.18.1",
+    "amber-contrib-web": ">=0.4.0",
     "jquery-ui": ">=1.9.2",
     "bootstrap": "^3.3.4",
     "codemirror": "^5.10.0",

+ 3 - 3
src/Helios-Core.js

@@ -10000,7 +10000,7 @@ return $recv(aTab)._activate();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,6)});
 //>>excludeEnd("ctx");
 }));
-$recv($recv(li)._element())._at_put_("tab-data",aTab);
+$recv($recv(li)._asDomNode())._at_put_("tab-data",aTab);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderTab:on:",{aTab:aTab,html:html,li:li},$globals.HLTabsWidget)});
@@ -10008,10 +10008,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aTab", "html"],
-source: "renderTab: aTab on: html\x0a\x09| li |\x0a\x09li := html li \x0a\x09\x09style: 'width: ', self tabWidth asString, 'px';\x0a\x09\x09class: (aTab isActive ifTrue: [ 'tab active' ] ifFalse: [ 'tab inactive' ]);\x0a\x09\x09with: [\x0a\x09\x09\x09html a\x0a\x09\x09\x09with: [\x0a\x09\x09\x09\x09((html tag: 'i') class: 'close')\x0a\x09\x09\x09\x09\x09onClick: [ self removeTab: aTab ].\x0a\x09\x09\x09\x09html span \x0a\x09\x09\x09\x09\x09class: aTab cssClass;\x0a\x09\x09\x09\x09\x09title: aTab label;\x0a\x09\x09\x09\x09\x09with: aTab label ];\x0a\x09\x09\x09at: 'role' put: 'tab'];\x0a\x09\x09onClick: [ aTab activate ].\x0a\x09\x0a\x09li element at: 'tab-data' put: aTab",
+source: "renderTab: aTab on: html\x0a\x09| li |\x0a\x09li := html li \x0a\x09\x09style: 'width: ', self tabWidth asString, 'px';\x0a\x09\x09class: (aTab isActive ifTrue: [ 'tab active' ] ifFalse: [ 'tab inactive' ]);\x0a\x09\x09with: [\x0a\x09\x09\x09html a\x0a\x09\x09\x09with: [\x0a\x09\x09\x09\x09((html tag: 'i') class: 'close')\x0a\x09\x09\x09\x09\x09onClick: [ self removeTab: aTab ].\x0a\x09\x09\x09\x09html span \x0a\x09\x09\x09\x09\x09class: aTab cssClass;\x0a\x09\x09\x09\x09\x09title: aTab label;\x0a\x09\x09\x09\x09\x09with: aTab label ];\x0a\x09\x09\x09at: 'role' put: 'tab'];\x0a\x09\x09onClick: [ aTab activate ].\x0a\x09\x0a\x09li asDomNode at: 'tab-data' put: aTab",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["style:", "li", ",", "asString", "tabWidth", "class:", "ifTrue:ifFalse:", "isActive", "with:", "a", "onClick:", "tag:", "removeTab:", "span", "cssClass", "title:", "label", "at:put:", "activate", "element"]
+messageSends: ["style:", "li", ",", "asString", "tabWidth", "class:", "ifTrue:ifFalse:", "isActive", "with:", "a", "onClick:", "tag:", "removeTab:", "span", "cssClass", "title:", "label", "at:put:", "activate", "asDomNode"]
 }),
 $globals.HLTabsWidget);
 

+ 1 - 1
src/Helios-Core.st

@@ -2345,7 +2345,7 @@ renderTab: aTab on: html
 			at: 'role' put: 'tab'];
 		onClick: [ aTab activate ].
 	
-	li element at: 'tab-data' put: aTab
+	li asDomNode at: 'tab-data' put: aTab
 !
 
 renderTabsOn: html

+ 15 - 15
src/Helios-Workspace.js

@@ -1316,7 +1316,7 @@ return self._renderButtonsOn_(html);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-self._setEditorOn_($recv(self["@code"])._element());
+self._setEditorOn_($recv(self["@code"])._asDomNode());
 self._configureEditor();
 self._updateState();
 return self;
@@ -1326,10 +1326,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["html"],
-source: "renderContentOn: html\x0a\x09html div class: 'editor'; with: [\x0a\x09\x09code := html textarea ].\x0a\x09state := html div class: 'state'.\x0a\x09\x0a\x09html div \x0a\x09\x09class: 'buttons_bar';\x0a\x09\x09with: [ self renderButtonsOn: html ].\x0a\x09\x0a\x09self \x0a\x09\x09setEditorOn: code element;\x0a\x09\x09configureEditor;\x0a\x09\x09updateState",
+source: "renderContentOn: html\x0a\x09html div class: 'editor'; with: [\x0a\x09\x09code := html textarea ].\x0a\x09state := html div class: 'state'.\x0a\x09\x0a\x09html div \x0a\x09\x09class: 'buttons_bar';\x0a\x09\x09with: [ self renderButtonsOn: html ].\x0a\x09\x0a\x09self \x0a\x09\x09setEditorOn: code asDomNode;\x0a\x09\x09configureEditor;\x0a\x09\x09updateState",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["class:", "div", "with:", "textarea", "renderButtonsOn:", "setEditorOn:", "element", "configureEditor", "updateState"]
+messageSends: ["class:", "div", "with:", "textarea", "renderButtonsOn:", "setEditorOn:", "asDomNode", "configureEditor", "updateState"]
 }),
 $globals.HLCodeWidget);
 
@@ -1383,17 +1383,17 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv(self["@code"])._element())._selectionEnd();
+return $recv($recv(self["@code"])._asDomNode())._selectionEnd();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionEnd",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "selectionEnd\x0a   ^code element selectionEnd",
+source: "selectionEnd\x0a   ^ code asDomNode selectionEnd",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["selectionEnd", "element"]
+messageSends: ["selectionEnd", "asDomNode"]
 }),
 $globals.HLCodeWidget);
 
@@ -1406,7 +1406,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self["@code"])._element())._selectionEnd_(anInteger);
+$recv($recv(self["@code"])._asDomNode())._selectionEnd_(anInteger);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionEnd:",{anInteger:anInteger},$globals.HLCodeWidget)});
@@ -1414,10 +1414,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anInteger"],
-source: "selectionEnd: anInteger\x0a   code element selectionEnd: anInteger",
+source: "selectionEnd: anInteger\x0a   code asDomNode selectionEnd: anInteger",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["selectionEnd:", "element"]
+messageSends: ["selectionEnd:", "asDomNode"]
 }),
 $globals.HLCodeWidget);
 
@@ -1430,17 +1430,17 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv(self["@code"])._element())._selectionStart();
+return $recv($recv(self["@code"])._asDomNode())._selectionStart();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionStart",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "selectionStart\x0a   ^code element selectionStart",
+source: "selectionStart\x0a   ^ code asDomNode selectionStart",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["selectionStart", "element"]
+messageSends: ["selectionStart", "asDomNode"]
 }),
 $globals.HLCodeWidget);
 
@@ -1453,7 +1453,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self["@code"])._element())._selectionStart_(anInteger);
+$recv($recv(self["@code"])._asDomNode())._selectionStart_(anInteger);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionStart:",{anInteger:anInteger},$globals.HLCodeWidget)});
@@ -1461,10 +1461,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anInteger"],
-source: "selectionStart: anInteger\x0a   code element selectionStart: anInteger",
+source: "selectionStart: anInteger\x0a   code asDomNode selectionStart: anInteger",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["selectionStart:", "element"]
+messageSends: ["selectionStart:", "asDomNode"]
 }),
 $globals.HLCodeWidget);
 

+ 5 - 5
src/Helios-Workspace.st

@@ -131,19 +131,19 @@ selection
 !
 
 selectionEnd
-   ^code element selectionEnd
+   ^ code asDomNode selectionEnd
 !
 
 selectionEnd: anInteger
-   code element selectionEnd: anInteger
+   code asDomNode selectionEnd: anInteger
 !
 
 selectionStart
-   ^code element selectionStart
+   ^ code asDomNode selectionStart
 !
 
 selectionStart: anInteger
-   code element selectionStart: anInteger
+   code asDomNode selectionStart: anInteger
 ! !
 
 !HLCodeWidget methodsFor: 'actions'!
@@ -324,7 +324,7 @@ renderContentOn: html
 		with: [ self renderButtonsOn: html ].
 	
 	self 
-		setEditorOn: code element;
+		setEditorOn: code asDomNode;
 		configureEditor;
 		updateState
 ! !