sproutcore 1.6.0.rc.1-x86-mingw32 → 1.6.0.rc.2-x86-mingw32

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

@@ -333,7 +333,6 @@ SC.AlertPane = SC.PanelPane.extend(
           localize: YES,
           titleMinWidth: 64,
           layout: { right: 5, height: 'auto', width: 'auto', bottom: 0 },
-          theme: 'capsule',
           isCancel: YES,
           action: "dismiss",
           isVisible: NO
@@ -345,7 +344,6 @@ SC.AlertPane = SC.PanelPane.extend(
           localize: YES,
           titleMinWidth: 64,
           layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-          theme: 'capsule',
           isDefault: YES,
           action: "dismiss",
           isVisible: NO
@@ -361,7 +359,6 @@ SC.AlertPane = SC.PanelPane.extend(
             localize: YES,
             titleMinWidth: 64,
             layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-            theme: 'capsule',
             action: "dismiss",
             isVisible: NO
           })]
@@ -444,7 +441,7 @@ SC.AlertPane.mixin(
     var pane = this.create(args), 
         idx = 0, 
         buttons = args.buttons,
-        buttonView, title, action, target;
+        buttonView, title, action, target, themeName;
     
     if(buttons) {
       buttons.forEach(function(button) {
@@ -454,14 +451,15 @@ SC.AlertPane.mixin(
         title = button.title;
         action = button.action;
         target = button.target;
+        themeName = args.themeName || 'capsule';
         
         buttonView.set('title'.fmt(idx), title);
         if(action) buttonView.set('customAction'.fmt(idx), action);
         if(target) buttonView.set('target'.fmt(idx), target);
         buttonView.set('isVisible', !!title);
+        buttonView.set('themeName', themeName);
       });
-    }
-    else {
+    } else {
       // if there are no buttons defined, just add the standard OK button
       buttonView = pane.get('button1');
       buttonView.set('title', "OK");
@@ -556,7 +554,8 @@ SC.AlertPane.mixin(
         description: normalizedArgs[1],
         caption: normalizedArgs[2],
         delegate: normalizedArgs[7],
-        icon: (normalizedArgs[6] || 'sc-icon-alert-48')
+        icon: (normalizedArgs[6] || 'sc-icon-alert-48'),
+        themeName: 'capsule'
       };
       
       // set buttons if there are any (and check if it's a string, since last

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

@@ -803,14 +803,17 @@ SC.PickerPane = SC.PalettePane.extend(
         target = this.get('removeTarget') || null,
         action = this.get('removeAction'),
         rootResponder = this.get('rootResponder');
-        
+
     if (!this.clickInside(f, evt)) {
+      // We're not in the Pane so we must be in the modal
       if (action) {
         rootResponder.sendAction(action, target, this, this, null, this);
       } else this.remove();
+
+      return YES;
     }
-    
-    return YES ; 
+
+    return NO;
   },
 
   /** @private */

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

@@ -12,7 +12,7 @@ module("SC.AlertPane UI");
 
 var pane ;
 
-function evaluatePane(pane, message, description, caption, button1Title, button2Title, button3Title, iconClass) {
+function evaluatePane(pane, message, description, caption, button1Title, button2Title, button3Title, iconClass, themeName) {
   // wrapper
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
   ok(pane.$().hasClass('sc-alert'), 'pane should have sc-alert class');
@@ -67,6 +67,11 @@ 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 shoud have class ' + themeName);
+  ok(button2.$().hasClass(themeName), 'pane.div.div button2 shoud have class ' + themeName);
+  ok(button3.$().hasClass(themeName), 'pane.div.div button3 shoud have class ' + themeName);
 }
 
 test("AlertPane.show with icon, message, description, caption and 3 buttons", function() {
@@ -318,3 +323,22 @@ test("users interaction with mutiple alert panes with 1-3 buttons - old style",
 
   ok(didDismiss, "should dismiss all buttons");
 }) ;
+
+
+test("AlertPane.show with custom themeName", function() {
+  pane = SC.AlertPane.show({
+    themeName: 'AlertPane.themeName',
+    message: 'AlertPane.message',
+    description: 'AlertPane.description',
+    caption: 'AlertPane.caption',
+    icon: 'sc-icon-tools-24',
+    delegate: this,
+    buttons: [
+      { title: 'okButtonTitle' },
+      { title: 'cancelButtonTitle' },
+      { title: 'extraButtonTitle' }
+    ]
+  });
+  evaluatePane(pane, "AlertPane.message", 'AlertPane.description', 'AlertPane.caption', "okButtonTitle", "cancelButtonTitle", 'extraButtonTitle', 'sc-icon-tools-24', 'AlertPane.themeName');
+  pane.dismiss();
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js

@@ -42,9 +42,7 @@ module("SC.TabView", {
   }
 });
 
-test("Check that all segmentedViews are visible", function() {
-   ok(true, 'hello');
- });
+test("Methods of TabView are untested");
 
 
 //_tab_nowShowingDidChange: function() {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js

@@ -25,6 +25,7 @@
       itemTitleKey: 'title',
       itemValueKey: 'value',
       itemIconKey: 'icon',
+      controlSize: SC.LARGE_CONTROL_SIZE,
       layout: { left:12, height: 200, right:12, top:12 }
 
   })
@@ -40,9 +41,11 @@
 
     itemTitleKey: 'title',
     itemValueKey: 'value',
+    controlSize: SC.SMALL_CONTROL_SIZE,
     layout: { left:12, height: 200, right:12, top:12 }
 
     })
+
     .add("tabView3", SC.TabView, {
 
       items: [
@@ -81,11 +84,27 @@
 
    test("Check that the tabView has the right classes set", function() {
      var view = pane.view('tabView1');
-     var viewElem = view.$();
+     var viewElem = view.$(),
+         segmentedView;
+     
+     segmentedView = view.get('segmentedView');
+     
      ok(viewElem.hasClass('sc-view'), 'tabView1.hasClass(sc-view) should be YES');
      ok(viewElem.hasClass('sc-tab-view'), 'tabView1.hasClass(sc-tab-view) should be YES');
      ok(view.$('.sc-segmented-view').length, 'tabView1 should contain a segmented view');
      ok(view.$('.sc-container-view').length, 'tabView1 should contain a container view');
+     ok(view.$('.sc-segmented-view').hasClass('sc-large-size'), 'tabView1 should contain a segmented view with sc-large-size class');
+     equals(SC.LARGE_CONTROL_SIZE, segmentedView.get('controlSize'), "tabView1's segmentedView's controlSize");
+
+     view = pane.view('tabView2');
+     segmentedView = view.get('segmentedView');
+     ok(view.$('.sc-segmented-view').hasClass('sc-small-size'), 'tabView2 should contain a segmented view with sc-small-size class');
+     equals(SC.SMALL_CONTROL_SIZE, segmentedView.get('controlSize'), "tabView2's segmentedView's controlSize");
+
+     view = pane.view('tabView3');
+     segmentedView = view.get('segmentedView');
+     ok(view.$('.sc-segmented-view').hasClass('sc-regular-size'), 'tabView3 should contain a segmented view with sc-regular-size class');
+     equals(undefined, segmentedView.get('controlSize'), "tabView3's segmentedView's controlSize");
    });
 
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js

@@ -260,7 +260,7 @@ SC.SelectFieldView = SC.FieldView.extend(
         this.set('value',null);
       }
     } else {
-      this.$().attr('disabled', this.get('isEnabled') ? null : 'disabled');
+      this.$().prop('disabled', !this.get('isEnabled'));
     }
   },
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js

@@ -28,13 +28,13 @@ SC.TOP_TOOLBAR_LOCATION = 'top-toolbar';
 */
 SC.BOTTOM_LOCATION = 'bottom';
 
-/** 
+/**
   @class
 
   Incorporates a segmented view and a container view to display the selected
   tab.  Provide an array of items, which will be passed onto the segmented
   view.
-  
+
   @extends SC.View
   @since SproutCore 1.0
 */
@@ -47,7 +47,7 @@ SC.TabView = SC.View.extend(
     @see SC.View#classNames
   */
   classNames: ['sc-tab-view'],
-  
+
   /**
     @type Array
     @default ['nowShowing']
@@ -57,97 +57,97 @@ SC.TabView = SC.View.extend(
 
   // ..........................................................
   // PROPERTIES
-  // 
+  //
 
- /** 
+ /**
     Set nowShowing with the page you want to display.
-    
+
     @type String
     @default null
   */
   nowShowing: null,
-  
+
   /**
     @type Array
     @default []
   */
   items: [],
-  
+
   /**
     @type Boolean
     @default YES
   */
   isEnabled: YES,
-  
+
   /**
     @type String
     @default null
   */
   itemTitleKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemValueKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemIsEnabledKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemIconKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemWidthKey: null,
-  
+
   /**
     @type String
     @default null
   */
   itemToolTipKey: null,
-  
+
   /**
     @type Number
     @default SC.REGULAR_BUTTON_HEIGHT
   */
   tabHeight: SC.REGULAR_BUTTON_HEIGHT,
-  
+
   /**
     Possible values:
-    
+
       - SC.TOP_LOCATION
       - SC.TOP_TOOLBAR_LOCATION
       - SC.BOTTOM_LOCATION
-    
+
     @type String
     @default SC.TOP_LOCATION
   */
   tabLocation: SC.TOP_LOCATION,
-  
-  /** 
+
+  /**
     If set, then the tab location will be automatically saved in the user
     defaults.  Browsers that support localStorage will automatically store
     this information locally.
-    
+
     @type String
     @default null
   */
   userDefaultKey: null,
-  
-  
+
+
   // ..........................................................
   // FORWARDING PROPERTIES
-  // 
-  
+  //
+
   // forward important changes on to child views
   /** @private */
   _tab_nowShowingDidChange: function() {
@@ -166,11 +166,11 @@ SC.TabView = SC.View.extend(
       SC.userDefaults.set([defaultKey,'nowShowing'].join(':'), v);
     }
   }.observes('nowShowing'),
-  
+
   /** @private */
   _tab_itemsDidChange: function() {
     this.get('segmentedView').set('items', this.get('items'));
-    return this ;    
+    return this ;
   }.observes('items'),
 
   /** @private
@@ -183,7 +183,7 @@ SC.TabView = SC.View.extend(
 
   /** @private */
   awake: function() {
-    sc_super();  
+    sc_super();
     var defaultKey = this.get('userDefaultKey');
     if (defaultKey) {
       defaultKey = [defaultKey,'nowShowing'].join(':');
@@ -192,12 +192,13 @@ SC.TabView = SC.View.extend(
     }
 
   },
-  
+
   /** @private */
   createChildViews: function() {
     var childViews  = [], view, containerView, layout,
         tabLocation = this.get('tabLocation'),
-        tabHeight   = this.get('tabHeight');
+        tabHeight   = this.get('tabHeight'),
+        controlSize = this.get('controlSize');
 
     if (tabLocation === SC.TOP_LOCATION) {
       layout = { top: tabHeight/2+1, left: 0, right: 0, bottom: 0, border: 1 };
@@ -215,11 +216,11 @@ SC.TabView = SC.View.extend(
 
     view = this.containerView = this.createChildView(containerView) ;
     childViews.push(view);
-    
+
     //  The segmentedView managed by this tab view.  Note that this TabView uses
     //  a custom segmented view.  You can access this view but you cannot change
     // it.
-    layout = (tabLocation === SC.TOP_LOCATION || 
+    layout = (tabLocation === SC.TOP_LOCATION ||
               tabLocation === SC.TOP_TOOLBAR_LOCATION) ?
              { height: tabHeight, left: 0, right: 0, top: 0 } :
              { height: tabHeight, left: 0, right: 0, bottom: 0 } ;
@@ -227,23 +228,19 @@ SC.TabView = SC.View.extend(
     this.segmentedView = this.get('segmentedView').extend({
       layout: layout,
 
+      controlSize: controlSize,
+
       /** @private
         When the value changes, update the parentView's value as well.
       */
       _sc_tab_segmented_valueDidChange: function() {
         var pv = this.get('parentView');
         if (pv) pv.set('nowShowing', this.get('value'));
-
-        // FIXME: why is this necessary? 'value' is a displayProperty and should
-        // automatically cause displayDidChange() to fire, which should cause 
-        // the two lines below to execute in the normal course of things...
-        this.set('layerNeedsUpdate', YES) ;
-        this.invokeOnce(this.updateLayerIfNeeded) ;
       }.observes('value'),
 
       /** @private */
       init: function() {
-        // before we setup the rest of the view, copy key config properties 
+        // before we setup the rest of the view, copy key config properties
         // from the owner view...
         var pv = this.get('parentView');
         if (pv) {
@@ -252,35 +249,35 @@ SC.TabView = SC.View.extend(
         return sc_super();
       }
     });
-    
+
     view = this.segmentedView = this.createChildView(this.segmentedView) ;
     childViews.push(view);
-    
+
     this.set('childViews', childViews);
-    return this; 
+    return this;
   },
-  
+
   // ..........................................................
   // COMPONENT VIEWS
-  // 
+  //
 
   /**
-    The containerView managed by this tab view.  Note that TabView uses a 
-    custom container view.  You can access this view but you cannot change 
+    The containerView managed by this tab view.  Note that TabView uses a
+    custom container view.  You can access this view but you cannot change
     it.
-    
+
     @type SC.View
     @default SC.ContainerView
     @readOnly
   */
   containerView: SC.ContainerView.extend({ renderDelegateName: 'wellRenderDelegate' }),
-  
+
   /**
     @type SC.View
     @default SC.SegmentedView
   */
   segmentedView: SC.SegmentedView
-  
+
 }) ;
 
 SC._TAB_ITEM_KEYS = ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey', 'itemActionKey', 'itemTargetKey'];