Browse Source

Merge branch 'master' into moka

Conflicts:
	support/amber.js
Nicolas Petton 11 years ago
parent
commit
4ac370b290
4 changed files with 32 additions and 4 deletions
  1. 18 0
      js/Kernel-ImportExport.js
  2. 6 0
      st/Kernel-ImportExport.st
  3. 1 1
      support/amber.js
  4. 7 3
      support/helpers.js

+ 18 - 0
js/Kernel-ImportExport.js

@@ -2256,4 +2256,22 @@ referencedClasses: []
 }),
 smalltalk.AmdPackageTransport.klass);
 
+smalltalk.addMethod(
+smalltalk.method({
+selector: "commit",
+category: '*Kernel-ImportExport',
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+var $1;
+$1=_st(self._transport())._commit();
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"commit",{},smalltalk.Package)})},
+args: [],
+source: "commit\x0a\x09^ self transport commit",
+messageSends: ["commit", "transport"],
+referencedClasses: []
+}),
+smalltalk.Package);
+
 });

+ 6 - 0
st/Kernel-ImportExport.st

@@ -827,3 +827,9 @@ namespace: aString
 		yourself
 ! !
 
+!Package methodsFor: '*Kernel-ImportExport'!
+
+commit
+	^ self transport commit
+! !
+

+ 1 - 1
support/amber.js

@@ -55,7 +55,7 @@ require = function (require) {
             'amber_core/_source': amber_home + '/st',
             'amber_html': amber_home,
             'jquery': library_home + '/jquery/jquery.min',
-            'jquery-ui': library_home + '/jquery-ui/ui/jquery-ui',
+            'jquery-ui': library_home + '/jquery-ui/ui/minified/jquery-ui.min',
 			'mousewheel': library_home + '/jquery-mousewheel/jquery.mousewheel'
         },
         map: {

+ 7 - 3
support/helpers.js

@@ -1,8 +1,12 @@
 define("amber/helpers", ["amber_vm/smalltalk", "require"], function (smalltalk, require) {
-    return {
+    var exports = {
         popupHelios: function () {
             window.open(require.toUrl('amber_html/helios.html'), "Helios", "menubar=no, status=no, scrollbars=no, menubar=no, width=1000, height=600");
-        },
-        get smalltalk() { return smalltalk; }
+        }
     };
+    Object.defineProperty(exports, "smalltalk", {
+        get: function () { return smalltalk; },
+        enumerable: true, configurable: true
+    });
+    return  exports;
 });