sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js

@@ -52,6 +52,18 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
   */
   menuWidthPadding: SC.propertyFromRenderDelegate('menuWidthPadding', 0),
 
+  /**
+    The view class to use when creating new menu item views.
+
+    The menu pane will automatically create an instance of the view class you
+    set here for each item in the `items` array. You may provide your own
+    subclass for this property to display the customized content.
+
+    @type SC.View
+    @default SC.AutoResizingMenuItemView
+  */
+  exampleView: SC.AutoResizingMenuItemView,
+
   /**
     @private
     In addition to the normal init, we need to schedule an automatic resize.
@@ -59,8 +71,6 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
   init: function() {
     sc_super();
 
-    this.set('exampleView', SC.AutoResizingMenuItemView);
-
     if (this.get('shouldAutoResize')) {
       this.invokeOnce('_updateMenuWidth');
     }
@@ -119,7 +129,8 @@ SC.AutoResizingMenuPane = SC.MenuPane.extend(
       width = Math.max(width, view.get('measuredSize').width + this.get('menuWidthPadding'));
     }
 
-    this.adjust('width', width);
+
+    this.adjust({ 'width': width, height: this.get('menuHeight') });
     this.positionPane();
   }
 });

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js

@@ -61,11 +61,14 @@ SC.SelectViewMenu = {
     @type {SC.MenuItemView}
     @default SC.MenuItemView subclass
   */
