sproutcore 1.10.0 → 1.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmFiZjRlOTRmZjI1ZWY4NGI4ZGVjYjNmZjgyY2MzNzY2ODlmMWFhMg==
+    YzI3MjhhNWFhOGZkMDQ0NmY2OWRkMjIwZTYwNGZjYjUyODA2MjhhOA==
   data.tar.gz: !binary |-
-    MTk5ODA0ZmRiZmRmZjkwYzViZGY3OGIyNjgwMTIxMzYwMWE4NDEyZg==
+    ZjQ2ZjFiMWMxZTM5YWJiNDBlMTcxNzQ3NzNjYTljNmZlYWVkNTM4Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGY5N2UwMWM5YmQ5ZTExOTJiYjViYjY3YWRkMWE3ZmU3ZGJhNzBhNGY2N2Vl
-    OTlhOWVkMGFhMzBhNjFiY2EyZTExMGQ5MzdlMzIxYjBhZWZiNTI3MDY1YjAy
-    ZmNlYzI0YzhjOTFjNWNkNmI1YWZmY2U2MDY5Y2MyMjMwMWJlMzI=
+    MjI5MGY5MWJmYWI5Njg1MDM2ZThjMDEwMjM1NTlmMzc3MTI4YjlkYWE3NzI5
+    YzFhNzc1NGQyZWYxYzcxNzZkZjExZDMxNDk4ZWYyMWU5OTQ0ZjA4NjYzNGE2
+    OTU5NDg3Yzc2ODhiY2FhOGM4ODYzYzU5NjQxYmM1MGFmOGNkNDE=
   data.tar.gz: !binary |-
-    OTM5NjA3NThiYTcwNjUyODA4Yjc4YThiNmM0ZjEwYmI2NDk0ZDVlZDI4MmEy
-    YTkzMGM3NWRlNWIzNWFhOTMwM2MyMmM2NzYxZDNkZWZlZTlkYWIxZGU3Zjk1
-    NWRhNGZjMTdmMDcwMWM1ZmEzMThjNDEwYmYzMGZkMTNjMWEwMjU=
+    OWQ4NDNjMGE0MzY5MGIxOTY5NWNiMTczNWMzMTQ5Yzk2ZTY1NTM2MTMyNDFl
+    MjcxNzg0ZGE4N2QzMWZlMTg5ODc2YTZlYmNiOGE4M2YxNDNiYmE4MjM3NTFh
+    MTk1ZDAyYTQ1ZTlkYTM1ZTc1MDkxODAxZDUzYWZlYjNiMWNjMWE=

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 10
-:patch: 0
+:patch: 1

data/bin/sc-phantom

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2013 Strobe Inc.
+#            and contributors
+# ===========================================================================
+
+require "sproutcore"
+
+SC::Tools.invoke 'phantom'
+
+# EOF

data/lib/Buildfile

@@ -58,6 +58,9 @@ mode :all do
     :combine_javascript => true,
     :combine_stylesheets => true,
     
+    # Use @charset "UTF-8" by default
+    :css_charset => "UTF-8",
+
     # We do NOT want to pad sprites for debugging in production. This both increases filesize
     # and makes the background of the sprite an embarrassing pink.
     :pad_sprites_for_debugging => false,

data/lib/buildtasks/manifest.rake

@@ -467,6 +467,9 @@ namespace :manifest do
           # whether it should minify
           :minify => minify,
           
+          # charset for CSS files
+          :css_charset => CONFIG[:css_charset],
+
           # whether it should optimize sprites. This is opt-in, and comes from the buildfile.
           :optimize_sprites => CONFIG[:optimize_sprites],
           

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -1,7 +1,30 @@
 CHANGE LOG
 ==========
 
