Browse Source

set is inside helios namespace

Herbert Vojčík 10 years ago
parent
commit
52a2bbd2b0
4 changed files with 11 additions and 10 deletions
  1. 1 0
      support/amber.js
  2. 1 1
      support/helios/all-inner.js
  3. 8 8
      support/helios/all.js
  4. 1 1
      support/helios/index.html

+ 1 - 0
support/amber.js

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

+ 1 - 1
support/helios-inner.js → support/helios/all-inner.js

@@ -3,7 +3,7 @@
 // See http://stackoverflow.com/questions/21647956/how-to-config-requirejs-shim-dependencies-just-in-time/
 
 define([
-	'./devel-inner',
+	'amber/devel-inner',
 	'amber_lib/bootstrap/js/bootstrap',
 	'amber_lib/showdown/compressed/showdown',
 	'amber_core/Spaces',

+ 8 - 8
support/helios.js → support/helios/all.js

@@ -16,12 +16,12 @@ require.config({
 });
 
 define([
-	'./helpers', // pre-fetch, dep of ./deploy
-	'./deploy', // pre-fetch, dep of ./lang
-	'./lang',
-	'./codemirror',
-	'./devel-inner', // pre-fetch, dep of ./helios-inner
-	'./helios-inner',
-    'css!helios/res/helios',
-	'css!helios/res/helios-niflheim'
+	'amber/helpers', // pre-fetch, dep of amber/deploy
+	'amber/deploy', // pre-fetch, dep of amber/lang
+	'amber/lang',
+	'amber/codemirror',
+	'amber/devel-inner', // pre-fetch, dep of ./all-inner
+	'./resources/all-inner',
+    'css!./resources/helios',
+	'css!./resources/helios-niflheim'
 ], function (smalltalk) { return smalltalk; });

+ 1 - 1
support/helios/index.html

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