sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/frameworks/desktop/system/root_responder.js

@@ -338,7 +338,6 @@ SC.RootResponder = SC.RootResponder.extend(
   },
   
   dragDidStart: function(drag) {
-    // console.log('dragDidStart called in %@ with %@'.fmt(this, drag));
     this._mouseDownView = drag ;
     this._drag = drag ;
   },
@@ -394,6 +393,11 @@ SC.RootResponder = SC.RootResponder.extend(
     the keypress event.
   */
   keydown: function(evt) {
+    // This code is to check for the simulated keypressed event
+    if(!evt.kindOf) this._ffevt=null;
+    else evt=this._ffevt;
+    if (evt === null) return YES;
+    
     // Firefox does NOT handle delete here...
     if (SC.browser.mozilla > 0 && (evt.which === 8)) return true ;
     
@@ -401,13 +405,25 @@ SC.RootResponder = SC.RootResponder.extend(
     // send event for modifier key changes, but only stop processing if this 
     // is only a modifier change
     var ret = this._handleModifierChanges(evt);
-    if (this._isModifierKey(evt)) return ret;
+    var target = evt.target || evt.srcElement;
+    var forceBlock = (evt.which === 8) && !SC.allowsBackspaceToPreviousPage && (target === document.body);
+    
+    if (this._isModifierKey(evt)) return (forceBlock ? NO : ret);
     
     // if this is a function or non-printable key, try to use this as a key
     // equivalent.  Otherwise, send as a keyDown event so that the focused
     // responder can do something useful with the event.
+    ret = YES ;
     if (this._isFunctionOrNonPrintableKey(evt)) {
-      
+      // Simulate keydown events for firefox since keypress only triggers once
+      // We don't do it in keypress as it doesn't work in certain cases, ie.
+      // Caret is at last position and you press down arrow key.
+      if (SC.browser.mozilla && evt.keyCode>=37 && evt.keyCode<=40){
+        this._ffevt=evt;
+        SC.RunLoop.begin();
+        this.invokeLater(this.keydown, 50);
+        SC.RunLoop.end();
+      }
       // otherwise, send as keyDown event.  If no one was interested in this
       // keyDown event (probably the case), just let the browser do its own
       // processing.
@@ -415,14 +431,14 @@ SC.RootResponder = SC.RootResponder.extend(
       
       // attempt key equivalent if key not handled
       if (!ret) {
-        ret = this.attemptKeyEquivalent(evt) ;
-        return !ret ;
+        ret = !this.attemptKeyEquivalent(evt) ;
       } else {
-        return evt.hasCustomEventHandling ;
+        ret = evt.hasCustomEventHandling ;
+        if (ret) forceBlock = NO ; // code asked explicitly to let delete go
       }
     }
-    
-    return YES ; // otherwise do not handle keydown - wait for keypress
+
+    return forceBlock ? NO : ret ; 
   },
   
   /** @private
@@ -434,9 +450,12 @@ SC.RootResponder = SC.RootResponder.extend(
     trigger a keyDown.
   */
   keypress: function(evt) {
+    var ret ;
+    
     // delete is handled in keydown() for most browsers
     if (SC.browser.mozilla > 0 && (evt.which === 8)) {
-      return this.sendEvent('keyDown', evt) ? evt.hasCustomEventHandling:YES;
+      ret = this.sendEvent('keyDown', evt);
+      return ret ? (SC.allowsBackspaceToPreviousPage || evt.hasCustomEventHandling) : YES ;
 
     // normal processing.  send keyDown for printable keys...
     } else {
@@ -446,6 +465,8 @@ SC.RootResponder = SC.RootResponder.extend(
   },
   
   keyup: function(evt) {
+    // to end the simulation of keypress in firefox set the _ffevt to null
+    if(this._ffevt) this._ffevt=null;
     // modifier keys are handled separately by the 'flagsChanged' event
     // send event for modifier key changes, but only stop processing if this is only a modifier change
     var ret = this._handleModifierChanges(evt);
@@ -458,7 +479,10 @@ SC.RootResponder = SC.RootResponder.extend(
       // make sure the window gets focus no matter what.  FF is inconsistant 
       // about this.
       this.focus();
-      
+      if(SC.browser.msie) {
+        this._lastMouseDownX = evt.clientX;
+        this._lastMouseDownY = evt.clientY;
+      }
       // first, save the click count.  Click count resets if your down is
       // more than 125msec after you last click up.
       this._clickCount += 1 ;
@@ -468,11 +492,22 @@ SC.RootResponder = SC.RootResponder.extend(
       evt.clickCount = this._clickCount ;
       
       var view = this.targetViewForEvent(evt) ;
+      // InlineTextField needs to loose firstResponder whenever you click outside
+      // the view. This is a special case as textfields are not supposed to loose 
+      // focus unless you click on a list, another textfield or an special
+      // view/control.
+      var fr=null;
+      if(view) fr=view.get('pane').get('firstResponder');
+      
+      if(fr && fr.kindOf(SC.InlineTextFieldView) && fr!==view){
+        fr.resignFirstResponder();
+      }
+      
       view = this._mouseDownView = this.sendEvent('mouseDown', evt, view) ;
       if (view && view.respondsTo('mouseDragged')) this._mouseCanDrag = YES ;
     } catch (e) {
     
-      console.log('Exception during mousedown: %@'.fmt(e)) ;
+      console.warn('Exception during mousedown: %@'.fmt(e)) ;
       this._mouseDownView = null ;
       this._mouseCanDrag = NO ;
       throw e;
@@ -489,7 +524,7 @@ SC.RootResponder = SC.RootResponder.extend(
     sent.
   */
   mouseup: function(evt) {
-    // console.log('mouseup called in %@ with this._mouseDownView = %@'.fmt(this, this._mouseDownView));
+
     try {
       if (this._drag) {
         this._drag.tryToPerform('mouseUp', evt) ;
@@ -536,7 +571,6 @@ SC.RootResponder = SC.RootResponder.extend(
       // cleanup
       this._mouseCanDrag = NO; this._mouseDownView = null ;
     } catch (e) {
-      console.log('Exception during mouseup: %@'.fmt(e)) ;
       this._drag = null; this._mouseCanDrag = NO; this._mouseDownView = null ;
       throw e;
     }
@@ -556,7 +590,6 @@ SC.RootResponder = SC.RootResponder.extend(
       var view = this.targetViewForEvent(evt) ;
       var handler = this.sendEvent('mouseWheel', evt, view) ;
     } catch (e) {
-      console.log('Exception during mousewheel: %@'.fmt(e)) ;
       throw e;
     }
     return (handler) ? evt.hasCustomEventHandling : YES ;
@@ -565,10 +598,10 @@ SC.RootResponder = SC.RootResponder.extend(
   _lastHovered: null,
   
   /**
-   This will send mouseOver, mouseOut, and mouseMoved to the views you
-   hover over.  To receive these events, you must implement the method.
-   If any subviews implement them and return true, then you won't receive
-   any notices.
+   This will send mouseEntered, mouseExited, mousedDragged and mouseMoved 
+   to the views you hover over.  To receive these events, you must implement 
+   the method. If any subviews implement them and return true, then you won't 
+   receive any notices.
    
    If there is a target mouseDown view, then mouse moved events will also
    trigger calls to mouseDragged.
@@ -584,7 +617,15 @@ SC.RootResponder = SC.RootResponder.extend(
       // only do mouse[Moved|Entered|Exited|Dragged] if not in a drag session
       // drags send their own events, e.g. drag[Moved|Entered|Exited]
       if (this._drag) {
-        this._drag.tryToPerform('mouseDragged', evt);
+        //IE triggers mousemove at the same time as mousedown
+        if(SC.browser.msie){
+          if (this._lastMouseDownX !== evt.clientX && this._lastMouseDownY !== evt.clientY) {
+            this._drag.tryToPerform('mouseDragged', evt);
+          }
+        }
+        else {
+          this._drag.tryToPerform('mouseDragged', evt);
+        }
       } else {
         
         var lh = this._lastHovered || [] ;
@@ -619,12 +660,17 @@ SC.RootResponder = SC.RootResponder.extend(
         // also, if a mouseDownView exists, call the mouseDragged action, if 
         // it exists.
         if (this._mouseDownView) {
-          this._mouseDownView.tryToPerform('mouseDragged', evt);
+          if(SC.browser.msie){
+            if (this._lastMouseDownX !== evt.clientX && this._lastMouseDownY !== evt.clientY) {
+              this._mouseDownView.tryToPerform('mouseDragged', evt);
+            }
+          }
+          else {
+            this._mouseDownView.tryToPerform('mouseDragged', evt);
+          }
         }
-        
       }
     } catch (e) {
-      console.log('Exception during mousemove: %@'.fmt(e)) ;
       throw e;
     }
     SC.RunLoop.end();
@@ -639,7 +685,7 @@ SC.RootResponder = SC.RootResponder.extend(
   
   selectstart: function(evt) { 
     var result = this.sendEvent('selectStart', evt, this.targetViewForEvent(evt));
-    return (result !=null ? YES: NO) && (this._mouseCanDrag ? NO : YES);
+    return (result !==null ? YES: NO) && (this._mouseCanDrag ? NO : YES);
   },
   
   drag: function() { return false; }

data/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js

@@ -38,7 +38,7 @@ SC.UndoManager = SC.Object.extend(
     
   */
   undoActionName: function() { 
-    return (this.undoStack) ? this.undoStack.name : null ;
+    return this.undoStack ? this.undoStack.name : null ;
   }.property('undoStack'),
   
   /** 
@@ -48,7 +48,7 @@ SC.UndoManager = SC.Object.extend(
     
   */
   redoActionName: function() { 
-    return (this.redoStack) ? this.redoStack.name : null ;
+    return this.redoStack ? this.redoStack.name : null ;
   }.property('redoStack'),
 
   /** 
@@ -132,7 +132,7 @@ SC.UndoManager = SC.Object.extend(
       
     // otherwise, create a new active group.  
     } else {
-      var stack = (this.isUndoing) ? 'redoStack' : 'undoStack' ;
+      var stack = this.isUndoing ? 'redoStack' : 'undoStack' ;
       this._activeGroup = { name: name, actions: [], prev: this.get(stack) } ;
       this.set(stack, this._activeGroup) ;
       this.groupingLevel = 1 ;
@@ -150,7 +150,7 @@ SC.UndoManager = SC.Object.extend(
     } else {
       this._activeGroup = null ; this.groupingLevel = 0 ;
     }
-    this.propertyDidChange((this.isUndoing) ? 'redoStack' : 'undoStack') ;
+    this.propertyDidChange(this.isUndoing ? 'redoStack' : 'undoStack') ;
   },
 
   /**

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

@@ -39,6 +39,7 @@ module('SC.MenuPane#MenuItemTargetIsSet', {
 });
 
 test("Menu sets item target.", function() {
+  menu.get('displayItems');
   menu.append(); // force a rendering of the menu item child views
   var target = menu.menuItemViews[0].get('target'); // see if the target propagated through
   menu.remove(); // remove the menu
@@ -47,6 +48,7 @@ test("Menu sets item target.", function() {
 });
 
 test("Menu sets MenuItem.contentCheckboxKey.", function() {
+  menu.get('displayItems');
   menu.append();
   var key = menu.menuItemViews[0].get('contentCheckboxKey');
   menu.remove();

data/frameworks/sproutcore/frameworks/desktop/tests/panes/{dropDown → select_button}/methods.js

@@ -7,9 +7,9 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-var pane, view , view1, view2, view3 ;
+var pane, view , view1, view2, view3, view4 ;
 
-module("SC.DropDownMenu",{
+module("SC.SelectButtonView",{
 
   //setup
   setup: function() {
@@ -19,31 +19,35 @@ module("SC.DropDownMenu",{
     //pane
     pane = SC.MainPane.create({
       objs : ["Around","The","World"],
+      objs2 : [{ title: "Around", pos: 3},
+        { title: "The", pos: 1},
+        { title: "World", pos: 2 },
+        { title: "Again", pos: 4}],
       selectedValue: "World",
       isDue: YES,
       childViews: [
 
         //view1
-        SC.DropDownMenu.extend({
+        SC.SelectButtonView.extend({
           objects: ["To","Back", "You"],
           disableSort: NO
         }),
 
         //view2
-        SC.DropDownMenu.extend({
+        SC.SelectButtonView.extend({
           objects: ["Drop","Down", "Menu"]
         }),
 
         //view3
-        SC.DropDownMenu.extend({
+        SC.SelectButtonView.extend({
           objectsBinding: '*owner.objs',
           valueBinding: '*owner.selectedValue',
           isVisibleBinding: '*owner.isDue'
         }),
 
         //view4
-        SC.DropDownMenu.extend({
-          objectsBinding: '*owner.objs',
+        SC.SelectButtonView.extend({
+          objectsBinding: '*owner.objs2',
           valueBinding: '*owner.selectedValue',
           valueKey: 'title',
           nameKey: 'title',
@@ -91,10 +95,10 @@ test("Check if isVisibleBinding works", function() {
 });
 
 //test4
-test("DropDownMenu with objects", function() {
-  equals(3,view1.objects.length,'The number of options in dropDown Menu should be') ;
-  equals(null,view1.nameKey,'the dropDownMenu should not have any name key') ;
-  equals(null,view1.valueKey,'the dropDownMenu should not have any value key') ;
+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') ;
 });
 
 //test5

data/frameworks/sproutcore/frameworks/desktop/tests/panes/{dropDown → select_button}/ui.js

@@ -12,49 +12,49 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 //control test pane
 var pane = SC.ControlTestPane.design()
      //sample1
-    .add("Basic", SC.DropDownMenu, {
+    .add("Basic", SC.SelectButtonView, {
        objects: ['None', 'Low', 'Medium', 'High']
     })
 
     //sample2
-    .add("Disabled", SC.DropDownMenu, {
+    .add("Disabled", SC.SelectButtonView, {
        isEnabled: NO, objects: ['None', 'Low', 'Medium', 'High']
     })
 
     //sample3
-    .add("NotVisible", SC.DropDownMenu, {
+    .add("NotVisible", SC.SelectButtonView, {
       isVisible: NO, objects: ['None', 'Low', 'Medium', 'High']
     })
 
     //sample4
-    .add("SortedObjects", SC.DropDownMenu, {
+    .add("SortedObjects", SC.SelectButtonView, {
       objects:['None', 'Low', 'Medium', 'High']
     })
 
     //sample5
-    .add("UnsortedObjects", SC.DropDownMenu, {
+    .add("UnsortedObjects", SC.SelectButtonView, {
       objects:['None', 'Low', 'Medium', 'High'],
       disableSort: YES
     })
 
     //sample6
-    .add("redraw", SC.DropDownMenu, {
+    .add("redraw", SC.SelectButtonView, {
       layout: { width: '150', right: '0' }
     })
 
     //sample7
-    .add("DropDownWithIcon", SC.DropDownMenu, {
-      objects: [{ title: "None", icon: 'drop-down-icon' },
-        { title: "Low", icon: 'drop-down-icon' },
-        { title: "Medium", icon: 'drop-down-icon' },
-        { title: "High", icon: 'drop-down-icon' }],
+    .add("SelectButtonWithIcon", SC.SelectButtonView, {
+      objects: [{ title: "None", icon: 'select-button-icon' },
+        { title: "Low", icon: 'select-button-icon' },
+        { title: "Medium", icon: 'select-button-icon' },
+        { title: "High", icon: 'select-button-icon' }],
       nameKey: 'title',
       iconKey: 'icon',
       checkboxEnabled: YES
     })
 
     //sample8
-    .add("SortKey", SC.DropDownMenu, {
+    .add("SortKey", SC.SelectButtonView, {
       objects: [{ title: "None", pos: 3},
         { title: "Low", pos: 1},
         { title: "Medium", pos: 2 },
@@ -66,7 +66,7 @@ var pane = SC.ControlTestPane.design()
     })
 
     //sample9
-    .add("StaticLayout", SC.DropDownMenu, {
+    .add("StaticLayout", SC.SelectButtonView, {
       useStaticLayout: YES,
       objects:['None', 'Low', 'Medium', 'High'],
       layout: { width: '150', right: '0' }
@@ -78,17 +78,17 @@ var pane = SC.ControlTestPane.design()
 // TEST VIEWS
 //
 
-module('SC.DropDownMenu ui', pane.standardSetup()) ;
+module('SC.SelectButtonView ui', pane.standardSetup()) ;
 
 //test1
-test("Check the visiblity of the dropDowns", function() {
+test("Check the visiblity of the selectButtons", function() {
   ok(pane.view('Basic').get('isVisibleInWindow'), 'Basic.isVisibleInWindow should be YES') ;
   ok(pane.view('Disabled').get('isVisibleInWindow'), 'Disabled.isVisibleInWindow should be YES') ;
   ok(!pane.view('NotVisible').get('isVisibleInWindow'), 'NotVisible.isVisibleInWindow should be NO') ;
   ok(pane.view('SortedObjects').get('isVisibleInWindow'), 'SortedObjects.isVisibleInWindow should be YES') ;
   ok(pane.view('UnsortedObjects').get('isVisibleInWindow'), 'UnsortedObjects.isVisibleInWindow should be YES') ;
   ok(pane.view('redraw').get('isVisibleInWindow'), 'redraw.isVisibleInWindow should be YES') ;
-  ok(pane.view('DropDownWithIcon').get('isVisibleInWindow'), 'DropDownWithIcon.isVisibleInWindow should be YES') ;
+  ok(pane.view('SelectButtonWithIcon').get('isVisibleInWindow'), 'SelectButtonWithIcon.isVisibleInWindow should be YES') ;
   ok(pane.view('StaticLayout').get('isVisibleInWindow'), 'StaticLayout.isVisibleInWindow should be YES') ;
 }) ;
 
@@ -106,7 +106,7 @@ test("Basic", function() {
 
 //test3
 test("Disabled", function() {
-  view=pane.view('Disabled').$() ;
+  var view=pane.view('Disabled').$() ;
   ok(view.hasClass('disabled'), 'hasClass(disabled) should be YES') ;
   ok(view.hasClass('sc-view'), 'hasClass(sc-view) should be YES') ;
   ok(view.hasClass('sc-button-view'), 'hasClass(sc-button-view) should be YES') ;
@@ -118,7 +118,7 @@ test("Disabled", function() {
 
 //test4
 test("NotVisible", function() {
-  view=pane.view('NotVisible').$();
+  var view=pane.view('NotVisible').$();
   ok(view.hasClass('sc-view'), 'hasClass(sc-view) should be YES') ;
   ok(view.hasClass('sc-button-view'), 'hasClass(sc-button-view) should be YES') ;
   ok(view.hasClass('sc-regular-size'), 'hasClass(sc-regular-size) should be YES') ;
@@ -157,7 +157,7 @@ test("UnsortedObjects", function() {
 
 //test7
 test("redraw", function() {
-  view=pane.view('redraw');
+  var view=pane.view('redraw');
   ok(view.$().hasClass('sc-view'), 'hasClass(sc-view) should be YES') ;
   ok(view.$().hasClass('sc-button-view'), 'hasClass(sc-button-view) should be YES') ;
   ok(view.$().hasClass('sc-regular-size'), 'hasClass(sc-regular-size) should be YES') ;
@@ -174,8 +174,8 @@ test("redraw", function() {
 }) ;
 
 //test8
-test("DropDownWithIcon", function() {
-  view=pane.view('DropDownWithIcon').$();
+test("SelectButtonWithIcon", function() {
+  var view=pane.view('SelectButtonWithIcon').$();
   ok(view.hasClass('icon'), 'hasClass(Icon) should be YES') ;
   ok(view.hasClass('sc-view'), 'hasClass(sc-view) should be YES') ;
   ok(view.hasClass('sc-button-view'), 'hasClass(sc-button-view) should be YES') ;
@@ -187,7 +187,7 @@ test("DropDownWithIcon", function() {
 
 //test9
 test("Check if the objects are sorted based on sortKey", function() {
-  view=pane.view('SortKey');
+  var view=pane.view('SortKey');
   equals('None',view.get('objects')[2].title, 'Third object should be "None" ') ;
 }) ;
 

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;
 
 module("SC.ButtonView#actions", {
 	setup: function() {

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

@@ -103,7 +103,6 @@ test("clicking on the checkbox will change toggle the value", function() {
 test("pressing mouseDown and then mouseUp anywhere in the checkbox 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');
   ok(view.get('value'), 'value should not change yet');

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

@@ -41,7 +41,7 @@ test("canDeleteContent", function() {
   view.set('canDeleteContent', YES);
   equals(view.deleteSelection(), YES, 'should return YES if allowed');
   equals(content.get('length'), afterLen, 'content.length should change');
-  equals(view.get('selection').get('length'), 0, 'should have empty selection');
+  equals(view.get('selection').indexSetForSource(content).get('min'), 3, 'should select an adjacent item');
 });
 
 test("empty selection case", function() {

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

@@ -27,7 +27,7 @@ module("SC.CollectionView.deselect", {
 // BASIC OPERATIONS
 // 
 
-test("delect(indexes=Number)", function() {
+test("deselect(indexes=Number)", function() {
   var expected = SC.SelectionSet.create().add(content,4,4).remove(content,6),
       actual ;
       
@@ -38,7 +38,7 @@ test("delect(indexes=Number)", function() {
 });
 
 
-test("delect(indexes=IndexSet)", function() {
+test("deselect(indexes=IndexSet)", function() {
   var actual, expected = SC.SelectionSet.create()
                                 .add(content,4,4).remove(content,6,2);
       
@@ -49,7 +49,7 @@ test("delect(indexes=IndexSet)", function() {
 });
 
 
-test("delect() with empty selection", function() {
+test("deselect() with empty selection", function() {
   var expected = SC.SelectionSet.create(),
       actual ;
 
@@ -195,5 +195,21 @@ test("del.collectionViewSelectionForProposedSelection - returns null", function(
   
 });
 
+// ..........................................................
+// SPECIAL CASES
+// 
+
+test("deselecting a range should remove individual objects in range also", function() {
+
+  var obj = content.objectAt(1);
+  var expected = SC.SelectionSet.create().add(content, 5,3),
+      actual;
+
+  sel.addObject(obj);
+  view.deselect(SC.IndexSet.create(0,5));
+
+  actual = view.get('selection');
+  ok(expected.isEqual(actual), 'should remove content[1] from selection (expected: %@ actual: %@)'.fmt(expected, actual));
+});
 
 

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

@@ -269,7 +269,7 @@ test("after making an item visible then invisible again", function() {
   });
   equals(view.get('childViews').length, 0, 'precond - should have no childview');
 
-  var itemView = view.itemViewForContentIndex(1);
+  itemView = view.itemViewForContentIndex(1);
   equals(itemView.get('parentView'), view, 'itemView has parent view');