-1.10.0.0
+1.10.1
+-----------
+
+### BUG FIXES
+
+* Clean ups for http://docs.sproutcore.com.
+* Fixes memory leak in SC.ContentValueSupport.
+* Fixes layout bug with inline label view editor when used with child view layout plugins.
+* Fixes SC.Module loading on IE11+.
+* Fixes SC.Drag to fire `dragEnded` when cancelling a drag and drop operation
+using the escape key.
+* Fixes missing non-retina image for SC.MenuPane.
+* CollectionView: fix the selection on touchEnd. Previously when an item was touched two times, after the second touch it was no longer marked as selected even if it was (correctly) part of the collection's selection, its isSelected property was NO when it was supposed to be YES.
+* Fixes the code to show an insertion point for SC.GridView using @nicolasbadia's code. Adds a default style for SC.GridView's default insertion point that matches SC.ListView's default. Also improves the positioning of SC.ListView's insertion point so that the insertion view can specify a different height/right/width layout if wanted.
+* Fixes misplaced scroll view content when changing the content using touch scrolling. Reapplies the CSS transforms when touch scroll view's content frame changes. Because the CSS transforms are applied directly to the content view, if the content view's layout style changes, the transforms will be erased.
+* Fixes warnings when smoothly decelerating scrolling (includes performance improvement). Removes the necessity to trigger run loops while the scroll decelerates and only triggers the run loop when actually doing an update. This also removes an invoke warning if the first time the deceleration code runs (not within run loop) and doesn't have any velocity and so updates immediately.
+* Changes the theme class for SC.EmptyTheme from 'sc-empty' to 'sc-empty-theme'. This fixes the conflict with 'sc-empty' used by SC.ProgressViews that causes all progress views in apps using the empty theme to not have an inner border. This is a potentially conflicting change, but less dangerous than changing the class used by SC.ProgressView, because SC.EmptyTheme doesn't have any styles.
+* Fix issue with sending statechart events while state transitioning. `sendEvent` had a typo which allowed events to be sent while in the middle of a state transition. Fixing that revealed that now events sent during state transitions would be queued but never sent (at least not until another event was sent).
+* Resolved Handlebars escaping issue with ampersands.
+* Fix caching issue with SC.routes.informLocation. Since location and informLocation really just represent a single property, they both need to update the cached value for the opposite property.
+* Fixes regression with OS sniffing of Linux and Android in SC.browser.
+
+
+1.10.0
 -----------
 
 ### CHANGES & FEATURES

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -268,6 +268,7 @@ SC.detectBrowser = function (userAgent, language) {
   if (isIOSDevice) { os = SC.OS.ios; }
   else if (osAndVersion[1] === 'mac os x' || osAndVersion[1] === 'mac os') { os = SC.OS.mac; }
   else if (osAndVersion[1] === 'windows nt') { os = SC.OS.win; }
+  else { os = osAndVersion[1]; }
 
   // Normalize the os version.
   osAndVersion[2] = osAndVersion[2] ? osAndVersion[2].replace(/_/g, '.') : '0';

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js

@@ -1638,7 +1638,7 @@ SC.RootResponder = SC.Object.extend(
     // If user presses the escape key while we are in the middle of a
     // drag operation, cancel the drag operation and handle the event.
     if (keyCode === 27 && this._drag) {
-      this._drag.cancelDrag();
+      this._drag.cancelDrag(evt);
       this._drag = null;
       this._mouseDownView = null;
       return YES;

data/lib/frameworks/sproutcore/frameworks/designer/views/designer_drop_target.js

@@ -10,8 +10,7 @@
 
   @extends SC.ContainerView
 */
-SC.DesignerDropTarget = SC.ContainerView.extend(
-  /** @scope SC.DesignerDropTarget.prototype */ {
+SC.DesignerDropTarget = SC.ContainerView.extend({
 
   inGlobalOffset: YES,
 

data/lib/frameworks/sproutcore/frameworks/designer/views/high_light.js

@@ -6,8 +6,7 @@
   This View is used by Greenhouse when application is in design mode
   It darkens the area around the `rootDesigner`
 */
-SC.RootDesignerHighLightView = SC.View.extend(
-/** @scope SC.RootDesignerHighLight.prototype */ {
+SC.RootDesignerHighLightView = SC.View.extend({
 
   /**
     The designer that owns this highlight

data/lib/frameworks/sproutcore/frameworks/designer/views/page_item_view.js

@@ -12,8 +12,7 @@
 
 */
 
-SC.pageItemView = SC.ListItemView.extend(
-/** @scope SC.ListItemView.prototype */ {
+SC.pageItemView = SC.ListItemView.extend({
   isDropTarget: YES,
 
   dragEntered: function(drag, evt) {

data/lib/frameworks/sproutcore/frameworks/designer/views/selection_handles.js

@@ -9,8 +9,7 @@
   This view draws selection handles for a given designer.  It will also
   forward any mouse events to the underlying designer.
 */
-SC.SelectionHandlesView = SC.View.extend(
-/** @scope SC.SelectionHandlesView.prototype */ {
+SC.SelectionHandlesView = SC.View.extend({
 
   /**
     The designer that owns this selection.  mouse and keyboard events are

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -539,7 +539,6 @@ SC.MenuPane = SC.PickerPane.extend(
     var scroll, menuView, menuItemViews;
 
     scroll = this._menuScrollView = this.createChildView(SC.MenuScrollView, {
-      borderStyle: SC.BORDER_NONE,
       controlSize: this.get('controlSize')
     });
 
@@ -554,10 +553,12 @@ SC.MenuPane = SC.PickerPane.extend(
     });
 
     menuItemViews = this.get('menuItemViews');
-    menuView.set('layout', { top: 0, left: 0, height : this.get('menuHeight')});
     menuView.replaceAllChildren(menuItemViews);
-    scroll.set('contentView', menuView);
 
+    // Adjust our menu view's layout to fit the calculated menu height.
+    menuView.set('layout', { top: 0, left: 0, height : this.get('menuHeight')});
+
+    scroll.set('contentView', menuView);
 
     this.childViews = [scroll];
 

data/lib/frameworks/sproutcore/frameworks/desktop/resources/progress.css

@@ -5,10 +5,12 @@
 	background-color: #c8c8c8;
 	-webkit-border-radius: 2px;
 	border-radius: 2px;
+
 	&.disabled {
   	background-color: #e8e8e8;
   	border: 1px #9a9a9a solid;
   }
+
   .sc-inner {
   	position: absolute;
   	left: 0px;
@@ -19,10 +21,12 @@
   	-webkit-transition: all 0.01s linear;
   	-webkit-transform: translate3d(0,0,0);
   }
+
   &.sc-indeterminate .sc-inner {
    	background: #555555;
    	border: 0;
   }
+
   &.sc-empty .sc-inner {
   	border: none;
   }

data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js

@@ -406,32 +406,60 @@ SC.Drag = SC.Object.extend(
   /** @private
     Cancel the drag operation.
 
-    This notifies the data source that the drag ended and removes the
-    ghost view, but does not notify the drop target of a drop.
-
     This is called by RootResponder's keyup method when the user presses
     escape and a drag is in progress.
+
+    @param {Event} evt the key event
+    @see SC.Drag.endDrag
   */
-  cancelDrag: function () {
+  cancelDrag: function (evt) {
     var target = this._lastTarget,
         loc = this.get('location');
 
     if (target && target.dragExited) target.dragExited(this, this._lastMouseDraggedEvent);
 
+    this.endDrag(evt, SC.DRAG_NONE);
+  },
+
+  /** @private
+    End the drag operation.
+
+    This notifies the data source that the drag ended and removes the
+    ghost view, but does not notify the drop target of a drop.
+
+    @param {Event} evt
+    @param {DragOp} op The drag operation that was performed. One of
+      SC.DRAG_COPY, SC.DRAG_MOVE, SC.DRAG_LINK, or SC.DRAG_NONE.
+  */
+  endDrag: function (evt, op) {
+    var loc = this.get('location');
+
+    // notify all drop targets that the drag ended
+    var ary = this._dropTargets();
+    for (var idx = 0, len = ary.length; idx < len; idx++) {
+      try {
+        ary[idx].tryToPerform('dragEnded', this, evt);
+      } catch (ex2) {
+        SC.Logger.error('Exception in SC.Drag.mouseUp(dragEnded on %@): %@'.fmt(ary[idx], ex2));
+      }
+    }
+
     if (this.get('sourceIsDraggable')) {
+      // destroy the ghost view
       this._destroyGhostView();
 
       if (this.get('ghost')) {
+        // Show the dragView if it was hidden.
         if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES);
         this._dragViewWasVisible = null;
       }
     }
 
+    // notify the source that everything has completed
     var source = this.source;
-    if (source && source.dragDidEnd) source.dragDidEnd(this, loc, SC.DRAG_NONE);
-
-    this._lastTarget = null;
-    this._dragInProgress = NO;
+    if (source && source.dragDidEnd) source.dragDidEnd(this, loc, op);
+    
+    this._cleanUpDrag();
   },
 
   // ..........................................
@@ -536,33 +564,7 @@ SC.Drag = SC.Object.extend(
       SC.Logger.error('Exception in SC.Drag.mouseUp(acceptDragOperation|performDragOperation): %@'.fmt(e));
     }
 
-    // notify all drop targets that the drag ended
-    var ary = this._dropTargets();
-    for (var idx = 0, len = ary.length; idx < len; idx++) {
-      try {
-        ary[idx].tryToPerform('dragEnded', this, evt);
-      } catch (ex2) {
-        SC.Logger.error('Exception in SC.Drag.mouseUp(dragEnded on %@): %@'.fmt(ary[idx], ex2));
-      }
-    }
-
-    if (this.get('sourceIsDraggable')) {
-      // destroy the ghost view
-      this._destroyGhostView();
-
-      if (this.get('ghost')) {
-        // Show the dragView if it was hidden.
-        if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES);
-        this._dragViewWasVisible = null;
-      }
-    }
-
-    // notify the source that everything has completed
-    var source = this.source;
-    if (source && source.dragDidEnd) source.dragDidEnd(this, loc, op);
-
-    this._lastTarget = null;
-    this._dragInProgress = NO; // required by autoscroll (invoked by a timer)
+    this.endDrag(evt, op);
   },
 
   /** @private */
@@ -674,6 +676,13 @@ SC.Drag = SC.Object.extend(
     }
   },
 
+  /** @private */
+  _cleanUpDrag: function() {
+    this._lastTarget = null;
+    this._dragInProgress = NO;
+    this._cachedDropTargets = null;
+  },
+  
   /** @private
     Return an array of drop targets, sorted with any nested drop targets
     at the top of the array.  The first time this method is called during

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module, test, ok, equals, stop, start */
 
 var items = [
   { title: 'Menu Item', keyEquivalent: 'ctrl_shift_n' },
@@ -30,30 +30,34 @@ var menu;
 
 module('SC.MenuPane UI', {
   setup: function () {
-    menu = SC.MenuPane.create({
-      layout: { width: 206 },
+    SC.run(function () {
+      menu = SC.MenuPane.create({
+        layout: { width: 206 },
 
-      selectedItemChanged: function () {
-        this._selectedItemCount = (this._selectedItemCount||0)+1;
-      }.observes('selectedItem'),
+        selectedItemChanged: function () {
+          this._selectedItemCount = (this._selectedItemCount || 0) + 1;
+        }.observes('selectedItem'),
 
-      countAction: function () {
-        this._actionCount = (this._actionCount||0)+1;
-      }
-    });
+        countAction: function () {
+          this._actionCount = (this._actionCount || 0) + 1;
+        }
+      });
 
-    items[0].target = menu;
-    items[0].action = 'countAction';
+      items[0].target = menu;
+      items[0].action = 'countAction';
 
-    items[1].action = function () {
-      menu._functionActionCount = (menu._functionActionCount||0)+1;
-    };
+      items[1].action = function () {
+        menu._functionActionCount = (menu._functionActionCount || 0) + 1;
+      };
 
-    menu.set('items', items);
+      menu.set('items', items);
+    });
   },
 
   teardown: function () {
-    menu.destroy();
+    SC.run(function () {
+      menu.destroy();
+    });
     menu = null;
   }
 });
@@ -78,7 +82,7 @@ function clickOn(view, shiftKey, ctrlKey) {
   ev = SC.Event.simulateEvent(layer, 'mouseup', opts);
   SC.Event.trigger(layer, 'mouseup', [ev]);
   SC.RunLoop.begin().end();
-  layer = null ;
+  layer = null;
 }
 
 /**
@@ -92,14 +96,14 @@ function clickOn(view, shiftKey, ctrlKey) {
 */
 function keyPressOn(view, keyCode, isKeyPress, shiftKey, ctrlKey) {
   var layer    = view.get('layer'),
-      opts     = {
-        shiftKey: !!shiftKey,
-        ctrlKey: !!ctrlKey,
-        keyCode: keyCode,
-        charCode: isKeyPress ? keyCode : 0,
-        which: keyCode
-      },
-      ev;
+    opts     = {
+      shiftKey: !!shiftKey,
+      ctrlKey: !!ctrlKey,
+      keyCode: keyCode,
+      charCode: isKeyPress ? keyCode : 0,
+      which: keyCode
+    },
+    ev;
 
   ok(layer, 'keyPressOn() precond - view %@ should have layer'.fmt(view.toString()));
 
@@ -114,11 +118,13 @@ function keyPressOn(view, keyCode, isKeyPress, shiftKey, ctrlKey) {
   ev = SC.Event.simulateEvent(layer, 'keyup', opts);
   SC.Event.trigger(layer, 'keyup', [ev]);
   SC.RunLoop.begin().end();
-  layer = null ;
+  layer = null;
 }
 
 test('Basic UI', function () {
-  menu.popup();
+  SC.run(function () {
+    menu.popup();
+  });
   ok(menu.$().hasClass('sc-menu'), 'pane should have "sc-menu" class');
   ok(menu.$().hasClass('sc-regular-size'), 'pane should have default control size class');
   ok(!menu.get('isSubMenu'), 'isSubMenu should be NO on menus that are not submenus');
@@ -133,7 +139,9 @@ test('Basic UI', function () {
     equals(selectedItem ? selectedItem.title : null, menuItem.get('content').title, 'selectedItem should be set to the content item that was clicked');
     equals(1, menu._selectedItemCount, 'selectedItem should only change once when a menu item is clicked');
     equals(1, menu._actionCount, 'action is fired once when menu item is clicked');
-    menu.remove();
+    SC.run(function () {
+      menu.remove();
+    });
     ok(!menu.get('isVisibleInWindow'), 'menu should not be visible after being removed');
     equals(menu.get('currentMenuItem'), null, 'currentMenuItem should be null after being removed');
     start();
@@ -147,35 +155,48 @@ test('Control size', function () {
     { title: 'Ya better better baby' }
   ];
 
-  smallPane = SC.MenuPane.create({
-    controlSize: SC.SMALL_CONTROL_SIZE,
-    items: items
+  SC.run(function () {
+    smallPane = SC.MenuPane.create({
+      controlSize: SC.SMALL_CONTROL_SIZE,
+      items: items
+    });
+
+    smallPane.popup();
   });
-  smallPane.popup();
   views = smallPane.get('menuItemViews');
 
   var small_constants = SC.BaseTheme.menuRenderDelegate['sc-small-size'];
   equals(views[0].get('frame').height, small_constants.itemHeight, 'should change itemHeight');
   equals(views[1].get('frame').height, small_constants.itemSeparatorHeight, 'should change itemSeparatorHeight');
-  equals(views[0].get('frame').y, small_constants.menuHeightPadding/2, 'should change menuHeightPadding');
-  smallPane.remove();
+  equals(views[0].get('frame').y, small_constants.menuHeightPadding / 2, 'should change menuHeightPadding');
+  SC.run(function () {
+    smallPane.remove();
+  });
+
+  SC.run(function () {
+    largePane = SC.MenuPane.create({
+      controlSize: SC.LARGE_CONTROL_SIZE,
+      items: items
+    });
 
-  largePane = SC.MenuPane.create({
-    controlSize: SC.LARGE_CONTROL_SIZE,
-    items: items
+    largePane.popup();
   });
-  largePane.popup();
   views = largePane.get('menuItemViews');
 
   var large_constants = SC.BaseTheme.menuRenderDelegate['sc-large-size'];
   equals(views[0].get('frame').height, large_constants.itemHeight, 'should change itemHeight');
   equals(views[1].get('frame').height, large_constants.itemSeparatorHeight, 'should change itemSeparatorHeight');
-  equals(views[0].get('frame').y, large_constants.menuHeightPadding/2, 'should change menuHeightPadding');
-  largePane.remove();
+  equals(views[0].get('frame').y, large_constants.menuHeightPadding / 2, 'should change menuHeightPadding');
+
+  SC.run(function () {
+    largePane.remove();
+  });
 });
 
-test('Legacy Function Support', function (){
-  menu.popup();
+test('Legacy Function Support', function () {
+  SC.run(function () {
+    menu.popup();
+  });
   var menuItem = menu.get('menuItemViews')[1], selectedItem;
   menuItem.mouseEntered();
   clickOn(menuItem, NO, NO);
@@ -184,41 +205,63 @@ test('Legacy Function Support', function (){
   setTimeout(function () {
     selectedItem = menu.get('selectedItem');
     equals(1, menu._functionActionCount, 'Function should be called if it is set as the action and the menu item is clicked');
-    menu.remove();
+
+    SC.run(function () {
+      menu.remove();
+    });
     start();
   }, 250);
 });
 
 test('Custom MenuItemView Class', function () {
   equals(menu.get('exampleView'), SC.MenuItemView, 'SC.MenuPane should generate SC.MenuItemViews by default');
-  var menu2 = SC.MenuPane.create({
-    exampleView: SC.MenuItemView.extend({
-      classNames: 'custom-menu-item'.w()
-    }),
+  var menu2;
 
-    items: items
+  SC.run(function () {
+    menu2 = SC.MenuPane.create({
+      exampleView: SC.MenuItemView.extend({
+        classNames: 'custom-menu-item'.w()
+      }),
+
+      items: items
+    });
+
+    menu2.popup();
   });
-  menu2.popup();
   ok(menu2.$('.custom-menu-item').length > 0, 'SC.MenuPane should generate instances of custom classes if exampleView is changed');
-  menu2.remove();
+  SC.run(function () {
+    menu2.remove();
+  });
 });
 
 
 test('Custom MenuItemView Class on an item using itemExampleViewKey', function () {
   equals(menu.get('exampleView'), SC.MenuItemView, 'SC.MenuPane should generate SC.MenuItemViews by default');
-  menu.popup();
+  SC.run(function () {
+    menu.popup();
+  });
   ok(menu.$('.custom-menu-item').length === 1, 'SC.MenuPane should generate one instance of a custom class if the item has an exampleView property');
-  ok($($('.sc-menu-item')[11]).hasClass('custom-menu-item'), 'The last menu item should have a custom class');
-  menu.remove();
+  ok(SC.$(SC.$('.sc-menu-item')[11]).hasClass('custom-menu-item'), 'The last menu item should have a custom class');
+
+  SC.run(function () {
+    menu.remove();
+  });
 });
 
 test('Basic Submenus', function () {
-  var smallMenu = SC.MenuPane.create({
-    controlSize: SC.SMALL_CONTROL_SIZE,
-    items: items
+  var smallMenu,
+    menuItem, subMenu;
+
+  SC.run(function () {
+    smallMenu = SC.MenuPane.create({
+      controlSize: SC.SMALL_CONTROL_SIZE,
+      items: items
+    });
+    menuItem = smallMenu.get('menuItemViews')[8];
+
+    smallMenu.popup();
   });
-  var menuItem = smallMenu.get('menuItemViews')[8], subMenu;
-  smallMenu.popup();
+
   menuItem.mouseEntered();
   SC.RunLoop.begin().end();
   ok(menuItem.get('hasSubMenu'), 'precond - menu item has a submenu');
@@ -229,7 +272,9 @@ test('Basic Submenus', function () {
     ok(subMenu.get('isVisibleInWindow'), 'submenu should open after 100ms delay');
     ok(subMenu.get('isSubMenu'), 'isSubMenu should be YES on submenus');
     ok(subMenu.get('controlSize'), SC.SMALL_CONTROL_SIZE, "submenu should inherit parent's controlSize");
-    smallMenu.remove();
+    SC.run(function () {
+      smallMenu.remove();
+    });
     ok(!subMenu.get('isVisibleInWindow'), 'submenus should close if their parent menu is closed');
     start();
   }, 150);
@@ -239,34 +284,52 @@ test('Menu Item Localization', function () {
   ok(menu.get('localize'), 'menu panes should be localized by default');
   var locMenu, items;
 
-  SC.stringsFor('en', { 'Localized.Text': 'LOCALIZED TEXT' } );
+  SC.stringsFor('en', { 'Localized.Text': 'LOCALIZED TEXT' });
   items = [ 'Localized.Text' ];
 
-  locMenu = SC.MenuPane.create({
-    layout: { width: 200 },
-    items: items,
-    localize: NO
+  SC.run(function () {
+    locMenu = SC.MenuPane.create({
+      layout: { width: 200 },
+      items: items,
+      localize: NO
+    });
+
+    locMenu.popup();
   });
-  locMenu.popup();
   equals('Localized.Text', locMenu.$('.sc-menu-item .value').text(), 'Menu item titles should not be localized if localize is NO');
-  locMenu.remove();
 
-  locMenu = SC.MenuPane.create({
-    items: items,
-    localize: YES
+  SC.run(function () {
+    locMenu.remove();
+  });
+
+  SC.run(function () {
+    locMenu = SC.MenuPane.create({
+      items: items,
+      localize: YES
+    });
+
+    locMenu.popup();
   });
-  locMenu.popup();
   equals('LOCALIZED TEXT', locMenu.$('.sc-menu-item .value').text(), 'Menu item titles should be localized if localize is YES');
-  locMenu.remove();
+  SC.run(function () {
+    locMenu.remove();
+  });
 });
 
 test('Automatic Closing', function () {
-  menu.popup();
+
+  SC.run(function () {
+    menu.popup();
+  });
   ok(menu.get('isVisibleInWindow'), 'precond - window should be visible');
-  menu.windowSizeDidChange();
+  SC.run(function () {
+    menu.windowSizeDidChange();
+  });
   ok(!menu.get('isVisibleInWindow'), 'menu should close if window resizes');
 
-  menu.popup();
+  SC.run(function () {
+    menu.popup();
+  });
   clickOn(menu);
   ok(!menu.get('isVisibleInWindow'), 'menu should close if anywhere other than a menu item is clicked');
 });
@@ -278,10 +341,10 @@ test('keyEquivalents', function () {
   // keyEquivalents work
   menu.items.forEach(function (item) {
     var keyEq = item.keyEquivalent, idx, len;
-    if(!keyEq) return;
+    if (!keyEq) return;
 
-    if(SC.typeOf(keyEq)===SC.T_ARRAY) {
-      for(idx=0,len=keyEq.length;idx<len;idx++) {
+    if (SC.typeOf(keyEq) === SC.T_ARRAY) {
+      for (idx = 0, len = keyEq.length; idx < len; idx++) {
         ok(keyEquivalents[keyEq[idx]], "keyEquivalent should map to " + keyEq[idx]);
       }
     }
@@ -294,7 +357,9 @@ test('keyEquivalents', function () {
 test('scrolling', function () {
   var currentMenuItem;
 
-  menu.popup();
+  SC.run(function () {
+    menu.popup();
+  });
   menu.set('currentMenuItem', menu.get('menuItemViews')[0]);
   currentMenuItem = menu.get('currentMenuItem');
   equals(currentMenuItem.get('title'), 'Menu Item', 'menu should begin at first item');
@@ -325,12 +390,17 @@ test('scrolling', function () {
 });
 
 test('aria-role attribute', function () {
-  var menuPane = SC.MenuPane.create({
-    layout: { width: 200 },
-    items: items,
-    itemCheckboxKey: 'isChecked'
-  }), menuItems,normalItem, itemWithCheckBox, separatorItem;
-  menuPane.popup();
+  var menuPane, menuItems, normalItem, itemWithCheckBox, separatorItem;
+
+  SC.run(function () {
+    menuPane = SC.MenuPane.create({
+      layout: { width: 200 },
+      items: items,
+      itemCheckboxKey: 'isChecked'
+    });
+
+    menuPane.popup();
+  });
 
   equals(menuPane.$().attr('role'), 'menu', "menu pane should have role set");
 
@@ -346,12 +416,18 @@ test('aria-role attribute', function () {
 });
 
 test('aria-checked attribute', function () {
-  var menuPane = SC.MenuPane.create({
-    layout: { width: 200 },
-    items: items,
-    itemCheckboxKey: 'isChecked'
-  }),itemWithCheckBox;
-  menuPane.popup();
+  var menuPane,
+    itemWithCheckBox;
+
+  SC.run(function () {
+    menuPane = SC.MenuPane.create({
+      layout: { width: 200 },
+      items: items,
+      itemCheckboxKey: 'isChecked'
+    });
+
+    menuPane.popup();
+  });
 
   itemWithCheckBox = menuPane.get('menuItemViews')[1];