sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/desktop/views/menu_item.js

@@ -483,7 +483,11 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
         }
       }
     }
-    if (!this.get('isEnabled') && !this.isSeparator()) return YES ;
+    if (!this.get('isEnabled') && !this.isSeparator()) {
+      if (parentMenu) parentMenu.set('currentSelectedMenuItem', null);
+      return YES ;
+    }
+
     var key = this.get('contentIsBranchKey') ;
     if(key) {
       var content = this.get('content') ;

data/frameworks/sproutcore/frameworks/desktop/views/popup_button.js

@@ -23,7 +23,10 @@ SC.PopupButtonView = SC.ButtonView.extend({
   preferMatrix: null,
     
   /**private */
-  acceptsFirstResponder: YES,
+  acceptsFirstResponder: function() {
+    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
+    else return NO;
+  }.property('isEnabled'),
   /**
     Overriding the default SC.ButtonView#performKeyEquivalent method to pass 
     it onto the menu

data/frameworks/sproutcore/frameworks/desktop/views/progress.js

@@ -148,23 +148,22 @@ SC.ProgressView = SC.View.extend(SC.Control, {
     if (delay===0) delay = 1000/30;
     if (this.get('isRunning') && this.get('isVisibleInWindow')) {
       this.displayDidChange();
-      this.invokeLater(this._animateProgressBar, delay, 0);
+      this.invokeLater(this._animateProgressBar, delay, 10);
     }
   },
   
   displayProperties: 'value minimum maximum isIndeterminate'.w(),
   
   render: function(context, firstTime) {
-    var inner, animatedBackground;
-    var isIndeterminate = this.get('isIndeterminate');
-    var isRunning = this.get('isRunning');
-    var isEnabled = this.get('isEnabled');
-    var offsetRange = this.get('offsetRange');
-  
-    var offset = (isIndeterminate && isRunning) ? (Math.floor(Date.now()/75)%offsetRange-offsetRange) : 0;
+    var inner, animatedBackground, value, cssString, backPosition,
+        isIndeterminate = this.get('isIndeterminate'),
+        isRunning = this.get('isRunning'),
+        isEnabled = this.get('isEnabled'),
+        offsetRange = this.get('offsetRange'),
+        offset = (isIndeterminate && isRunning) ? 
+                (Math.floor(Date.now()/75)%offsetRange-offsetRange) : 0;
   
     // compute value for setting the width of the inner progress
-    var value;
     if (!isEnabled) {
       value = "0%" ;
     } else if (isIndeterminate) {
@@ -199,16 +198,23 @@ SC.ProgressView = SC.View.extend(SC.Control, {
       context.setClass(classNames);
       inner = this.$('.sc-inner');
       animatedBackground = this.get('animatedBackgroundMatrix');
-      inner.css('width', value).css('left',offset);
+      cssString = "width: "+value+"; ";
+      cssString = cssString + "left: "+offset+"; ";
       if (animatedBackground.length === 3 ) {
-        inner.css('backgroundPosition', '0px -'+ 
-        (animatedBackground[0] + 
-        animatedBackground[1]*this._currentBackground)+'px');
+        backPosition = '0px -'+ 
+                      (animatedBackground[0] + 
+                      animatedBackground[1]*this._currentBackground)+'px';
         if(this._currentBackground===animatedBackground[2]-1
            || this._currentBackground===0){
           this._nextBackground *= -1;
         }
         this._currentBackground += this._nextBackground;
+        
+        cssString = cssString + "backgroundPosition: "+backPosition+"; ";
+        //Instead of using css() set attr for faster perf.
+        inner.attr('style', cssString);
+      }else{
+        inner.attr('style', cssString);
       }
     }
     

data/frameworks/sproutcore/frameworks/desktop/views/radio.js

@@ -347,10 +347,38 @@ SC.RadioView = SC.FieldView.extend(
    
   },
   
-  mouseDown: function(evt) {  
-    this.set('isActive', YES);
+  /**
+    If the user clicks inside one of the radio elements, mark it as active.
+
+    Save the element that was clicked on so we can remove the active state on
+    mouseUp.
+  */
+  mouseDown: function(evt) {
+    var target = evt.target;
+    while (target) {
+      if (target.className && target.className.indexOf('sc-radio-button') > -1) break;
+      target = target.parentNode;
+    }
+    if (!target) return NO;
+
+    target = this.$(target);
+    target.addClass('active');
+    this._activeRadioButton = target;
+
     this._field_isMouseDown = YES;
     return YES;
+  },
+
+  /**
+    If we have a radio element that was clicked on previously, make sure we
+    remove the active state.
+  */
+  mouseUp: function(evt) {
+    var active = this._activeRadioButton;
+    if (active) {
+      active.removeClass('active');
+      this._activeRadioButton = null;
+    }
   }
 
 });

data/frameworks/sproutcore/frameworks/desktop/views/scroll.js

@@ -690,13 +690,12 @@ SC.ScrollView = SC.View.extend(SC.Border, {
     // This forces to recalculate the height of the frame when is at the bottom
     // of the scroll and the content dimension are smaller that the previous one
     
-    
     var mxVOffSet = this.get('maximumVerticalScrollOffset'),
         vOffSet = this.get('verticalScrollOffset'),
         mxHOffSet = this.get('maximumHorizontalScrollOffset'),
         hOffSet = this.get('horizontalScrollOffset');
-    var forceHeight = mxVOffSet && this.get('hasVerticalScroller') && mxVOffSet<vOffSet;
-    var forceWidth = mxHOffSet && this.get('hasHorizontalScroller') && mxHOffSet<hOffSet;
+    var forceHeight = mxVOffSet<vOffSet;
+    var forceWidth = mxHOffSet<hOffSet;
     if(forceHeight || forceWidth){
       this.forceDimensionsRecalculation(forceWidth, forceHeight, vOffSet, hOffSet);
     }

data/frameworks/sproutcore/frameworks/desktop/views/segmented.js

@@ -180,11 +180,9 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     @property {Array}
   */
   displayItems: function() {
-    var items = this.get('items'), loc = this.get('localize') ;
-    var keys=null, itemType, cur ;
-    var ret = [], max = items.get('length'), idx, item ;
-    var fetchKeys = SC._segmented_fetchKeys;
-    var fetchItem = SC._segmented_fetchItem;
+    var items = this.get('items'), loc = this.get('localize'),
+      keys=null, itemType, cur, ret = [], max = items.get('length'), idx, 
+      item, fetchKeys = SC._segmented_fetchKeys, fetchItem = SC._segmented_fetchItem;
     
     // loop through items and collect data
     for(idx=0;idx<max;idx++) {
@@ -198,7 +196,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         
       // if the item is not an array, try to use the itemKeys.
       } else if (itemType !== SC.T_ARRAY) {
-        
         // get the itemKeys the first time
         if (keys===null) {
           keys = this.itemKeys.map(fetchKeys,this);
@@ -209,7 +206,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         cur[cur.length] = idx; // save current index
         
         // special case 1...if title key is null, try to make into string
-        if (!keys[0] && item.toString) cur[0] = item.toString();
+        if (!keys[0] && item.toString) cur[0] = item.toString(); 
         
         // special case 2...if value key is null, use item itself
         if (!keys[1]) cur[1] = item;
@@ -230,7 +227,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     
     // all done, return!
     return ret ;
-  }.property('items', 'itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'localize', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey').cacheable(),
+  }.property('items', 'itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'localize', 'itemIconKey', 'itemWidthKey', 'itemToolTipKey'),
   
   /** If the items array itself changes, add/remove observer on item... */
   itemsDidChange: function() { 
@@ -275,7 +272,6 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     if (firstTime || (items !== last)) {
       this._seg_displayItems = items; // save for future
       this.renderDisplayItems(context, items) ;
-      context.addStyle('text-align', 'center');
     }else{
     // update selection and active state
       var activeIndex = this.get('activeIndex');
@@ -285,13 +281,13 @@ SC.SegmentedView = SC.View.extend(SC.Control,
         value = value.objectAt(0); isArray = NO ;
       }
       var names = {}; // reuse
-    
       var loc = items.length, cq = this.$('a.sc-segment'), item;
       while(--loc>=0) {
         item = items[loc];
         names.sel = isArray ? (value.indexOf(item[1])>=0) : (item[1]===value);
         names.active = (activeIndex === loc);
-        SC.$(cq.get(loc)).setClass(names);
+        names.disabled = !item[2];
+        SC.$(cq[loc]).setClass(names);
       }
       names = items = value = items = null; // cleanup
     }
@@ -352,9 +348,8 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       } else {
         icon = '';
       }
-      ic.push('<span class="sc-button-inner"><label class="sc-button-label">');
-      ic.push(icon+title);
-      ic.push('</label></span>');
+      ic.push('<span class="sc-button-inner"><label class="sc-button-label">',
+              icon+title, '</label></span>');
       ic.end();
     }   
   },  
@@ -374,7 +369,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     // start at the target event and go upwards until we reach either the 
     // root responder or find an anchor.sc-segment.
     var root = this.$(), match = null ;
-    while(!match && (elem.length>0) && (elem.get(0)!==root.get(0))) {
+    while(!match && (elem.length>0) && (elem[0]!==root[0])) {
       if (elem.hasClass('sc-segment') && elem.attr('tagName')==='A') {
         match = elem;
       } else elem = elem.parent();
@@ -391,7 +386,8 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     var i, item, items, len, value, isArray;
     if (evt.which === 9) {
       var view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
-      view.becomeFirstResponder();
+      if(view) view.becomeFirstResponder();
+      else evt.allowDefault();
       return YES ; // handled
     }    
     if (!this.get('allowsMultipleSelection') && !this.get('allowsEmptySelection')){
@@ -548,7 +544,8 @@ SC.SegmentedView = SC.View.extend(SC.Control,
   
   /** tied to the isEnabled state */
    acceptsFirstResponder: function() {
-     return this.get('isEnabled');
+     if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
+     else return NO;
    }.property('isEnabled'),
 
    willBecomeKeyResponderFrom: function(keyView) {

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

@@ -237,7 +237,7 @@ SC.SelectFieldView = SC.FieldView.extend(
     var value = sc_super(); // get raw value... 
     var valueKey = this.get('valueKey') ;
     var objects = this.get('objects') ;
-    var found;
+    var found, object;
     
     // Handle empty selection.
     if (value == '***') {
@@ -247,10 +247,12 @@ SC.SelectFieldView = SC.FieldView.extend(
     // object.
     } else if (value && objects) {
       // objects = Array.from(objects) ;
-      var loc = objects.length ;
+      
+      var loc = (SC.typeOf(objects.length) === SC.T_FUNCTION) ? objects.length() : objects.length;
+      
       found = null ; // matching object goes here.
       while(!found && (--loc >= 0)) {
-        var object = objects[loc] ;
+        object = objects.objectAt? objects.objectAt(loc) : objects[loc] ;
       
         // get value using valueKey if there is one or use object
         // map to _guid or toString.

data/frameworks/sproutcore/frameworks/desktop/views/slider.js

@@ -167,7 +167,8 @@ SC.SliderView = SC.View.extend(SC.Control,
   
   /** tied to the isEnabled state */
   acceptsFirstResponder: function() {
-    return this.get('isEnabled');
+    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
+    else return NO;
   }.property('isEnabled'),
   
   willBecomeKeyResponderFrom: function(keyView) {
@@ -190,7 +191,8 @@ SC.SliderView = SC.View.extend(SC.Control,
      // handle tab key
      if (evt.which === 9) {
        var view = evt.shiftKey ? this.get('previousValidKeyView') : this.get('nextValidKeyView');
-       view.becomeFirstResponder();
+       if(view) view.becomeFirstResponder();
+       else evt.allowDefault(); 
        return YES ; // handled
      }
      

data/frameworks/sproutcore/frameworks/desktop/views/split.js

@@ -171,16 +171,16 @@ SC.SplitView = SC.View.extend(
   */
   thicknessForView: function(view) {
     // console.log('%@.thicknessForView(%@)'.fmt(this, view));
-    var direction = this.get('layoutDirection') ;
-    var ret = view.get('frame') ;
+    var direction = this.get('layoutDirection') ,
+        ret = view.get('frame') ;
     return (direction === SC.LAYOUT_HORIZONTAL) ? ret.width : ret.height ;
   },
   
   createChildViews: function() {
     // console.log('%@.createChildViews()'.fmt(this));
-    var childViews = [] ;
-    var viewAry = ['topLeftView', 'dividerView', 'bottomRightView'] ;
-    var view, idx, len ;
+    var childViews = [] ,
+        viewAry = ['topLeftView', 'dividerView', 'bottomRightView'] ,
+        view, idx, len ;
     
     for (idx=0, len=viewAry.length; idx<len; ++idx) {
       if (view = this.get(viewAry[idx])) {
@@ -205,17 +205,17 @@ SC.SplitView = SC.View.extend(
   */
   updateChildLayout: function() {
     // console.log('%@.updateChildLayout()'.fmt(this));
-    var topLeftView = this.get('topLeftView') ;
-    var bottomRightView = this.get('bottomRightView') ;
-    var dividerView = this.get('dividerView') ;
-    var direction = this.get('layoutDirection') ;
-    var topLeftThickness = this._desiredTopLeftThickness ;
-    var dividerThickness = this.get('dividerThickness') || 7 ;
-    var splitViewThickness = (direction == SC.LAYOUT_HORIZONTAL) ? this.get('frame').width : this.get('frame').height ;
-    var bottomRightThickness = splitViewThickness - dividerThickness - topLeftThickness ;
-    var autoresizeBehavior = this.get('autoresizeBehavior') ;
-    var layout ;
-    var isCollapsed ;
+    var topLeftView = this.get('topLeftView') ,
+        bottomRightView = this.get('bottomRightView') ,
+        dividerView = this.get('dividerView') ,
+        direction = this.get('layoutDirection') ,
+        topLeftThickness = this._desiredTopLeftThickness ;
+    var dividerThickness = this.get('dividerThickness') ;
+        dividerThickness = (!SC.none(dividerThickness)) ? dividerThickness : 7 ;
+    var splitViewThickness = (direction === SC.LAYOUT_HORIZONTAL) ? this.get('frame').width : this.get('frame').height ,
+        bottomRightThickness = splitViewThickness - dividerThickness - topLeftThickness ,
+        autoresizeBehavior = this.get('autoresizeBehavior') ,
+        layout , isCollapsed ;
     
     // console.log('topLeftThickness == %@'.fmt(topLeftThickness));
     // console.log('dividerThickness == %@'.fmt(dividerThickness));
@@ -226,7 +226,7 @@ SC.SplitView = SC.View.extend(
     isCollapsed = topLeftView.get('isCollapsed') || NO ;
     topLeftView.setIfChanged('isVisible', !isCollapsed) ;
     layout = SC.clone(topLeftView.get('layout'));
-    if (direction == SC.LAYOUT_HORIZONTAL) {
+    if (direction === SC.LAYOUT_HORIZONTAL) {
       layout.top = 0 ;
       layout.left = 0 ;
       layout.bottom = 0 ;
@@ -268,7 +268,7 @@ SC.SplitView = SC.View.extend(
     // split divider view
     if (dividerView) {
       layout = SC.clone(dividerView.get('layout'));
-      if (direction == SC.LAYOUT_HORIZONTAL) {
+      if (direction === SC.LAYOUT_HORIZONTAL) {
         layout.width = dividerThickness;
         delete layout.height ;
         layout.top = 0 ;
@@ -332,7 +332,7 @@ SC.SplitView = SC.View.extend(
     isCollapsed = bottomRightView.get('isCollapsed') || NO ;
     bottomRightView.setIfChanged('isVisible', !isCollapsed) ;
     layout = SC.clone(bottomRightView.get('layout'));
-    if (direction == SC.LAYOUT_HORIZONTAL) {
+    if (direction === SC.LAYOUT_HORIZONTAL) {
       layout.top = 0 ;
       layout.bottom = 0 ;
       layout.right = 0 ;
@@ -387,12 +387,13 @@ SC.SplitView = SC.View.extend(
         this.set('thumbViewCursor', SC.Cursor.create()) ;
       }
       
-      var layoutDirection = this.get('layoutDirection') ;
-      var fr = this.get('frame');
-      var splitViewThickness, elemRendered = this.$();
-      var dividerThickness = this.get('dividerThickness') || 7 ;
-      var desiredThickness = this.get('defaultThickness') ;
-      var autoResizeBehavior = this.get('autoresizeBehavior') ;
+      var layoutDirection = this.get('layoutDirection') ,
+          fr = this.get('frame'),
+          splitViewThickness, elemRendered = this.$(),
+          desiredThickness = this.get('defaultThickness') ,
+          autoResizeBehavior = this.get('autoresizeBehavior') ;
+      var dividerThickness = this.get('dividerThickness') ;
+      dividerThickness = (!SC.none(dividerThickness)) ? dividerThickness : 7 ;
       // Turn a flag on to recalculate the spliting if the desired thickness
       // is a percentage
       // debugger;
@@ -403,10 +404,10 @@ SC.SplitView = SC.View.extend(
       
       
       if(elemRendered[0]) {
-        splitViewThickness = (layoutDirection == SC.LAYOUT_HORIZONTAL) ? 
+        splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ? 
               elemRendered[0].offsetWidth : elemRendered[0].offsetHeight ;
       }else{
-        splitViewThickness = (layoutDirection == SC.LAYOUT_HORIZONTAL) ? 
+        splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ? 
               fr.width : fr.height ;
       }
       // if default thickness is < 1, convert from percentage to absolute
@@ -504,7 +505,7 @@ SC.SplitView = SC.View.extend(
   mouseDragged: function(evt) {
     // console.log('%@.mouseDragged(%@)'.fmt(this, evt));
     // console.log(evt.originalEvent);
-    var offset = (this._layoutDirection == SC.LAYOUT_HORIZONTAL) ? evt.pageX - this._mouseDownX : evt.pageY - this._mouseDownY ;
+    var offset = (this._layoutDirection === SC.LAYOUT_HORIZONTAL) ? evt.pageX - this._mouseDownX : evt.pageY - this._mouseDownY ;
     this._updateTopLeftThickness(offset) ;
     return YES;
   },
@@ -525,8 +526,8 @@ SC.SplitView = SC.View.extend(
   doubleClickInThumbView: function(evt, thumbView) {
     // console.log('%@.mouseDragged(%@, %@)'.fmt(this, evt, thumbView));
     // console.log(evt.originalEvent);
-    var view = this._topLeftView ;
-    var isCollapsed = view.get('isCollapsed') || NO ;
+    var view = this._topLeftView,
+        isCollapsed = view.get('isCollapsed') || NO ;
     if (!isCollapsed && !this.canCollapseView(view)) {
       view = this._bottomRightView ;
       isCollapsed = view.get('isCollapsed') || NO ;
@@ -565,33 +566,31 @@ SC.SplitView = SC.View.extend(
   _updateTopLeftThickness: function(offset) {
     // console.log('%@._updateTopLeftThickness(%@)'.fmt(this, offset));
     // console.log('%@.frame = %@'.fmt(this, SC.inspect(this.get('frame'))));
-    var topLeftView = this._topLeftView ;
-    var bottomRightView = this._bottomRightView ;
-    var topLeftViewThickness = this.thicknessForView(topLeftView); // the current thickness, not the original thickness
-    var bottomRightViewThickness = this.thicknessForView(bottomRightView);
+    var topLeftView = this._topLeftView ,
+        bottomRightView = this._bottomRightView,
+        topLeftViewThickness = this.thicknessForView(topLeftView), // the current thickness, not the original thickness
+        bottomRightViewThickness = this.thicknessForView(bottomRightView),
+        minAvailable = this._dividerThickness ,
+        maxAvailable = 0,
+        proposedThickness = this._topLeftViewThickness + offset,
+        direction = this._layoutDirection,
+        bottomRightCanCollapse = this.canCollapseView(bottomRightView),
+        thickness = proposedThickness,
+        // constrain to thickness set on top/left
+        max = this.get('topLeftMaxThickness'),
+        min = this.get('topLeftMinThickness'),
+        bottomRightThickness, tlCollapseAtThickness, brCollapseAtThickness;
     
-    var minAvailable = this._dividerThickness ;
-    var maxAvailable = 0;
     if (!topLeftView.get("isCollapsed")) maxAvailable += topLeftViewThickness ;
     if (!bottomRightView.get("isCollapsed")) maxAvailable += bottomRightViewThickness ;
     
-    var proposedThickness = this._topLeftViewThickness + offset;
-    var direction = this._layoutDirection ;
-    var bottomRightCanCollapse = this.canCollapseView(bottomRightView);
-    
-    var thickness = proposedThickness;
-    
-    // constrain to thickness set on top/left
-    var max = this.get('topLeftMaxThickness') ;
-    var min = this.get('topLeftMinThickness') ;
-    
     if (!SC.none(max)) thickness = Math.min(max, thickness) ;
     if (!SC.none(min)) thickness = Math.max(min, thickness) ;
     
     // constrain to thickness set on bottom/right
     max = this.get('bottomRightMaxThickness') ;
     min = this.get('bottomRightMinThickness') ;
-    var bottomRightThickness = maxAvailable - thickness ;
+    bottomRightThickness = maxAvailable - thickness ;
     if (!SC.none(max)) bottomRightThickness = Math.min(max, bottomRightThickness) ;
     if (!SC.none(min)) bottomRightThickness = Math.max(min, bottomRightThickness) ;
     thickness = maxAvailable - bottomRightThickness ;
@@ -605,9 +604,9 @@ SC.SplitView = SC.View.extend(
     // cannot be less than zero
     thickness = Math.max(0, thickness) ;
     
-    var tlCollapseAtThickness = topLeftView.get('collapseAtThickness') ;
+    tlCollapseAtThickness = topLeftView.get('collapseAtThickness') ;
     if (!tlCollapseAtThickness) tlCollapseAtThickness = 0 ;
-    var brCollapseAtThickness = bottomRightView.get('collapseAtThickness') ;
+    brCollapseAtThickness = bottomRightView.get('collapseAtThickness') ;
     brCollapseAtThickness = SC.none(brCollapseAtThickness) ? maxAvailable : (maxAvailable - brCollapseAtThickness);
     
     if ((proposedThickness <= tlCollapseAtThickness) && this.canCollapseView(topLeftView)) {
@@ -650,18 +649,18 @@ SC.SplitView = SC.View.extend(
   _setCursorStyle: function() {
     // console.log('%@._setCursorStyle()'.fmt(this));
     var topLeftView = this._topLeftView ;
-    var bottomRightView = this._bottomRightView ;
-    var thumbViewCursor = this.get('thumbViewCursor') ;
+        bottomRightView = this._bottomRightView,
+        thumbViewCursor = this.get('thumbViewCursor'),
+        // updates the cursor of the thumb view that called mouseDownInThumbView() to reflect the status of the drag
+        tlThickness = this.thicknessForView(topLeftView),
+        brThickness = this.thicknessForView(bottomRightView);
     this._layoutDirection = this.get('layoutDirection') ;
-    // updates the cursor of the thumb view that called mouseDownInThumbView() to reflect the status of the drag
-    var tlThickness = this.thicknessForView(topLeftView) ;
-    var brThickness = this.thicknessForView(bottomRightView) ;
-    if (topLeftView.get('isCollapsed') || tlThickness == this.get("topLeftMinThickness") || brThickness == this.get("bottomRightMaxThickness")) {
-      thumbViewCursor.set('cursorStyle', this._layoutDirection == SC.LAYOUT_HORIZONTAL ? "e-resize" : "s-resize") ;
-    } else if (bottomRightView.get('isCollapsed') || tlThickness == this.get("topLeftMaxThickness") || brThickness == this.get("bottomRightMinThickness")) {
-      thumbViewCursor.set('cursorStyle', this._layoutDirection == SC.LAYOUT_HORIZONTAL ? "w-resize" : "n-resize") ;
+    if (topLeftView.get('isCollapsed') || tlThickness === this.get("topLeftMinThickness") || brThickness == this.get("bottomRightMaxThickness")) {
+      thumbViewCursor.set('cursorStyle', this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "e-resize" : "s-resize") ;
+    } else if (bottomRightView.get('isCollapsed') || tlThickness === this.get("topLeftMaxThickness") || brThickness == this.get("bottomRightMinThickness")) {
+      thumbViewCursor.set('cursorStyle', this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "w-resize" : "n-resize") ;
     } else {
-      thumbViewCursor.set('cursorStyle', this._layoutDirection == SC.LAYOUT_HORIZONTAL ? "ew-resize" : "ns-resize") ;
+      thumbViewCursor.set('cursorStyle', this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "ew-resize" : "ns-resize") ;
     }
   }.observes('layoutDirection'),