sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -13,7 +13,8 @@ module("SC.AlertPane UI", {
     SC.TestDelegate = SC.Object.create();
   },
   teardown: function(){
-    delete SC.TestDelegate;SC.Object.create()}
+    delete SC.TestDelegate;
+  }
 });
 
 var pane ;
@@ -48,16 +49,16 @@ function evaluatePane(pane, message, description, caption, button1Title, button2
   } else {
     equals(pane.childViews[0].childViews[0].$('p.caption').length, 0, 'pane.div.info should have 0 caption');
   }
-  
+
   // buttons
   ok(pane.childViews[0].childViews[1].$('div'), 'pane.div.div.div existence should be YES');
   equals(pane.childViews[0].childViews[1].$('div.button').length, 2, 'pane.div.div should have 2 Buttons');
   ok(pane.childViews[0].$('div'), 'pane.div.div existence should be YES');
-  
+
   var button1 = pane.childViews[0].childViews[1].childViews[1];
   var button2 = pane.childViews[0].childViews[1].childViews[0];
   var button3 = pane.childViews[0].childViews[2].childViews[0];
-  
+
   if (button1Title) {
     equals(button1.$('label').text(), button1Title, 'pane.div.div button1 should have custom title %@'.fmt(button1Title));
   } else {
@@ -73,7 +74,7 @@ function evaluatePane(pane, message, description, caption, button1Title, button2
   } else {
     ok(button3.$().hasClass('sc-hidden'), 'pane.div button3 should be hidden');
   }
-  
+
   if (!themeName) themeName = 'capsule';
   ok(button1.$().hasClass(themeName), 'pane.div.div button1 should have class ' + themeName);
   ok(button2.$().hasClass(themeName), 'pane.div.div button2 should have class ' + themeName);
@@ -95,12 +96,14 @@ test("AlertPane.show with icon, message, description, caption and 3 buttons", fu
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.show with icon, message, description, caption and 3 buttons - old style", function() {
-  pane = SC.AlertPane.show("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24', this);      
+  pane = SC.AlertPane.show("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24', this);
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.warn with icon, message, description, caption and 3 buttons", function() {
@@ -117,6 +120,7 @@ test("AlertPane.warn with icon, message, description, caption and 3 buttons", fu
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-alert-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.error with icon, message, description, caption and 3 buttons", function() {
@@ -133,6 +137,7 @@ test("AlertPane.error with icon, message, description, caption and 3 buttons", f
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-error-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.plain with message, description, caption and 3 buttons", function() {
@@ -149,6 +154,7 @@ test("AlertPane.plain with message, description, caption and 3 buttons", functio
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'blank');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.info with icon, message, description, caption and 3 buttons", function() {
@@ -165,30 +171,34 @@ test("AlertPane.info with icon, message, description, caption and 3 buttons", fu
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-info-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.info with icon, message and 1 default button (omit all optional parameters) - old style", function() {
-  pane = SC.AlertPane.info("AlertPane.message");      
+  pane = SC.AlertPane.info("AlertPane.message");
   evaluatePane(pane, "AlertPane.message", null, null, null, null, null, 'sc-icon-info-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.info with icon, message and 3 buttons (passing null to optional description and caption) - old style", function() {
-  pane = SC.AlertPane.info("AlertPane.message", null, null, "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);      
+  pane = SC.AlertPane.info("AlertPane.message", null, null, "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', this);
   evaluatePane(pane, "AlertPane.message", null, null, "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-info-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.info with icon, message, description, caption and 1 button (passing null to 3 buttons) - old style", function() {
-  pane = SC.AlertPane.info("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', null, null, null, this);      
+  pane = SC.AlertPane.info("AlertPane.message", 'AlertPane.description', 'AlertPane.caption', null, null, null, this);
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', null, null, null, 'sc-icon-info-48');
   pane.dismiss();
+  pane.destroy();
 });
 
 test("AlertPane.info with individual actions and targets for three buttons", function() {
-  
+
   var clickValue = null;
-  
+
   SC.TestDelegate.didClickOK = function() {
     clickValue = 'OK';
   };
@@ -211,13 +221,13 @@ test("AlertPane.info with individual actions and targets for three buttons", fun
     });
     clickValue = null;
   }
-  
+
   function clickButton(button) {
     var elem = button.$();
     SC.Event.trigger(elem, 'mousedown');
     SC.Event.trigger(elem, 'mouseup');
   }
-  
+
   showPane();
   clickButton(pane.get('button1'));
   equals(clickValue, 'OK', 'Action for the OK button was clicked');
@@ -225,11 +235,12 @@ test("AlertPane.info with individual actions and targets for three buttons", fun
   showPane();
   clickButton(pane.get('button2'));
   equals(clickValue, 'Cancel', 'Action for the Cancel button was clicked');
-  
+
   showPane();
   clickButton(pane.get('button3'));
   equals(clickValue, 'Extra', 'Action for the Extra button was clicked');
-  
+
+  pane.destroy();
 });
 
 test("users interaction with mutiple alert panes with 1-3 buttons", function() {
@@ -237,7 +248,7 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
   var didDismiss = NO;
 
   var delegate = SC.Object.create({
-    
+
     threeButtonAlertPane: function() {
       pane = SC.AlertPane.warn({
         title: "AlertPane.warn title",
@@ -251,6 +262,7 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
         delegate: this
       });
       pane.dismiss(pane.get('button3'));
+      pane.destroy();
     },
 
     twoButtonAlertPane: function() {
@@ -265,6 +277,7 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
         delegate: delegate
       });
       pane.dismiss(pane.get('button2'));
+      pane.destroy();
     },
 
     oneButtonAlertPane: function() {
@@ -274,8 +287,9 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
         delegate: delegate
       });
       pane.dismiss(pane.get('button1'));
+      pane.destroy();
     },
-   
+
     alertPaneDidDismiss: function(alert, status) {
       switch(status) {
         case SC.BUTTON1_STATUS:
@@ -296,6 +310,8 @@ test("users interaction with mutiple alert panes with 1-3 buttons", function() {
   SC.RunLoop.end();
 
   ok(didDismiss, "should dismiss all buttons");
+
+  delegate.destroy();
 }) ;
 
 test("users interaction with mutiple alert panes with 1-3 buttons - old style", function() {
@@ -303,22 +319,25 @@ test("users interaction with mutiple alert panes with 1-3 buttons - old style",
   var didDismiss = NO;
 
   var delegate = SC.Object.create({
-    
+
     threeButtonAlertPane: function() {
-      pane = SC.AlertPane.warn("AlertPane.warn title", 'Click OK to see this alert pane again.  \nClick Other... to see other alert panes.', 'Click cancel to dismiss.', "OK", "Cancel", 'Other...', this);      
+      pane = SC.AlertPane.warn("AlertPane.warn title", 'Click OK to see this alert pane again.  \nClick Other... to see other alert panes.', 'Click cancel to dismiss.', "OK", "Cancel", 'Other...', this);
       pane.dismiss(pane.get('button3'));
+      pane.destroy();
     },
 
     twoButtonAlertPane: function() {
       pane = SC.AlertPane.error("AlertPane.error title", 'Click OK to see one button alert pane.', 'Click cancel to dismiss.', "OK", "Cancel", delegate);
       pane.dismiss(pane.get('button2'));
+      pane.destroy();
     },
 
     oneButtonAlertPane: function() {
       pane = SC.AlertPane.info("AlertPane.info title", 'Click OK to dismiss.', delegate);
       pane.dismiss(pane.get('button1'));
+      pane.destroy();
     },
-   
+
     alertPaneDidDismiss: function(alert, status) {
       switch(status) {
         case SC.BUTTON1_STATUS:
@@ -339,6 +358,7 @@ test("users interaction with mutiple alert panes with 1-3 buttons - old style",
   SC.RunLoop.end();
 
   ok(didDismiss, "should dismiss all buttons");
+  delegate.destroy();
 }) ;
 
 
@@ -358,4 +378,5 @@ test("AlertPane.show with custom themeName", function() {
   });
   evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24', 'AlertPane.themeName');
   pane.dismiss();
-});
+  pane.destroy();
+});

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

@@ -45,8 +45,9 @@ module('SC.MenuPane Methods', {
   teardown: function() {
     menu.remove();
     anchor.remove();
-    menu.destroy();
-    menu = null;
+    if (!menu.isDestroyed) { menu.destroy(); }
+    anchor.destroy();
+    menu = anchor = null;
   }
 });
 
@@ -80,7 +81,7 @@ test('displayItems', function() {
 
   menu.menuHeight = 1;
   menu.set('items', strings);
-  equals(1, menu.displayItemsCount, 'displayItems should change when items array changes');
+  equals(menu.displayItemsCount, 1, 'displayItems should change when items array changes');
   ok(menu.get('menuHeight') > 1, 'menuHeight should be recalculated when displayItems changes');
 
   output = menu.get('displayItems')[0];
@@ -134,3 +135,18 @@ test('menuItemViewForContentIndex', function() {
   var view = menu.menuItemViewForContentIndex(0);
   equals(items[0].title, view.$('.value').text(), 'menu item views should match content items');
 });
+
+
+/** There was a bug that destroying the menu pane failed to destroy its internally
+  created menu view. */
+test('destroy should destroy the menu view', function () {
+  var menuView = menu._menuView,
+    menuItemView = menu.get('menuItemViews')[0];
+
+  menu.popup();
+  menu.destroy();
+
+  ok(menuView.get('isDestroyed'), 'destroying the menu pane also destroys the menu view.');
+  ok(menuItemView.get('isDestroyed'), 'destroying the menu pane also destroys the menu view child views.');
+  ok(!menuView._menuView, "desroying the menu pane removes the internal reference to the menu view.");
+})

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

@@ -24,20 +24,20 @@ var items = [
     }) }
   // { isSeparator: YES },
   // { groupTitle: 'Menu Label', items: [{ title: 'Nested Item' }, { title: 'Nested Item' }] }
-];
+  ];
 
 var menu;
 
 module('SC.MenuPane UI', {
-  setup: function() {
+  setup: function () {
     menu = SC.MenuPane.create({
       layout: { width: 206 },
 
-      selectedItemChanged: function() {
+      selectedItemChanged: function () {
         this._selectedItemCount = (this._selectedItemCount||0)+1;
       }.observes('selectedItem'),
 
-      countAction: function() {
+      countAction: function () {
         this._actionCount = (this._actionCount||0)+1;
       }
     });
@@ -45,14 +45,14 @@ module('SC.MenuPane UI', {
     items[0].target = menu;
     items[0].action = 'countAction';
 
-    items[1].action = function() {
+    items[1].action = function () {
       menu._functionActionCount = (menu._functionActionCount||0)+1;
     };
 
     menu.set('items', items);
   },
 
-  teardown: function() {
+  teardown: function () {
     menu.destroy();
     menu = null;
   }
@@ -70,15 +70,14 @@ function clickOn(view, shiftKey, ctrlKey) {
       opts     = { shiftKey: !!shiftKey, ctrlKey: !!ctrlKey },
       ev;
 
-  ok(layer, 'precond - view %@ should have layer'.fmt(view.toString()));
+  ok(layer, 'clickOn() precond - view %@ should have layer'.fmt(view.toString()));
 
   ev = SC.Event.simulateEvent(layer, 'mousedown', opts);
   SC.Event.trigger(layer, 'mousedown', [ev]);
 
   ev = SC.Event.simulateEvent(layer, 'mouseup', opts);
   SC.Event.trigger(layer, 'mouseup', [ev]);
-  SC.RunLoop.begin();
-  SC.RunLoop.end();
+  SC.RunLoop.begin().end();
   layer = null ;
 }
 
@@ -102,7 +101,7 @@ function keyPressOn(view, keyCode, isKeyPress, shiftKey, ctrlKey) {
       },
       ev;
 
-  ok(layer, 'precond - view %@ should have layer'.fmt(view.toString()));
+  ok(layer, 'keyPressOn() precond - view %@ should have layer'.fmt(view.toString()));
 
   ev = SC.Event.simulateEvent(layer, 'keydown', opts);
   SC.Event.trigger(layer, 'keydown', [ev]);
@@ -114,12 +113,11 @@ function keyPressOn(view, keyCode, isKeyPress, shiftKey, ctrlKey) {
 
   ev = SC.Event.simulateEvent(layer, 'keyup', opts);
   SC.Event.trigger(layer, 'keyup', [ev]);
-  SC.RunLoop.begin();
-  SC.RunLoop.end();
+  SC.RunLoop.begin().end();
   layer = null ;
 }
 
-test('Basic UI', function(){
+test('Basic UI', 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');
@@ -129,7 +127,7 @@ test('Basic UI', function(){
   clickOn(menuItem, NO, NO);
   stop();
 
-  setTimeout(function() {
+  setTimeout(function () {
     selectedItem = menu.get('selectedItem');
     ok(selectedItem, 'menu should have selectedItem property set after clicking on menu item');
     equals(selectedItem ? selectedItem.title : null, menuItem.get('content').title, 'selectedItem should be set to the content item that was clicked');
@@ -142,7 +140,7 @@ test('Basic UI', function(){
   }, 250);
 });
 
-test('Control size', function() {
+test('Control size', function () {
   var smallPane, largePane, views, items = [
     { title: 'Can I get get get' },
     { title: 'To know know know know', isSeparator: YES },
@@ -176,14 +174,14 @@ test('Control size', function() {
   largePane.remove();
 });
 
-test('Legacy Function Support', function(){
+test('Legacy Function Support', function (){
   menu.popup();
   var menuItem = menu.get('menuItemViews')[1], selectedItem;
   menuItem.mouseEntered();
   clickOn(menuItem, NO, NO);
   stop();
 
-  setTimeout(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();
@@ -191,7 +189,7 @@ test('Legacy Function Support', function(){
   }, 250);
 });
 
-test('Custom MenuItemView Class', function() {
+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({
@@ -206,7 +204,7 @@ test('Custom MenuItemView Class', function() {
 });
 
 
-test('Custom MenuItemView Class on an item using itemExampleViewKey', function() {
+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();
   ok(menu.$('.custom-menu-item').length === 1, 'SC.MenuPane should generate one instance of a custom class if the item has an exampleView property');
@@ -214,7 +212,7 @@ test('Custom MenuItemView Class on an item using itemExampleViewKey', function()
   menu.remove();
 });
 
-test('Basic Submenus', function() {
+test('Basic Submenus', function () {
   var smallMenu = SC.MenuPane.create({
     controlSize: SC.SMALL_CONTROL_SIZE,
     items: items
@@ -227,7 +225,7 @@ test('Basic Submenus', function() {
   subMenu = menuItem.get('subMenu');
   ok(!subMenu.get('isVisibleInWindow'), 'submenus should not open immediately');
   stop();
-  setTimeout(function() {
+  setTimeout(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");
@@ -237,7 +235,7 @@ test('Basic Submenus', function() {
   }, 150);
 });
 
-test('Menu Item Localization', function() {
+test('Menu Item Localization', function () {
   ok(menu.get('localize'), 'menu panes should be localized by default');
   var locMenu, items;
 
@@ -262,7 +260,7 @@ test('Menu Item Localization', function() {
   locMenu.remove();
 });
 
-test('Automatic Closing', function() {
+test('Automatic Closing', function () {
   menu.popup();
   ok(menu.get('isVisibleInWindow'), 'precond - window should be visible');
   menu.windowSizeDidChange();
@@ -273,12 +271,12 @@ test('Automatic Closing', function() {
   ok(!menu.get('isVisibleInWindow'), 'menu should close if anywhere other than a menu item is clicked');
 });
 
-test('keyEquivalents', function() {
+test('keyEquivalents', function () {
   var keyEquivalents = menu._keyEquivalents;
 
   // verify that keyEquivalents were mapped correctly and that multiple
   // keyEquivalents work
-  menu.items.forEach(function(item) {
+  menu.items.forEach(function (item) {
     var keyEq = item.keyEquivalent, idx, len;
     if(!keyEq) return;
 
@@ -293,7 +291,7 @@ test('keyEquivalents', function() {
   });
 });
 
-test('scrolling', function() {
+test('scrolling', function () {
   var currentMenuItem;
 
   menu.popup();
@@ -326,7 +324,7 @@ test('scrolling', function() {
   equals(currentMenuItem.get('title'), 'Menu Item', 'home should move to the first item');
 });
 
-test('aria-role attribute', function() {
+test('aria-role attribute', function () {
   var menuPane = SC.MenuPane.create({
     layout: { width: 200 },
     items: items,
@@ -347,7 +345,7 @@ test('aria-role attribute', function() {
   clickOn(menuPane);
 });
 
-test('aria-checked attribute', function() {
+test('aria-checked attribute', function () {
   var menuPane = SC.MenuPane.create({
     layout: { width: 200 },
     items: items,