Browse Source

HTMLSnippet >> initialize uses PlatformDom >> isFeasible.

Herbert Vojčík 7 years ago
parent
commit
fd7ccc72c8
3 changed files with 9 additions and 37 deletions
  1. 1 1
      bower.json
  2. 6 30
      src/Web-Snippets.js
  3. 2 6
      src/Web-Snippets.st

+ 1 - 1
bower.json

@@ -24,7 +24,7 @@
   ],
   "private": false,
   "dependencies": {
-    "amber": ">=0.15.0",
+    "amber": ">0.18.1",
     "amber-contrib-jquery": ">=0.2.0"
   },
   "devDependencies": {

+ 6 - 30
src/Web-Snippets.js

@@ -1,6 +1,6 @@
 define(["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
-, "amber/jquery/Wrappers-JQuery"
+, "amber/jquery/Wrappers-JQuery", "amber_core/Platform-DOM"
 //>>excludeEnd("imports");
 , "amber/web/Web", "amber_core/Kernel-Collections", "amber_core/Kernel-Objects"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
@@ -12,7 +12,7 @@ var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boo
 if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
 $core.addPackage('Web-Snippets');
 $core.packages["Web-Snippets"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Web-Snippets"].imports = ["amber/jquery/Wrappers-JQuery"];
+$core.packages["Web-Snippets"].imports = ["amber/jquery/Wrappers-JQuery", "amber_core/Platform-DOM"];
 $core.packages["Web-Snippets"].transport = {"type":"amd","amdNamespace":"amber/web"};
 
 $core.addClass('HTMLSnippet', $globals.Object, ['snippets'], 'Web-Snippets');
@@ -300,7 +300,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=self._isDOMAvailable();
+$1=$recv($globals.PlatformDom)._isFeasible();
 if($core.assert($1)){
 self._ensureCurrent();
 }
@@ -311,34 +311,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "initialize\x0a\x09super initialize.\x0a\x09self isDOMAvailable ifTrue: [\x0a\x09\x09self ensureCurrent ]",
-referencedClasses: [],
+source: "initialize\x0a\x09super initialize.\x0a\x09PlatformDom isFeasible ifTrue: [\x0a\x09\x09self ensureCurrent ]",
+referencedClasses: ["PlatformDom"],
 //>>excludeEnd("ide");
-messageSends: ["initialize", "ifTrue:", "isDOMAvailable", "ensureCurrent"]
-}),
-$globals.HTMLSnippet.klass);
-
-$core.addMethod(
-$core.method({
-selector: "isDOMAvailable",
-protocol: 'instance creation',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
- return typeof document !== 'undefined' ;
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"isDOMAvailable",{},$globals.HTMLSnippet.klass)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "isDOMAvailable\x0a\x09< return typeof document !== 'undefined' >",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: []
+messageSends: ["initialize", "ifTrue:", "isFeasible", "ensureCurrent"]
 }),
 $globals.HTMLSnippet.klass);
 

+ 2 - 6
src/Web-Snippets.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Web-Snippets'!
-(Smalltalk packageAt: 'Web-Snippets') imports: {'amber/jquery/Wrappers-JQuery'}!
+(Smalltalk packageAt: 'Web-Snippets') imports: {'amber/jquery/Wrappers-JQuery'. 'amber_core/Platform-DOM'}!
 Object subclass: #HTMLSnippet
 	instanceVariableNames: 'snippets'
 	package: 'Web-Snippets'!
@@ -113,7 +113,7 @@ ensureCurrent
 
 initialize
 	super initialize.
-	self isDOMAvailable ifTrue: [
+	PlatformDom isFeasible ifTrue: [
 		self ensureCurrent ]
 ! !
 
@@ -123,10 +123,6 @@ current
 	^ current
 !
 
-isDOMAvailable
-	< return typeof document !!== 'undefined' >
-!
-
 new
 	self shouldNotImplement
 ! !