Merge branch 'master' into moka

js/Canvas.js

@@ -93,7 +93,6 @@ referencedClasses: []
 smalltalk.BrowserInterface);
 
 
-smalltalk.BrowserInterface.klass.iVarNames = ['uiWorker','ajaxWorker'];
 
 smalltalk.addClass('HTMLCanvas', smalltalk.Object, ['root'], 'Canvas');
 smalltalk.HTMLCanvas.comment="I am a canvas for building HTML.\x0a\x0aI provide the `#tag:` method to create a `TagBrush` (wrapping a DOM element) and convenience methods in the `tags` protocol.\x0a\x0a## API\x0a\x0aMy instances are used as the argument of the `#renderOn:` method of `Widget` objects.\x0a\x0aThe `#with:` method is used to compose HTML, nesting tags. `#with:` can take a `TagBrush`, a `String`, a `BlockClosure` or a `Widget` as argument.\x0a\x0a## Usage example:\x0a\x0a    aCanvas a \x0a        with: [ aCanvas span with: 'click me' ];\x0a        onClick: [ window alert: 'clicked!' ]";

st/Canvas.st

@@ -41,8 +41,6 @@ isAvailable
 <return typeof window !!== "undefined" && typeof jQuery !!== "undefined">
 ! !
 
-BrowserInterface class instanceVariableNames: 'uiWorker ajaxWorker'!
-
 Object subclass: #HTMLCanvas
 	instanceVariableNames: 'root'
 	package: 'Canvas'!

support/amber.js

@@ -70,11 +70,11 @@ require = function (require) {
             'amber_lib/bootstrap/js/bootstrap': {
                 deps: [ 'jquery', 'css!amber_lib/bootstrap/css/bootstrap' ]
             },
-            'amber_lib/CodeMirror/codemirror': {
+            'amber_lib/codemirror/lib/codemirror': {
                 deps: [ 'css!amber_lib/codemirror/lib/codemirror' ]
             },
             'amber_lib/jquery-tabby/jquery.textarea': {
-                deps: [ 'jquery', 'jquery-ui' ]
+                deps: [ 'jquery' ]
             },
             'amber_inc/CodeMirror/smalltalk': {
                 deps: [ 'amber_lib/codemirror/lib/codemirror' ]