Przeglądaj źródła

Widget inheriting alert: & Co. from InterfacingObject

Herbert Vojčík 10 lat temu
rodzic
commit
4997465bf1
3 zmienionych plików z 3 dodań i 106 usunięć
  1. 1 38
      js/Canvas.deploy.js
  2. 1 53
      js/Canvas.js
  3. 1 15
      st/Canvas.st

+ 1 - 38
js/Canvas.deploy.js

@@ -2609,18 +2609,7 @@ messageSends: ["initializeFromString:canvas:", "new", "yourself"]}),
 smalltalk.StyleTag.klass);
 
 
-smalltalk.addClass('Widget', smalltalk.Object, [], 'Canvas');
-smalltalk.addMethod(
-smalltalk.method({
-selector: "alert:",
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-_st(window)._alert_(aString);
-return self}, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},smalltalk.Widget)})},
-messageSends: ["alert:"]}),
-smalltalk.Widget);
-
+smalltalk.addClass('Widget', smalltalk.InterfacingObject, [], 'Canvas');
 smalltalk.addMethod(
 smalltalk.method({
 selector: "appendToBrush:",
@@ -2644,32 +2633,6 @@ return self}, function($ctx1) {$ctx1.fill(self,"appendToJQuery:",{aJQuery:aJQuer
 messageSends: ["renderOn:", "onJQuery:"]}),
 smalltalk.Widget);
 
-smalltalk.addMethod(
-smalltalk.method({
-selector: "confirm:",
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-var $1;
-$1=_st(window)._confirm_(aString);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},smalltalk.Widget)})},
-messageSends: ["confirm:"]}),
-smalltalk.Widget);
-
-smalltalk.addMethod(
-smalltalk.method({
-selector: "prompt:",
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-var $1;
-$1=_st(window)._prompt_(aString);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},smalltalk.Widget)})},
-messageSends: ["prompt:"]}),
-smalltalk.Widget);
-
 smalltalk.addMethod(
 smalltalk.method({
 selector: "renderOn:",

+ 1 - 53
js/Canvas.js

@@ -3628,24 +3628,8 @@ referencedClasses: []
 smalltalk.StyleTag.klass);
 
 
-smalltalk.addClass('Widget', smalltalk.Object, [], 'Canvas');
+smalltalk.addClass('Widget', smalltalk.InterfacingObject, [], 'Canvas');
 smalltalk.Widget.comment="I am a presenter building HTML. Subclasses are typically reusable components.\x0a\x0a## API\x0a\x0aUse `#renderContentOn:` to build HTML. (See `HTMLCanvas` and `TagBrush` classes for more about building HTML).\x0a\x0aTo add a widget to the page, the convenience method `#appendToJQuery:` is very useful.\x0a\x0aExemple: \x0a\x0a    Counter new appendToJQuery: 'body' asJQuery";
-smalltalk.addMethod(
-smalltalk.method({
-selector: "alert:",
-category: 'actions',
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-_st(window)._alert_(aString);
-return self}, function($ctx1) {$ctx1.fill(self,"alert:",{aString:aString},smalltalk.Widget)})},
-args: ["aString"],
-source: "alert: aString\x0a\x09window alert: aString",
-messageSends: ["alert:"],
-referencedClasses: []
-}),
-smalltalk.Widget);
-
 smalltalk.addMethod(
 smalltalk.method({
 selector: "appendToBrush:",
@@ -3679,42 +3663,6 @@ referencedClasses: ["HTMLCanvas"]
 }),
 smalltalk.Widget);
 
-smalltalk.addMethod(
-smalltalk.method({
-selector: "confirm:",
-category: 'actions',
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-var $1;
-$1=_st(window)._confirm_(aString);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"confirm:",{aString:aString},smalltalk.Widget)})},
-args: ["aString"],
-source: "confirm: aString\x0a\x09^window confirm: aString",
-messageSends: ["confirm:"],
-referencedClasses: []
-}),
-smalltalk.Widget);
-
-smalltalk.addMethod(
-smalltalk.method({
-selector: "prompt:",
-category: 'actions',
-fn: function (aString){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-var $1;
-$1=_st(window)._prompt_(aString);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"prompt:",{aString:aString},smalltalk.Widget)})},
-args: ["aString"],
-source: "prompt: aString\x0a\x09^window prompt: aString",
-messageSends: ["prompt:"],
-referencedClasses: []
-}),
-smalltalk.Widget);
-
 smalltalk.addMethod(
 smalltalk.method({
 selector: "renderOn:",

+ 1 - 15
st/Canvas.st

@@ -1038,7 +1038,7 @@ canvas: aCanvas
 	yourself
 ! !
 
-Object subclass: #Widget
+InterfacingObject subclass: #Widget
 	instanceVariableNames: ''
 	package: 'Canvas'!
 !Widget commentStamp!
@@ -1054,20 +1054,6 @@ Exemple:
 
     Counter new appendToJQuery: 'body' asJQuery!
 
-!Widget methodsFor: 'actions'!
-
-alert: aString
-	window alert: aString
-!
-
-confirm: aString
-	^window confirm: aString
-!
-
-prompt: aString
-	^window prompt: aString
-! !
-
 !Widget methodsFor: 'adding'!
 
 appendToBrush: aTagBrush