Home Explore Help
Register Sign In
huperniketes
/
amber
forked from amber/amber
1
0
Fork 0
Files
Browse Source

Helios working with requirejs, small other fixes

Herbert Vojčík 12 years ago
parent
c7b30e3ea2
commit
8777ac4154
7 changed files with 80 additions and 22 deletions
Unified View Show Diff Stats
  1. 10 15
      helios.html
  2. 2 2
      js/Helios-Core.deploy.js
  3. 3 3
      js/Helios-Core.js
  4. 1 1
      st/Helios-Core.st
  5. 9 0
      support/amber.js
  6. 55 0
      support/full-devel-helios.js
  7. 0 1
      support/full-devel.js

+ 10 - 15
helios.html
View File 

@@ -4,30 +4,25 @@
 
     <title>Helios IDE</title>
 
     <title>Helios IDE</title>
 
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
     <meta name="author" content="Nicolas Petton" />
 
     <meta name="author" content="Nicolas Petton" />
 
-    <link rel="stylesheet" type="text/css" href='support/bootstrap/css/bootstrap.css' />
 
     <link type="image/x-icon" rel="shortcut icon" href="/favicon.ico"/>
 
     <link type="image/x-icon" rel="shortcut icon" href="/favicon.ico"/>
 
-    <link rel="stylesheet" type="text/css" href='css/helios.css' />
 
   </head>
 
   </head>
 
   <body id="helios">
 
   <body id="helios">
 
     <div id="helper">Loading Helios...</div>
 
     <div id="helper">Loading Helios...</div>
 
 
 
     <div id="includes">
 
     <div id="includes">
 
-      <script type='text/javascript' src='support/jQuery/jquery-1.8.2.min.js'></script>
 
-      <script type='text/javascript' src='support/jQuery/jquery-ui-1.8.24.custom.min.js'></script>
 
-      <script type='text/javascript' src='support/bootstrap/js/bootstrap.js'></script>
 
-      <script type='text/javascript' src='support/showdown/showdown.js'></script>
 
       <script type='text/javascript' src='support/amber.js'></script>
 
       <script type='text/javascript' src='support/amber.js'></script>
 
+      <script type='text/javascript' src='support/requirejs/require.min.js'></script>
 
       <script type='text/javascript'>
 
       <script type='text/javascript'>
 
-        loadAmber({packages: [
 
-          'Spaces', 'Helios-Core', 'Helios-Exceptions', 'Helios-Commands-Core',
 
-          'Helios-Commands-Tools', 'Helios-Commands-Browser', 'Helios-Layout', 'Helios-KeyBindings',
 
-          'Helios-Browser', 'Helios-Workspace', 'Helios-Transcript', 'Helios-Debugger',
 
-          'Helios-Inspector', 'Helios-References', 'Helios-Announcements', 'Helios-Workspace-Tests'
 
-        ]})
 
+          require(
 
+                  ["amber_vm/smalltalk", "amber_set/full-devel-helios"],
 
+                  function (smalltalk) {
 
+                      window.onbeforeunload = function() {
 
+                          return 'Do you want to close Amber? All uncommitted changes will be lost.';
 
+                      };
 
 
 
-        window.onbeforeunload = function() {
 
-          return 'Do you want to close Amber? All uncommitted changes will be lost.';
 
-        };
 
+                      smalltalk.initialize();
 
+                  }
 
+          );
 
       </script>
 
       </script>
 
     </div>
 
     </div>
 
   </body>
 
   </body>

+ 2 - 2
js/Helios-Core.deploy.js
View File 

@@ -2446,10 +2446,10 @@ return $3;
 
 } else {
 
 } else {
 
 $2;
 
 $2;
 
 };
 
 };
 
-$4=_st(_st(_st(parent)._at_("global_smalltalk"))._at_("Environment"))._new();
 
+$4=_st(_st(_st(_st(parent)._at_("requirejs"))._value_("amber_vm/smalltalk"))._at_("Environment"))._new();
 
 return $4;
 
 return $4;
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
-messageSends: ["ifNil:", "parent", "opener", "new", "at:"]}),
 
+messageSends: ["ifNil:", "parent", "opener", "new", "at:", "value:"]}),
 
 smalltalk.HLManager);
 
 smalltalk.HLManager);
 
 
 
 smalltalk.addMethod(
 
 smalltalk.addMethod(

+ 3 - 3
js/Helios-Core.js
View File 

@@ -3223,12 +3223,12 @@ return $3;
 
 } else {
 
 } else {
 
 $2;
 
 $2;
 
 };
 
 };
 
-$4=_st(_st(_st(parent)._at_("global_smalltalk"))._at_("Environment"))._new();
 
+$4=_st(_st(_st(_st(parent)._at_("requirejs"))._value_("amber_vm/smalltalk"))._at_("Environment"))._new();
 
 return $4;
 
 return $4;
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
 args: [],
 
 args: [],
 
-source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09^ ((parent at: 'global_smalltalk')\x0a\x09\x09at: 'Environment') new",
 
-messageSends: ["ifNil:", "parent", "opener", "new", "at:"],
 
+source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09^ (((parent at: 'requirejs') value: 'amber_vm/smalltalk')\x0a\x09\x09at: 'Environment') new",
 
