Explorar el Código

Use imports, remove map trick.

Set dependency constraint to 0.14.3 so imports are not lost.
Herbert Vojčík hace 9 años
padre
commit
6ded3f070f
Se han modificado 5 ficheros con 6 adiciones y 23 borrados
  1. 2 1
      bower.json
  2. 1 6
      local.amd.json
  3. 2 1
      src/IDE.js
  4. 1 0
      src/IDE.st
  5. 0 15
      support/IDE.private.js

+ 2 - 1
bower.json

@@ -28,13 +28,14 @@
     ],
     "private": false,
     "dependencies": {
-        "amber": "^0.14.0",
+        "amber": ">=0.14.1",
         "jquery-ui": ">=1.9.2",
         "codemirror": "^4.7.0",
         "require-css": "^0.1.2"
     },
     "devDependencies": {
         "amber-ide-starter-dialog": "^0.1.0",
+        "amber": ">=0.14.3",
         "helios": "^0.3.2"
     }
 }

+ 1 - 6
local.amd.json

@@ -1,11 +1,6 @@
 {
     "paths": {
         "amber-attic": "src",
-        "amber-attic/resources": "resources",
-        "amber-attic/IDE.private": "support/IDE.private"
-    },
-    "map": {
-        "*": {"amber-attic/IDE": "amber-attic/IDE.private"},
-        "amber-attic/IDE.private":{"amber-attic/IDE": "amber-attic/IDE"}
+        "amber-attic/resources": "resources"
     }
 }

+ 2 - 1
src/IDE.js

@@ -1,7 +1,8 @@
-define("amber-attic/IDE", ["amber/boot", "amber_core/Web", "amber_core/Kernel-Objects", "amber_core/Kernel-Collections", "amber_core/Kernel-Methods"], function($boot){
+define("amber-attic/IDE", ["amber/boot", "codemirror/lib/codemirror", "codemirror/mode/smalltalk/smalltalk", "codemirror/addon/hint/show-hint", "css!codemirror/theme/ambiance", "css!codemirror/lib/codemirror", "css!codemirror/addon/hint/show-hint", "jquery-ui", "css!./resources/amber", "amber_core/Web", "amber_core/Kernel-Objects", "amber_core/Kernel-Collections", "amber_core/Kernel-Methods"], function($boot){
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('IDE');
 $core.packages["IDE"].innerEval = function (expr) { return eval(expr); };
+$core.packages["IDE"].imports = ["codemirror/addon/hint/show-hint", "codemirror/lib/codemirror", "codemirror/mode/smalltalk/smalltalk", "css!./resources/amber", "css!codemirror/addon/hint/show-hint", "css!codemirror/lib/codemirror", "css!codemirror/theme/ambiance", "jquery-ui"];
 $core.packages["IDE"].transport = {"type":"amd","amdNamespace":"amber-attic"};
 
 $core.addClass('ClassesList', $globals.Widget, ['browser', 'ul', 'nodes'], 'IDE');

+ 1 - 0
src/IDE.st

@@ -1,4 +1,5 @@
 Smalltalk createPackage: 'IDE'!
+(Smalltalk packageAt: 'IDE') imports: {'codemirror/addon/hint/show-hint'. 'codemirror/lib/codemirror'. 'codemirror/mode/smalltalk/smalltalk'. 'css!./resources/amber'. 'css!codemirror/addon/hint/show-hint'. 'css!codemirror/lib/codemirror'. 'css!codemirror/theme/ambiance'. 'jquery-ui'}!
 Widget subclass: #ClassesList
 	instanceVariableNames: 'browser ul nodes'
 	package: 'IDE'!

+ 0 - 15
support/IDE.private.js

@@ -1,15 +0,0 @@
-// Loads runtime dependencies (needed at init-time)
-// of amber-attic/IDE.
-define([
-    "amber-attic/IDE",
-    "codemirror/lib/codemirror",
-    "codemirror/mode/smalltalk/smalltalk",
-    "codemirror/addon/hint/show-hint",
-    "css!codemirror/theme/ambiance",
-    "css!codemirror/lib/codemirror",
-    "css!codemirror/addon/hint/show-hint",
-    "jquery-ui",
-    "css!./resources/amber"
-], function (x) {
-    return x;
-});