Browse Source

Add ProfStef.

Herby Vojčík 5 years ago
parent
commit
1ecd86241c
5 changed files with 32 additions and 26 deletions
  1. 16 17
      config.js
  2. 1 1
      deploy.js
  3. 11 5
      learn.html
  4. 4 3
      package.json
  5. 0 0
      the.js

+ 16 - 17
config.js

@@ -8,25 +8,26 @@ require.config({
     "tingle": "node_modules/tingle.js/dist/tingle",
     "require-css": "node_modules/require-css",
     "mousetrap": "node_modules/mousetrap/mousetrap",
-    "jquery": "node_modules/jquery/dist/jquery",
-    "jquery-ui": "node_modules/jquery-ui-dist/jquery-ui",
-    "codemirror": "node_modules/codemirror",
     "typeahead": "node_modules/typeahead.js/dist/typeahead.jquery",
     "helios/showdown": "node_modules/showdown/src/showdown",
     "requireJS": "node_modules/requirejs/require",
+    "jquery-ui": "node_modules/jquery-ui-dist/jquery-ui",
+    "jquery": "node_modules/jquery/dist/jquery",
+    "codemirror": "node_modules/codemirror",
     "bootstrap": "node_modules/bootstrap/dist",
     "silk": "node_modules/@ambers/silk/src",
+    "amber-ide-starter-dialog": "node_modules/@ambers/ide-starter-modal/lib/idestarter",
     "amber": "node_modules/@ambers/lang/support",
     "amber_core": "node_modules/@ambers/lang/src",
+    "profstef": "node_modules/@ambers/prof-stef/src",
+    "helios": "node_modules/@ambers/helios/src",
+    "helios/resources": "node_modules/@ambers/helios/resources",
+    "helios/index": "node_modules/@ambers/helios/index",
     "domite": "node_modules/@ambers/domite/src",
-    "amber-ide-starter-dialog": "node_modules/@ambers/ide-starter-modal/lib/idestarter",
-    "amber/jquery": "node_modules/@ambers/contrib-jquery/src",
     "amber/web": "node_modules/@ambers/contrib-web/src",
+    "amber/jquery": "node_modules/@ambers/contrib-jquery/src",
     "amber/legacy": "node_modules/@ambers/contrib-legacy/src",
     "amber/legacy/resources": "node_modules/@ambers/contrib-legacy/resources",
-    "helios": "node_modules/@ambers/helios/src",
-    "helios/resources": "node_modules/@ambers/helios/resources",
-    "helios/index": "node_modules/@ambers/helios/index",
     "amber/website": "src"
   },
   "map": {
@@ -37,36 +38,34 @@ require.config({
       "amber_core/Kernel-ImportExport": "amber_core/Platform-ImportExport",
       "amber/domite/DOMite": "domite/DOMite",
       "amber/domite/DOMite-Tests": "domite/DOMite-Tests",
-      "amber-contrib-jquery/Wrappers-JQuery": "amber/jquery/Wrappers-JQuery",
       "amber-contrib-web/Web": "amber/web/Web",
       "amber_core/Web": "amber/web/Web",
       "amber_core/Canvas": "amber/web/Web",
+      "amber-contrib-jquery/Wrappers-JQuery": "amber/jquery/Wrappers-JQuery",
       "amber-attic/Benchfib": "amber/legacy/Benchfib",
       "amber-attic/Examples": "amber/legacy/Examples",
       "amber-attic/IDE": "amber/legacy/IDE"
     }
   },
   "shim": {
+    "typeahead": {
+      "deps": [
+        "jquery"
+      ],
+      "exports": "jQuery.fn.typeahead"
+    },
     "jquery-ui": {
       "deps": [
-        "jquery",
         "jquery",
         "jquery"
       ]
     },
     "codemirror/lib/codemirror": {
       "deps": [
-        "css!codemirror/lib/codemirror",
         "css!codemirror/lib/codemirror",
         "css!codemirror/lib/codemirror"
       ]
     },
-    "typeahead": {
-      "deps": [
-        "jquery"
-      ],
-      "exports": "jQuery.fn.typeahead"
-    },
     "bootstrap/js/bootstrap": {
       "deps": [
         "jquery",

+ 1 - 1
deploy.js

@@ -6,7 +6,7 @@ define([
     "silk/Silk-Tests",
     "amber_core/SUnit",
     'amber/legacy/IDE',
-    // 'trysmalltalk/TrySmalltalk'
+    'profstef/ProfStef'
     // --- packages to be deployed end here ---
 ], function (amber) {
     return amber;

+ 11 - 5
learn.html

@@ -6,16 +6,22 @@
     <link href='http://fonts.googleapis.com/css?family=Istok+Web' rel='stylesheet' type='text/css'>
     <meta name="author" content="Nicolas Petton">
     <link rel="stylesheet" type="text/css" href="css/profstef.css">
+    <script type='text/javascript' src='/node_modules/es6-promise/dist/es6-promise.auto.js'></script>
     <script type='text/javascript' src='the.js'></script>
     <script type='text/javascript'>
-        require(['app', 'jquery'], function (amber, $) {
+        var global = typeof global === "undefined" ? window : global || window;
+        new Promise(function (resolve, reject) {
+            require(['app', 'jquery'], resolve, reject);
+        }).then(function (amber) {
+            var $ = require('jquery');
             amber.initialize({
                 //used for all new packages in IDE
-                'transport.defaultAmdNamespace': "amber-trysmalltalk"
+                'transport.defaultAmdNamespace': "amber/website"
+            }).then(function () {
+                $('#tutorial').empty();
+                $('#version').text('v' + amber.globals.Smalltalk._version());
+                amber.globals.TrySmalltalkWidget._new()._appendToJQuery_(jQuery('#tutorial'));
             });
-            $('#tutorial').empty();
-            $('#version').text('v' + amber.globals.Smalltalk._version());
-            amber.globals.TrySmalltalkWidget._new()._appendToJQuery_(jQuery('#tutorial'));
         });
     </script>
 

+ 4 - 3
package.json

@@ -31,10 +31,11 @@
     "@ambers/contrib-jquery": "^0.5.1",
     "@ambers/contrib-legacy": "^0.7.1",
     "@ambers/contrib-web": "^0.6.2",
-    "@ambers/lang": "^0.22.2",
     "@ambers/domite": "^0.8.0",
-    "es6-promise": "^4.2.4",
-    "@ambers/silk": "^0.4.0"
+    "@ambers/lang": "^0.22.2",
+    "@ambers/prof-stef": "^0.2.0",
+    "@ambers/silk": "^0.4.0",
+    "es6-promise": "^4.2.4"
   },
   "devDependencies": {
     "@ambers/ide-starter-modal": "^0.2.0",

File diff suppressed because it is too large
+ 0 - 0
the.js


Some files were not shown because too many files changed in this diff