+messageSends: ["ifNil:", "parent", "opener", "new", "at:", "value:"],
 
 referencedClasses: ["Environment"]
 
 referencedClasses: ["Environment"]
 
 }),
 
 }),
 
 smalltalk.HLManager);
 
 smalltalk.HLManager);

+ 1 - 1
st/Helios-Core.st
View File 

@@ -1222,7 +1222,7 @@ defaultEnvironment
 
 	parent := window opener ifNil: [ window parent ].
 
 	parent := window opener ifNil: [ window parent ].
 
 	parent ifNil: [ ^ Environment new ].
 
 	parent ifNil: [ ^ Environment new ].
 
 	
 	
-	^ ((parent at: 'global_smalltalk')
 
+	^ (((parent at: 'requirejs') value: 'amber_vm/smalltalk')
 
 		at: 'Environment') new
 
 		at: 'Environment') new
 
 ! !
 
 ! !

+ 9 - 0
support/amber.js
View File 

@@ -29,12 +29,21 @@ require = function (require) {
 
         map: {
 
         map: {
 
             '*': {
 
             '*': {
 
                 'css': 'requirejs/require-css-0.0.6/css'
 
                 'css': 'requirejs/require-css-0.0.6/css'
 
+            },
 
+            'amber_set/full-devel-helios': {
 
+                'jquery-ui': 'jQuery/jquery-ui-1.8.24.custom.min'
 
             }
 
             }
 
         },
 
         },
 
         shim: {
 
         shim: {
 
             'jquery-ui': {
 
             'jquery-ui': {
 
                 deps: [ 'jquery' ]
 
                 deps: [ 'jquery' ]
 
             },
 
             },
 
+            'bootstrap/js/bootstrap': {
 
+                deps: [ 'css!bootstrap/css/bootstrap' ]
 
+            },
 
+            'CodeMirror/codemirror': {
 
+                deps: [ 'css!CodeMirror/codemirror' ]
 
+            },
 
             'jQuery/jquery.textarea': {
 
             'jQuery/jquery.textarea': {
 
                 deps: [ 'jquery', 'jquery-ui' ]
 
                 deps: [ 'jquery', 'jquery-ui' ]
 
             },
 
             },

+ 55 - 0
support/full-devel-helios.js
View File 

@@ -0,0 +1,55 @@
 
+define([
 
+    'jquery',
 
+    'jquery-ui',
 
+    'jQuery/jquery.textarea',
 
+    'bootstrap/js/bootstrap',
 
+    'showdown/showdown',
 
+    'CodeMirror/codemirror',
 
+    'CodeMirror/smalltalk',
 
+    'CodeMirror/addon/hint/show-hint',
 
+    'css!CodeMirror/theme/ambiance',
 
+    'css!CodeMirror/addon/hint/show-hint',
 
+    'css!CodeMirror/amber',
 
+    'css!../../css/helios',
 
+    'amber/Kernel-Objects',
 
+    'amber/Kernel-Classes',
 
+    'amber/Kernel-Methods',
 
+    'amber/Kernel-Collections',
 
+    'amber/Kernel-Infrastructure',
 
+    'amber/Kernel-Exceptions',
 
+    'amber/Kernel-Transcript',
 
+    'amber/Kernel-Announcements',
 
+    'amber/Canvas',
 
+    'amber/SUnit',
 
+    'amber/Importer-Exporter',
 
+    'amber/Compiler-Exceptions',
 
+    'amber/Compiler-Core',
 
+    'amber/Compiler-AST',
 
+    'amber/Compiler-Semantic',
 
+    'amber/Compiler-IR',
 
+    'amber/Compiler-Inlining',
 
+    'amber/Compiler-Interpreter',
 
+    'amber/Compiler-Tests',
 
+    'amber_vm/parser',
 
+    'amber/IDE',
 
+    'amber/Examples',
 
+    'amber/Benchfib',
 
+    'amber/Kernel-Tests',
 
+    'amber/SUnit-Tests',
 
+    'amber/Spaces',
 
+    'amber/Helios-Core',
 
+    'amber/Helios-Exceptions',
 
+    'amber/Helios-Commands-Core',
 
+    'amber/Helios-Commands-Tools',
 
+    'amber/Helios-Commands-Browser',
 
+    'amber/Helios-Layout',
 
+    'amber/Helios-KeyBindings',
 
+    'amber/Helios-Browser',
 
+    'amber/Helios-Workspace',
 
+    'amber/Helios-Transcript',
 
+    'amber/Helios-Debugger',
 
+    'amber/Helios-Inspector',
 
+    'amber/Helios-References',
 
+    'amber/Helios-Announcements',
 
+    'amber/Helios-Workspace-Tests'
 
+], {});

+ 0 - 1
support/full-devel.js
View File 

@@ -5,7 +5,6 @@ define([
 
     'CodeMirror/codemirror',
 
     'CodeMirror/codemirror',
 
     'CodeMirror/smalltalk',
 
     'CodeMirror/smalltalk',
 
     'CodeMirror/addon/hint/show-hint',
 
     'CodeMirror/addon/hint/show-hint',
 
-    'css!CodeMirror/codemirror',
 
     'css!CodeMirror/theme/ambiance',
 
     'css!CodeMirror/theme/ambiance',
 
     'css!CodeMirror/addon/hint/show-hint',
 
     'css!CodeMirror/addon/hint/show-hint',
 
     'css!CodeMirror/amber',
 
     'css!CodeMirror/amber',