Browse Source

amber loads without amber.js

uses output of `amber config`
Herbert Vojčík 10 years ago
parent
commit
2e1bf432bb
3 changed files with 29 additions and 50 deletions
  1. 26 20
      all.js
  2. 3 2
      index.html
  3. 0 28
      resources/all-inner.js

+ 26 - 20
all.js

@@ -1,28 +1,34 @@
-require.config({
-	paths: {
-		'bootstrap2.3.2': require.toUrl('amber_lib') + '/bootstrap2.3.2/bootstrap',
-		'jquery-ui': require.toUrl('amber_lib/jquery-ui/ui/minified/jquery-ui.min')
-	},
-	shim: {
-		'jquery-ui': {
-			deps: [ 'jquery' ]
-		},
-		'bootstrap2.3.2/js/bootstrap': {
-			deps: [ 'jquery', 'css!bootstrap2.3.2/css/bootstrap' ]
-		},
-		'amber_lib/jquery-tabby/jquery.textarea': {
-			deps: [ 'jquery' ]
-		}
-	}
-});
-
 define([
 	'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',
+    'jquery-ui',
+    'amber_lib/jquery-tabby/jquery.textarea',
+    'amber_core/IDE',
+    'amber_core/Examples',
+    'amber_core/Benchfib',
+    'bootstrap2.3.2/js/bootstrap',
+    'amber_lib/showdown/compressed/showdown',
+    './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',
     'css!./resources/helios',
 	'css!./resources/helios-niflheim',
     'css!./resources/niflheim'

+ 3 - 2
index.html

@@ -10,9 +10,10 @@
     <div id="helper">Loading Helios...</div>
 
     <div id="includes">
-      <script type='text/javascript' src='../amber.js'></script>
       <script type='text/javascript' src='../requirejs/require.min.js'></script>
-      <script type='text/javascript'>
+        <script type='text/javascript' src='../../config.js'></script>
+        <script type='text/javascript'>
+          require.config({baseUrl: '../..'});
           require(
                   ["helios/all"],
                   function (smalltalk) {

+ 0 - 28
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'
-]);