sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js

@@ -3,7 +3,7 @@
 // Copyright: ©2006-2009 Apple Inc. and contributors.
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
-var b;
+var b, counter;
 
 module("SC.ButtonView#actions", {
 	setup: function() {
@@ -43,3 +43,83 @@ test("Test different moused states", function() {
 });
 
 
+module("SC.ButtonView#actions - SC.HOLD_BEHAVIOR", {
+  setup: function() {
+    counter = SC.Object.create({
+      value: 0,
+      increment: function(){
+        this.set('value', this.get('value') + 1);
+      }
+    });
+
+    b = SC.ButtonView.create({
+      buttonBehavior: SC.HOLD_BEHAVIOR,
+      holdInterval: 5,
+      target: counter,
+      action: 'increment',
+
+      // Is it a bad idea to stub like this? If we don't do it this way, we need to set up a Pane
+      _runAction: function(evt) {
+        var action = this.get('action'),
+            target = this.get('target') || null;
+
+        target[action]();
+      }
+    });
+  }
+});
+
+test('Test triggerAction only happens once', function(){
+  b.triggerAction();
+
+  var assertions = function(){
+    equals(counter.get('value'), 1, "should only run action once");
+    start();
+  };
+
+  stop();
+  setTimeout(assertions, 10);
+});
+
+// This test is not nearly reliable enough
+test("Test action repeats while active", function(){
+  b.set('isActive', YES);
+  b._action();
+
+  var assertions = function(){
+    // The actual number of times in not entirely predictable since there can be delays beyond the holdInterval
+    console.log('counter', counter.get('value'));
+    ok(counter.get('value') > 2, "should have run more than 2 times");
+    b.set('isActive', NO); // Stops triggering
+    start();
+  };
+
+  stop();
+  setTimeout(assertions, 100);
+});
+
+test("Test action happens on mouseDown", function(){
+  b.mouseDown();
+  equals(counter.get('value'), 1, "should have run once");
+  b.set('isActive', NO); // Stops triggering
+});
+
+test("Test action does not happen on mouseUp", function(){
+  b._isMouseDown = YES;
+  b.mouseUp();
+  equals(counter.get('value'), 0, "should not have run");
+});
+
+test("Should stop when inactive", function(){
+  b.set('isActive', YES);
+  b._action();
+  b.set('isActive', NO);
+
+  var assertions = function(){
+    equals(counter.get('value'), 1, "should only run action once");
+    start();
+  };
+
+  stop();
+  setTimeout(assertions, 10);
+});

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

@@ -83,9 +83,8 @@ test("clicking on a radio button will change toggle the value", function() {
 
 test("pressing mouseDown and then mouseUp anywhere in a radio button should toggle the selection", function() {
   var elem = view.get('layer'), input = SC.$('input', elem);
-  
-  SC.Event.trigger(elem, 'mousedown');
-  ok(view.get('isActive'), 'view should be active');
+  SC.Event.trigger(input[0], 'mousedown');
+  ok(view.$('label').first().hasClass('active'), 'radio button should be active');
   equals(view.get('value'), 'Red', 'value should not change yet');
   
   // simulate mouseUp and browser-native change to control
@@ -94,7 +93,7 @@ test("pressing mouseDown and then mouseUp anywhere in a radio button should togg
   // loose focus of the element since it was changed
   SC.Event.trigger(input.get(1),'click');
   
-  ok(!view.get('isActive'), 'view should no longer be active');
+  ok(!view.$('label').first().hasClass('active'), 'radio button should no longer be active');
   equals(view.get('value'), undefined, 'value should be undefined (none checked)');
   
   input = elem = null ;

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

@@ -11,7 +11,8 @@
 SC.TOGGLE_BEHAVIOR = 'toggle';
 SC.PUSH_BEHAVIOR =   'push';
 SC.TOGGLE_ON_BEHAVIOR = "on";
-SC.TOGGLE_OFF_BEHAVIOR = "off" ;  
+SC.TOGGLE_OFF_BEHAVIOR = "off" ;
+SC.HOLD_BEHAVIOR = 'hold' ;
 
 /** @class
 
@@ -56,6 +57,13 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   */  
   buttonBehavior: SC.PUSH_BEHAVIOR,
 
+  /*
+    If buttonBehavior is SC.HOLD_BEHAVIOR, this specifies, in miliseconds, how often to trigger the action.
+    Ignored for other behaviors.
+  */
+
+  holdInterval: 100,
+
   /**
     If YES, then this button will be triggered when you hit return.
     
@@ -122,7 +130,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   triggerAction: function(evt) {  
     if (!this.get('isEnabled')) return NO;
     this.set('isActive', YES);
-    this._action(evt);
+    this._action(evt, YES);
     this.didTriggerAction();
     this.invokeLater('set', 200, 'isActive', NO);
     return true;
@@ -228,11 +236,15 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     On mouse down, set active only if enabled.
   */    
   mouseDown: function(evt) {
+    var buttonBehavior = this.get('buttonBehavior');
+
     if (!this.get('isEnabled')) return YES ; // handled event, but do nothing
     this.set('isActive', YES);
     this._isMouseDown = YES;
 
-    if (!this._isFocused && (this.get('buttonBehavior')!==SC.PUSH_BEHAVIOR)) {
+    if (buttonBehavior === SC.HOLD_BEHAVIOR) {
+      this._action(evt);
+    } else if (!this._isFocused && (buttonBehavior!==SC.PUSH_BEHAVIOR)) {
       this._isFocused = YES ;
       this.becomeFirstResponder();
       if (this.get('isVisibleInWindow')) {
@@ -265,9 +277,13 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   mouseUp: function(evt) {
     if (this._isMouseDown) this.set('isActive', NO); // track independently in case isEnabled has changed
     this._isMouseDown = false;
-    var inside = this.$().within(evt.target) ;
-    if (inside && this.get('isEnabled')) this._action(evt) ;
-    return true ;
+
+    if (this.get('buttonBehavior') !== SC.HOLD_BEHAVIOR) {
+      var inside = this.$().within(evt.target) ;
+      if (inside && this.get('isEnabled')) this._action(evt) ;
+    }
+
+    return YES ;
   },
   
   
@@ -275,7 +291,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     // 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
     }    
     if (evt.which === 13) {
@@ -292,7 +309,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
    - off behavior: turn off.
    - otherwise: invoke target/action
   */
-  _action: function(evt) {
+  _action: function(evt, skipHoldRepeat) {
     switch(this.get('buttonBehavior')) {
       
     // When toggling, try to invert like values. i.e. 1 => 0, etc.
@@ -314,20 +331,42 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     case SC.TOGGLE_OFF_BEHAVIOR:
       this.set('value', this.get('toggleOffValue')) ;
       break ;
-      
+
+    case SC.HOLD_BEHAVIOR:
+      this._runHoldAction(evt, skipHoldRepeat);
+      break ;
+
     // otherwise, just trigger an action if there is one.
     default:
       //if (this.action) this.action(evt);
-      var action = this.get('action'),
-          target = this.get('target') || null;
-      if (action) {
-        if (this._hasLegacyActionHandler()) {
-          // old school... 
-          this._triggerLegacyActionHandler(evt);
-        } else {
-          // newer action method + optional target syntax...
-          this.getPath('pane.rootResponder').sendAction(action, target, this, this.get('pane'));
-        }
+      this._runAction(evt);
+    }
+  },
+
+  _runAction: function(evt) {
+    var action = this.get('action'),
+        target = this.get('target') || null;
+
+    if (action) {
+      if (this._hasLegacyActionHandler()) {
+        // old school... 
+        this._triggerLegacyActionHandler(evt);
+      } else {
+        // newer action method + optional target syntax...
+        this.getPath('pane.rootResponder').sendAction(action, target, this, this.get('pane'));
+      }
+    }
+  },
+
+  _runHoldAction: function(evt, skipRepeat) {
+    if (this.get('isActive')) {
+      this._runAction();
+
+      if (!skipRepeat) {
+        // This run loop appears to only be necessary for testing
+        SC.RunLoop.begin();
+        this.invokeLater('_runHoldAction', this.get('holdInterval'), evt);
+        SC.RunLoop.end();
       }
     }
   },
@@ -336,8 +375,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   _hasLegacyActionHandler: function()
   {
     var action = this.get('action');
-    if (action && (SC.typeOf(action) == SC.T_FUNCTION)) return true;
-    if (action && (SC.typeOf(action) == SC.T_STRING) && (action.indexOf('.') != -1)) return true;
+    if (action && (SC.typeOf(action) === SC.T_FUNCTION)) return true;
+    if (action && (SC.typeOf(action) === SC.T_STRING) && (action.indexOf('.') != -1)) return true;
     return false;
   },
 
@@ -347,8 +386,8 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
     if (!this._hasLegacyActionHandler()) return false;
     
     var action = this.get('action');
-    if (SC.typeOf(action) == SC.T_FUNCTION) this.action(evt);
-    if (SC.typeOf(action) == SC.T_STRING) {
+    if (SC.typeOf(action) === SC.T_FUNCTION) this.action(evt);
+    if (SC.typeOf(action) === SC.T_STRING) {
       eval("this.action = function(e) { return "+ action +"(this, e); };");
       this.action(evt);
     }
@@ -356,8 +395,9 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   
   /** tied to the isEnabled state */
   acceptsFirstResponder: function() {
-        return this.get('isEnabled');
-      }.property('isEnabled'),
+    if(!SC.SAFARI_FOCUS_BEHAVIOR) return this.get('isEnabled');
+    else return NO;
+  }.property('isEnabled'),
   
   willBecomeKeyResponderFrom: function(keyView) {
     // focus the text field.
@@ -372,17 +412,6 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button, SC.StaticLayout,
   
   willLoseKeyResponderTo: function(responder) {
     if (this._isFocused) this._isFocused = NO ;
-  },
-  
-  didCreateLayer: function() {
-    //Fix for IE7 min-with bug
-    if(SC.browser.msie<8) {
-      var buttonInner = this.$('.sc-button-inner')[0];
-      if (buttonInner){
-        var mL = buttonInner.style.marginLeft;
-        this.$('.sc-button-label')[0].style.minWidth=this.get('titleMinWidth')-mL;
-      }
-    }
   }
   
 }) ;

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

@@ -803,7 +803,7 @@ SC.CollectionView = SC.View.extend(
         nowShowing = this.get('nowShowing'),
         itemViews  = this._sc_itemViews,
         containerView = this.get('containerView') || this,
-        views, idx, cvlen, view, childViews, layer ;
+        views, idx, view, layer ;
 
     // if the set is defined but it contains the entire nowShowing range, just
     // replace
@@ -812,15 +812,12 @@ SC.CollectionView = SC.View.extend(
 
     // if an index set, just update indexes
     if (invalid.isIndexSet) {
-      childViews = containerView.get('childViews');
-      cvlen = childViews.get('length');
       
       if (bench) {
         SC.Benchmark.start(bench="%@#reloadIfNeeded (Partial)".fmt(this),YES);
       }
       
       invalid.forEach(function(idx) {
-        
         // get the existing item view, if there is one
         var existing = itemViews ? itemViews[idx] : null;
         
@@ -904,7 +901,7 @@ SC.CollectionView = SC.View.extend(
     child views still need to be added, go ahead and add them.
   */
   render: function(context, firstTime) {
-    if (firstTime && this._needsReload) this.reloadIfNeeded ;
+    if (firstTime && this._needsReload) this.reloadIfNeeded() ;
     
     // add classes for other state.
     context.setClass('focus', this.get('isFirstResponder'));
@@ -1224,8 +1221,8 @@ SC.CollectionView = SC.View.extend(
   reloadSelectionIndexes: function(indexes) {
     var invalid = this._invalidSelection ;
     if (indexes && (invalid !== YES)) {
-      if (invalid) invalid.add(indexes)
-      else invalid = this._invalidSelection = indexes.copy();
+      if (invalid) { invalid.add(indexes) ; }
+      else { invalid = this._invalidSelection = indexes.copy(); }
 
     } else this._invalidSelection = YES ; // force a total reload
     

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

@@ -37,11 +37,15 @@ SC.DisclosureView = SC.ButtonView.extend(
   
   /** @private */
   render: function(context, firstTime) {
-    context.push('<img src="', SC.BLANK_IMAGE_URL, '" class="button" alt="" />');
-    if(this.get('needsEllipsis')){
-      context.push('<label class="ellipsis">',this.get('displayTitle'),'</label>');
-    }else{
+    if(firstTime){
+      context.push('<img src="', SC.BLANK_IMAGE_URL, '" class="button" alt="" />');
+      if(this.get('needsEllipsis')){
+        context.push('<label class="ellipsis">',this.get('displayTitle'),'</label>');
+      }else{
         context.push('<label>',this.get('displayTitle'),'</label>');  
+      }
+    }else{
+      this.$('label')[0].text = this.get('displayTitle');
     }
   },
   

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

@@ -308,7 +308,7 @@ SC.ListView = SC.CollectionView.extend(
     var ret = this._sclv_layout;
     if (!ret) ret = this._sclv_layout = {};
     ret.minHeight = this.rowOffsetForContentIndex(this.get('length'))+4;
-    this.calculatedHeight = ret.minHeight;
+    this.set('calculatedHeight',ret.minHeight);
     return ret ;
   },
   

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

@@ -241,7 +241,7 @@ SC.ListItemView = SC.View.extend(
       this.renderCount(working, value) ;
       var digits = ['zero', 'one', 'two', 'three', 'four', 'five'];
       var digit = (value.toString().length < digits.length) ? digits[value.toString().length] : digits[digits.length-1];
-      context.addClass('has-count %@-digit'.fmt(digit));
+      context.addClass('has-count '+digit+'-digit');
     }
     
     // handle action 
@@ -281,7 +281,7 @@ SC.ListItemView = SC.View.extend(
     html = cache[key];
 
     if (!html) {
-      html = cache[key] = '<img src="%@" class="disclosure button %@" />'.fmt(SC.BLANK_IMAGE_URL, key);
+      html = cache[key] = '<img src="'+SC.BLANK_IMAGE_URL+'" class="disclosure button '+key+'" />';
     }
     
     context.push(html);
@@ -453,7 +453,7 @@ SC.ListItemView = SC.View.extend(
     
     var el = SC.$(evt.target) ;
     var ret = NO, classNames ;
-    while(!ret && el.length>0 && (el.get(0) !== layer)) {
+    while(!ret && el.length>0 && (el[0] !== layer)) {
       if (el.hasClass(className)) ret = YES ;
       el = el.parent() ;
     }
@@ -480,6 +480,15 @@ SC.ListItemView = SC.View.extend(
     return this._isInsideElementWithClassName('disclosure', evt);
   },
   
+  /** @private 
+    Returns YES if the list item has a right icon and the event 
+    occurred inside of it.
+  */
+  _isInsideRightIcon: function(evt) {
+    var del = this.displayDelegate ;
+    var rightIconKey = this.getDelegateProperty('hasContentRightIcon', del) ;
+    return rightIconKey && this._isInsideElementWithClassName('right-icon', evt);
+  },
   
   /** @private 
   mouseDown is handled only for clicks on the checkbox view or or action
@@ -503,7 +512,11 @@ SC.ListItemView = SC.View.extend(
       this._isMouseDownOnDisclosure = YES;
       this._isMouseInsideDisclosure = YES ;
       return YES;
-
+    } else if (this._isInsideRightIcon(evt)) {
+      this._addRightIconActiveState();
+      this._isMouseDownOnRightIcon = YES;
+      this._isMouseInsideRightIcon = YES ;
+      return YES;
     }
     
     return NO ; // let the collection view handle this event
@@ -555,11 +568,17 @@ SC.ListItemView = SC.View.extend(
      
       this._removeDisclosureActiveState();
       ret = YES ;
+    // if mouse was down in right icon -- then handle mouse up, otherwise 
+    // allow parent view to handle event.
+    } else if (this._isMouseDownOnRightIcon) {
+      this._removeRightIconActiveState() ;
+      ret = YES ;
     } 
    
     // clear cached info
     this._isMouseInsideCheckbox = this._isMouseDownOnCheckbox = NO ;
     this._isMouseDownOnDisclosure = this._isMouseInsideDisclosure = NO ;
+    this._isMouseInsideRightIcon = this._isMouseDownOnRightIcon = NO ;
     return ret ;
   },
   
@@ -571,6 +590,9 @@ SC.ListItemView = SC.View.extend(
    } else if (this._isMouseDownOnDisclosure) {
      this._removeDisclosureActiveState();
      this._isMouseInsideDisclosure = NO ;
+   } else if (this._isMouseDownOnRightIcon) {
+     this._removeRightIconActiveState();
+     this._isMouseInsideRightIcon = NO ;
    }
    return NO ;
   },
@@ -583,6 +605,9 @@ SC.ListItemView = SC.View.extend(
    } else if (this._isMouseDownOnDisclosure) {
      this._addDisclosureActiveState();
      this._isMouseInsideDisclosure = YES;
+   } else if (this._isMouseDownOnRightIcon) {
+     this._addRightIconActiveState();
+     this._isMouseInsideRightIcon = YES;
    }
    return NO ;
   },
@@ -604,6 +629,14 @@ SC.ListItemView = SC.View.extend(
   _removeDisclosureActiveState: function() {
    this.$('img.disclosure').removeClass('active');
   },
+
+  _addRightIconActiveState: function() {
+   this.$('img.right-icon').setClass('active', YES);
+  },
+  
+  _removeRightIconActiveState: function() {
+   this.$('img.right-icon').removeClass('active');
+  },
   
   /**
     Returns true if a click is on the label text itself to enable editing.
@@ -622,7 +655,7 @@ SC.ListItemView = SC.View.extend(
    if (!labelKey) return NO ;
    
    // get the element to check for.
-   var el = this.$label().get(0) ;
+   var el = this.$label()[0] ;
    if (!el) return NO ; // no label to check for.
    
    var cur = evt.target, layer = this.get('layer') ;