-  exampleView: SC.MenuItemView.extend({
+  exampleView: SC.AutoResizingMenuItemView.extend({
     isChecked: function() {
+      var selectView = this.getPath('parentMenu.selectView');
+
       // _lastIsChecked is used by the SelectViewMenu mixin above to determine whether
       // the isChecked property needs to be invalidated.
-      this._lastIsChecked = this.getContentProperty('itemValueKey') === this.getPath('parentMenu.rootMenu.value');
+      this._lastIsChecked = selectView.isValueEqualTo(this.get('content'));
+      
       return this._lastIsChecked;
     }.property(),
 
@@ -78,12 +81,14 @@ SC.SelectViewMenu = {
   
   /** @private */
   _svm_bindToProperties: [
-    'items',
-    'itemTitleKey', 'itemIsEnabledKey', 'itemValueKey', 'itemIconKey', 
-    'itemHeightKey', 'itemSubMenuKey', 'itemSeparatorKey', 'itemTargetKey',
-    'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey',
+    { from: 'displayItems', to: 'items' },
+    { from: '_itemTitleKey', to: 'itemTitleKey' },
+    { from: '_itemIsEnabledKey', to: 'itemIsEnabledKey' },
+    { from: '_itemValueKey', to: 'itemValueKey' },
+    'itemIconKey', 'itemHeightKey', 'itemSubMenuKey', 'itemSeparatorKey', 
+    'itemTargetKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey',
     'itemKeyEquivalentKey', 'itemDisableMenuFlashKey', 'minimumMenuWidth',
-    
+    'target', 'action',
     'preferType', 'preferMatrix'
   ],
 
@@ -94,11 +99,16 @@ SC.SelectViewMenu = {
       return;
     }
 
-    var props = this._svm_bindToProperties, idx, len = props.length, key;
+    var props = this._svm_bindToProperties, idx, len = props.length, from, to;
 
     for (idx = 0; idx < len; idx++) {
-      key = props[idx];
-      this[key + 'Binding'] = this.bind(key, bindTo, key);
+      from = to = props[idx];
+
+      if (SC.typeOf(from) === SC.T_HASH) {
+        from = from.from;
+        to = to.to;
+      }
+      this[to + 'Binding'] = this.bind(to, bindTo, from);
     }
 
     this._svm_isBoundTo = bindTo;
@@ -115,6 +125,10 @@ SC.SelectViewMenu = {
 
     for (idx = 0; idx < len; idx++) {
       key = props[idx];
+
+      if (SC.typeOf(from) === SC.T_HASH) {
+        key = key.to;
+      }
       this[key + 'Binding'].disconnect();
     }
   },

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/ext/menu_resizing.js

@@ -1,7 +1,7 @@
 module("Menus -- Automatic Resizing");
 
 function createMenu(items) {
-  return SC.MenuPane.create({
+  return SC.AutoResizingMenuPane.create({
     items: items
   });
 }

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/bindings.js

@@ -2,19 +2,22 @@ module("SelectViewMenu -- Bindings");
 
 function setValues(obj, props, toValue) {
   for (var idx = 0; idx < props.length; idx++) {
-    obj.set(props[idx], toValue);
+    var prop = props[idx];
+    if (SC.typeOf(prop) === SC.T_HASH) prop = prop.from;
+    obj.set(prop, toValue);
   }
 }
 
 function validateValues(obj, props, value) {
   for (var idx = 0; idx < props.length; idx++) {
-    equals(obj.get(props[idx]), value);
+    equals(obj.get(props[idx]), value, props[idx]);
   }
 }
 
 test("Proxying all properties from SelectView to MenuView works.", function() {
   var proxyProperties = [
     'items',
+    'target', 'action',
     'itemTitleKey', 'itemIsEnabledKey', 'itemValueKey', 'itemIconKey', 
     'itemHeightKey', 'itemSubMenuKey', 'itemSeparatorKey', 'itemTargetKey',
     'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey',
@@ -24,7 +27,7 @@ test("Proxying all properties from SelectView to MenuView works.", function() {
   ];
 
   var obj = SC.Object.create({});
-  setValues(obj, proxyProperties, 'initial');
+  setValues(obj, SC.SelectViewMenu._svm_bindToProperties, 'initial');
 
   // Bindings won't evaluate until the end of the run loop, so make a run loop
   SC.RunLoop.begin();
@@ -36,7 +39,7 @@ test("Proxying all properties from SelectView to MenuView works.", function() {
 
   // now, test updates
   SC.RunLoop.begin();
-  setValues(obj, proxyProperties, 'modified');
+  setValues(obj, SC.SelectViewMenu._svm_bindToProperties, 'modified');
   SC.RunLoop.end();
 
   validateValues(menu, proxyProperties, 'modified');

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/check_selected.js

@@ -5,18 +5,15 @@ module("SelectViewMenu -- Check Selected");
 
 test("Selected menu item is checked", function() {
   SC.RunLoop.begin();
-  var selectView = SC.Object.create({
-    value: "A"
-  });
-
-  var menu = SC.MenuPane.create(SC.SelectViewMenu, {
+  var selectView = SC.SelectView.create({
     items: "A B C D E".w(),
-    selectView: selectView
+    value: "A"
   });
+  selectView.showMenu();
 
-  menu.popup();
   SC.RunLoop.end();
 
+  var menu = selectView.get('menu');
 
   equals(menu.get('menuItemViews')[0].get('isChecked'), YES, "First menu item is checked");
 
@@ -27,6 +24,7 @@ test("Selected menu item is checked", function() {
   equals(menu.get('menuItemViews')[0].get('isChecked'), NO, "First menu item is checked");
   equals(menu.get('menuItemViews')[2].get('isChecked'), YES, "Third menu item is checked");
 
-
-  menu.remove();
+  SC.RunLoop.begin();
+  selectView.hideMenu();
+  SC.RunLoop.end();
 });

data/lib/frameworks/sproutcore/frameworks/{desktop/tests/panes/select_button/methods.js → experimental/frameworks/select_view/tests/views/select/method.js}

@@ -9,7 +9,7 @@
 
 var pane, view , view1, view2, view3, view4 ;
 
-module("SC.SelectButtonView",{
+module("SC.SelectView",{
 
   //setup
   setup: function() {
@@ -28,40 +28,40 @@ module("SC.SelectButtonView",{
       childViews: [
 
         //view1
-        SC.SelectButtonView.extend({
-          objects: ["To","Back", "You"],
+        SC.SelectView.extend({
+          items: ["To","Back", "You"],
           disableSort: NO
         }),
 
         //view2
-        SC.SelectButtonView.extend({
-          objects: ["Drop","Down", "Menu"]
+        SC.SelectView.extend({
+          items: ["Drop","Down", "Menu"]
         }),
 
         //view3
-        SC.SelectButtonView.extend({
-          objectsBinding: '*owner.objs',
+        SC.SelectView.extend({
+          itemsBinding: '*owner.objs',
           valueBinding: '*owner.selectedValue',
           isVisibleBinding: '*owner.isDue'
         }),
 
         //view4
-        SC.SelectButtonView.extend({
-          objectsBinding: '*owner.objs2',
+        SC.SelectView.extend({
+          itemsBinding: '*owner.objs2',
           valueBinding: '*owner.selectedValue',
-          valueKey: 'title',
-          nameKey: 'title',
-          sortKey: 'pos'
+          itemValueKey: 'title',
+          itemTitleKey: 'title',
+          itemSortKey: 'pos'
         }),
 
         //view5
-        SC.SelectButtonView.extend({
-          objects: ["My","New", "List"]
+        SC.SelectView.extend({
+          items: ["My","New", "List"]
         }),
 
         //view6
-        SC.SelectButtonView.extend({
-          objects: ["My","New", "List"],
+        SC.SelectView.extend({
+          items: ["My","New", "List"],
           customViewClassName: 'custom-menu-item',
           customViewMenuOffsetWidth: 46
         })
@@ -81,101 +81,79 @@ module("SC.SelectButtonView",{
 
   //teardown
   teardown: function() {
-    pane.remove();
-    pane.destroy();
+    pane.remove() ;
     pane = view = null ;
   }
 });
 
-//test1
-test("Check if objectBinding works", function() {
-  var obj = view3.objects ;
-  equals('Around',obj.get(0),'First item should be') ;
-  equals('The',obj.get(1),'Second item should be') ;
-  equals('World',obj.get(2),'Last item should be') ;
-});
-
 //test2
 test("Check if valueBinding works", function() {
   equals('World',view4.get('value'),'Value should be') ;
 });
 
 //test3
-test("Check if isVisibleBinding works", function() {
-  var isDue = pane.isDue ;
-  SC.RunLoop.begin() ;
-  pane.set('isDue', NO) ;
-  SC.RunLoop.end() ;
-  ok(!view3.get('isVisibleInWindow'), 'view2.isVisibleInWindow should be NO') ;
+test("Check if title of the menu is correctly displayed if no itemTitleKey", function() {
+  SC.run(function() { view2.showMenu(); });
+  equals(view2.getPath("menu.displayItems")[0].title, "Drop", "The first item should be Drop.");
+  SC.run(function() { view2.set('value', 'Down'); });
+  equals(view2.getPath("menu.value"), "Down", "The menu value should be Down.");
+  SC.run(function() { view2.hideMenu(); });
 });
 
 //test4
-test("SelectButton with objects", function() {
-  equals(3,view1.objects.length,'The number of options in selectButton Menu should be') ;
-  equals(null,view1.nameKey,'the selectButton should not have any name key') ;
-  equals(null,view1.valueKey,'the selectButton should not have any value key') ;
+test("Check if select items are bind to menu items", function() {
+  SC.run(function() { view4.showMenu(); });
+  equals(view4.getPath("items.length"), 4, "select items length should 4.");
+  equals(view4.getPath("displayItems.length"), 4, "select displayItems length should 4.");
+  equals(view4.getPath("menu.displayItems.length"), 4, "menu displayItems length should 4.");
+  SC.run(function() { view4.get('items').pushObject({ title: "More", pos: 5}); });
+  equals(view4.getPath("items.length"), 5, "select items length should have changed.");
+  equals(view4.getPath("displayItems.length"), 5, "select displayItems length have changed.");
+  equals(view4.getPath("menu.displayItems.length"), 5, "menu displayItems length have changed.");
+  SC.run(function() { view4.set('items', ['a','b']); });
+  equals(view4.getPath("items.length"), 2, "select items length should have changed.");
+  equals(view4.getPath("displayItems.length"), 2, "select displayItems length have changed.");
+  equals(view4.getPath("menu.displayItems.length"), 2, "menu displayItems length have changed.");
+  SC.run(function() { view4.hideMenu(); });
 });
 
 //test5
 test("sortObjects() sorts the items of the Drop Down component", function() {
-  var obj = view1.objects;
-  view1.objects = view1.sortObjects(obj);
+  var obj = view1.get("items");
+  SC.run(function() { view1.showMenu(); });
+  obj = view1.menu.get('displayItems');
 
-  equals("Back",obj.get(0),'First item should be') ;
-  equals("To",obj.get(1),'Second item should be') ;
-  equals("You",obj.get(2),'Third item should be') ;
-});
+  equals("Back",obj.get(0).title,'First item should be') ;
+  equals("To",obj.get(1).title,'Second item should be') ;
+  equals("You",obj.get(2).title,'Third item should be') ;
 
-//test6
-test("rebuildMenu() populates the Drop Down Menu with new data", function() {
-  var newObj = ['Rebuild', 'Drop', 'Down', 'Menu'] ;
-  view2.objects = newObj;
-  var obj = view2.objects;
-  equals('Rebuild',obj.get(0),'First item should be') ;
-  equals('Drop',obj.get(1),'Second item should be') ;
-  equals('Down',obj.get(2),'Third item should be') ;
-  equals('Menu',obj.get(3),'Fourth item should be') ;
+  SC.run(function() { view1.hideMenu(); });
 });
 
 //test7
 test("isEnabled=NO should add disabled class", function() {
   SC.RunLoop.begin() ;
-    view1.set('isEnabled', NO) ;
+  view1.set('isEnabled', NO) ;
   SC.RunLoop.end() ;
   ok(view1.$().hasClass('disabled'), 'should have disabled class') ;
 });
 
-//test8
-test("objects should change on changing the binding", function() {
-  SC.RunLoop.begin();
-    var newObjects = ['Bound','Objects'] ;
-    pane.set('objs', newObjects) ;
-  SC.RunLoop.end() ;
-
-  var objects = view3.objects ;
-  newObjects = pane.objs ;
-  ok(objects===newObjects, 'Objects should be bound') ;
-});
-
-//test9
+// I think this test is probably somewhat pointless, but perhaps some
+// buggy observers being called could break it or something...
 test("Check if setting a value actually changes the selection value", function() {
   SC.RunLoop.begin() ;
-    view2.set('value','Menu') ;
+  view2.set('value','Menu') ;
   SC.RunLoop.end() ;
 
   equals(view2.get('value'), 'Menu', 'value of Drop down should change to') ;
 }) ;
 
 //test10
-test("objects should change on changing the binding", function() {
-  SC.RunLoop.begin() ;
-    var newObjects = ['Bound','Objects'] ;
-    pane.set('objs', newObjects) ;
-  SC.RunLoop.end() ;
-
-  var objects = view3.objects ;
-  newObjects = pane.objs ;
-  ok(objects===newObjects, 'Objects should be bound') ;
+test('Setting the view\'s items should not result in an error.', function() {
+  try { view1.set('items', null); }
+  catch (e) {
+    ok(false, 'Nulling out items should not throw an error.');
+  }
 });
 
 //test11
@@ -183,7 +161,7 @@ test("The properties for select button should take default values unless specifi
   var prop1 = view5.get('customViewClassName');
   var prop2 = view5.get('customViewMenuOffsetWidth');
   equals(prop1,null,'Custom view class name should be null');
-  equals(prop2,0,'Custom view menu off set width should be 0');
+  equals(prop2,null,'Custom view menu off set width should be 0');
 });
 
 //test12

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/selected_item.js

@@ -106,6 +106,21 @@ test("changing value changes the selected item", function() {
   equals(view.get('title'), "Yo", "Title has changed");
 });
 
+test("changing value changes the selected item when itemValueKey is null", function() {
+  SC.RunLoop.begin();
+  var view = createView({ defaultTitle: "Bonjour", itemValueKey: null });
+  SC.RunLoop.end();
+
+  equals(view.get('selectedItem'), null, "Selected item starts at null");
+
+  SC.RunLoop.begin();
+  view.set('value', obj);
+  SC.RunLoop.end();
+
+  ok(view.get('selectedItem') !== null, "Selected item is no longer null");
+  equals(view.get('title'), "Lost", "Title has changed");
+});
+
 test("changing value to a value not in the list deselects", function() {
   SC.RunLoop.begin();
   var view = createView({ defaultTitle: "Bonjour" });
@@ -187,5 +202,25 @@ test("value does not change when an SC.Object item's value changes when that ite
 
 });
 
+test("title changes when items are changed", function() {
+  SC.RunLoop.begin();
+  var view = createView({ value: "Found" });
+  SC.RunLoop.end();
+
+  equals(view.get('title'), "Lost", "Title starts at that of selected item");
+
+  SC.RunLoop.begin();
+  view.set('items', [{title: 'Finally found', value: 'Found'}]);
+  SC.RunLoop.end();
 
+  equals(view.get('title'), "Finally found", "Title changed");
+
+  SC.RunLoop.begin();
+  view.set('items', [{title: 'Hello', value: 'hi'}]);
+  SC.RunLoop.end();
+
+  equals(view.get('title'), "", "Title is empty");
+  equals(view.get('value'), "Found", "Value has not changed");
+
+});