Merge pull request #1031 from herby/helios-librarifying

Helios librarifying

internal/index.html

@@ -17,7 +17,7 @@
         }
     });
     require(
-        ["amber/devel", "amber_cli/AmberCli"],
+        ["amber/devel", "helios/all", "amber_cli/AmberCli"],
         function (smalltalk) {
             smalltalk.initialize({'transport.defaultAmdNamespace': "amber_core"});
         }

support/amber.js

@@ -83,7 +83,7 @@ require = function (require) {
             'amber_lib': library_home,
             'amber_core': amber_home + '/src',
             'helios': amber_home + '/support/helios/src',
-            'helios/all': amber_home + '/support/helios/all',
+            'helios/set': amber_home + '/support/helios/set',
             'helios/resources': amber_home + '/support/helios/resources',
             'helios/index': amber_home + '/support/helios/index',
             'jquery': library_home + '/jquery/jquery.min'

support/helios/index.html

@@ -14,7 +14,7 @@
       <script type='text/javascript' src='../requirejs/require.min.js'></script>
       <script type='text/javascript'>
           require(
-                  ["helios/all"],
+                  ["helios/set"],
                   function (smalltalk) {
                       window.onbeforeunload = function() {
                           return 'Do you want to close Amber? All uncommitted changes will be lost.';

support/helios/resources/all-inner.js

@@ -1,28 +0,0 @@
-// Loading this in nested file so that require.config
-// with shim dependencies is in effect.
-// See http://stackoverflow.com/questions/21647956/how-to-config-requirejs-shim-dependencies-just-in-time/
-
-define([
-	'amber/devel-inner',
-	'bootstrap2.3.2/js/bootstrap',
-	'amber_lib/showdown/compressed/showdown',
-	'helios/Helios-Core',
-	'helios/Helios-Exceptions',
-	'helios/Helios-Helpers',
-	'helios/Helios-Commands-Core',
-	'helios/Helios-Commands-Tools',
-	'helios/Helios-Commands-Browser',
-	'helios/Helios-Commands-SUnit',
-	'helios/Helios-Layout',
-	'helios/Helios-KeyBindings',
-	'helios/Helios-Browser',
-	'helios/Helios-Workspace',
-	'helios/Helios-Transcript',
-	'helios/Helios-SUnit',
-	'helios/Helios-SUnit-Tests',
-	'helios/Helios-Debugger',
-	'helios/Helios-Inspector',
-	'helios/Helios-References',
-	'helios/Helios-Announcements',
-	'helios/Helios-Workspace-Tests'
-]);

support/helios/resources/set-inner.js

@@ -0,0 +1,10 @@
+// Loading this in nested file so that require.config
+// with shim dependencies is in effect.
+// See http://stackoverflow.com/questions/21647956/how-to-config-requirejs-shim-dependencies-just-in-time/
+
+define([
+	'amber/devel-inner',
+	'bootstrap2.3.2/js/bootstrap',
+	'amber_lib/showdown/compressed/showdown',
+    'helios/all'
+]);

support/helios/all.js → support/helios/set.js

@@ -22,7 +22,7 @@ define([
 	'amber/lang',
 	'amber/codemirror',
 	'amber/devel-inner', // pre-fetch, dep of ./all-inner
-	'./resources/all-inner',
+	'./resources/set-inner',
     'css!./resources/helios',
 	'css!./resources/helios-niflheim',
     'css!./resources/niflheim'

support/helios/src/all.js

@@ -0,0 +1,21 @@
+define([
+	'./Helios-Core',
+	'./Helios-Exceptions',
+	'./Helios-Helpers',
+	'./Helios-Commands-Core',
+	'./Helios-Commands-Tools',
+	'./Helios-Commands-Browser',
+	'./Helios-Commands-SUnit',
+	'./Helios-Layout',
+	'./Helios-KeyBindings',
+	'./Helios-Browser',
+	'./Helios-Workspace',
+	'./Helios-Transcript',
+	'./Helios-SUnit',
+	'./Helios-SUnit-Tests',
+	'./Helios-Debugger',
+	'./Helios-Inspector',
+	'./Helios-References',
+	'./Helios-Announcements',
+	'./Helios-Workspace-Tests'
+]);