sproutcore 1.11.0.rc3 → 1.11.0

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/writeAttribute.js

@@ -77,7 +77,7 @@ test("raises exception if you try to write an attribute before an attribute hash
   try {
     foo.writeAttribute("foo", "bar");
   } catch(e) {
-    equals(e, SC.Record.BAD_STATE_ERROR, 'should throw BAD_STATE_ERROR');
+    equals(e.message, SC.Record.BAD_STATE_ERROR.toString(), 'should throw BAD_STATE_ERROR');
     cnt++;
   }
   equals(cnt, 1, 'should raise exception');

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_dataSourceCallbacks.js

@@ -163,7 +163,7 @@ test("Confirm that dataSourceDidCancel switched the records to the right states"
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
   store.dataSourceDidCancel(storeKey2);
@@ -196,7 +196,7 @@ test("Confirm that dataSourceDidCancel switched the records to the right states"
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
 });
@@ -210,7 +210,7 @@ test("Confirm that dataSourceDidComplete switched the records to the right state
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
   try{
@@ -219,7 +219,7 @@ test("Confirm that dataSourceDidComplete switched the records to the right state
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
   store.dataSourceDidComplete(storeKey11);
@@ -237,7 +237,7 @@ test("Confirm that dataSourceDidDestroy switched the records to the right states
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
   store.dataSourceDidDestroy(storeKey13);
@@ -255,7 +255,7 @@ test("Confirm that dataSourceDidError switched the records to the right states",
   }catch(error){
     msg = error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg,
     "should throw the following error ");
 
   store.dataSourceDidError(storeKey15, SC.Record.BAD_STATE_ERROR);

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitChangesFromNestedStore.js

@@ -118,7 +118,7 @@ function createConflict(force) {
   try {
     child.commitChanges(force);
   } catch(e) {
-    equals(e, SC.Store.CHAIN_CONFLICT_ERROR, 'should throw CHAIN_CONFLICT_ERROR');
+    equals(e.message, SC.Store.CHAIN_CONFLICT_ERROR.toString(), 'should throw CHAIN_CONFLICT_ERROR');
     errorCount++;
   }
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitRecord.js

@@ -156,7 +156,7 @@ test("Confirm that all the states are switched as expected after running commitR
     throwError=true;
     msg=error.message;
   }
-  equals(msg, SC.Record.NOT_FOUND_ERROR.message, "commitRecord should throw the following error");
+  equals(msg, SC.Record.NOT_FOUND_ERROR.toString(), "commitRecord should throw the following error");
 
   store.commitRecord(undefined, undefined, storeKey7);
   status = store.readStatus( storeKey7);

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/dataSourceCallbacks.js

@@ -161,7 +161,7 @@ test("Confirm that dataSourceDidCancel switched the records to the right states"
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
   store.dataSourceDidCancel(storeKey2);
@@ -194,7 +194,7 @@ test("Confirm that dataSourceDidCancel switched the records to the right states"
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
 });
@@ -208,7 +208,7 @@ test("Confirm that dataSourceDidComplete switched the records to the right state
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
   try{
@@ -217,7 +217,7 @@ test("Confirm that dataSourceDidComplete switched the records to the right state
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
   store.dataSourceDidComplete(storeKey11);
@@ -258,8 +258,8 @@ test("Confirm that dataSourceDidDestroy switched the records to the right states
     msg='';
   }catch(error){
     msg=error.message;
-  }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  }  
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
   store.dataSourceDidDestroy(storeKey13);
@@ -277,7 +277,7 @@ test("Confirm that dataSourceDidError switched the records to the right states",
   }catch(error){
     msg = error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg,
+  equals(SC.Record.BAD_STATE_ERROR.toString(), msg, 
     "should throw the following error ");
 
   store.dataSourceDidError(storeKey15, SC.Record.BAD_STATE_ERROR);

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/destroyRecord.js

@@ -86,7 +86,7 @@ test("Check for different states after/before executing destroyRecord", function
   }catch(error1){
     msg=error1.message;
   }
-  equals(msg, SC.Record.NOT_FOUND_ERROR.message, "destroyRecord should throw the following error");
+  equals(msg, SC.Record.NOT_FOUND_ERROR.toString(), "destroyRecord should throw the following error");
 
   try{
     store.destroyRecord(undefined, undefined, storeKey4);
@@ -94,7 +94,7 @@ test("Check for different states after/before executing destroyRecord", function
   }catch(error2){
     msg=error2.message;
   }
-  equals(msg, SC.Record.BUSY_ERROR.message, "destroyRecord should throw the following error");
+  equals(msg, SC.Record.BUSY_ERROR.toString(), "destroyRecord should throw the following error");
 
   store.destroyRecord(undefined, undefined, storeKey5);
   status = store.readStatus(storeKey5);

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/recordDidChange.js

@@ -56,13 +56,13 @@ test("recordDidChange", function() {
   try{
     store.recordDidChange(undefined, undefined, storeKey1);
   }catch(error1){
-    equals(SC.Record.BUSY_ERROR.message, error1.message, "the status shouldn't have changed.");
+    equals(SC.Record.BUSY_ERROR.toString(), error1.message, "the status shouldn't have changed.");
   }
   
   try{
     store.recordDidChange(undefined, undefined, storeKey2);
   }catch(error2){
-    equals(SC.Record.NOT_FOUND_ERROR.message, error2.message, "the status shouldn't have changed.");
+    equals(SC.Record.NOT_FOUND_ERROR.toString(), error2.message, "the status shouldn't have changed.");
   }
   
   store.recordDidChange(undefined, undefined, storeKey3);

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/retrieveRecord.js

@@ -119,7 +119,7 @@ function testStates(canLoad) {
   }catch(error1){
     msg=error1.message;
   }
-  equals(msg, SC.Record.BUSY_ERROR.message, "should throw error");
+  equals(msg, SC.Record.BUSY_ERROR.toString(), "should throw error");
 
   try{
     store.retrieveRecord(undefined, undefined, storeKey5, YES);
@@ -127,7 +127,7 @@ function testStates(canLoad) {
   }catch(error2){
     msg=error2.message;
   }
-  equals(msg, SC.Record.BUSY_ERROR.message, "should throw error");
+  equals(msg, SC.Record.BUSY_ERROR.toString(), "should throw error");
   
   try{
     store.retrieveRecord(undefined, undefined, storeKey6, YES);
@@ -135,7 +135,7 @@ function testStates(canLoad) {
   }catch(error3){
     msg=error3.message;
   }
-  equals(msg, SC.Record.BUSY_ERROR.message, "should throw error");
+  equals(msg, SC.Record.BUSY_ERROR.toString(), "should throw error");
 
   try{
     store.retrieveRecord(undefined, undefined, storeKey7, YES);
@@ -143,7 +143,7 @@ function testStates(canLoad) {
   }catch(error4){
     msg=error4.message;
   }
-  equals(msg, SC.Record.BAD_STATE_ERROR.message, "should throw error");
+  equals(msg, SC.Record.BAD_STATE_ERROR.toString(), "should throw error");
 
 
   store.retrieveRecord(undefined, undefined, storeKey8, YES);

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js

@@ -12,7 +12,7 @@
   @constant
   @type Error
 */
-SC.SCANNER_OUT_OF_BOUNDS_ERROR = new Error("Out of bounds.");
+SC.SCANNER_OUT_OF_BOUNDS_ERROR = SC.$error("Out of bounds.");
 
 /**
   Standard error thrown by `SC.Scanner` when  you pass a value not an integer.
@@ -21,7 +21,7 @@ SC.SCANNER_OUT_OF_BOUNDS_ERROR = new Error("Out of bounds.");
   @constant
   @type Error
 */
-SC.SCANNER_INT_ERROR = new Error("Not an int.");
+SC.SCANNER_INT_ERROR = SC.$error("Not an int.");
 
 /**
   Standard error thrown by `SC.SCanner` when it cannot find a string to skip.
@@ -30,7 +30,7 @@ SC.SCANNER_INT_ERROR = new Error("Not an int.");
   @constant
   @type Error
 */
-SC.SCANNER_SKIP_ERROR = new Error("Did not find the string to skip.");
+SC.SCANNER_SKIP_ERROR = SC.$error("Did not find the string to skip.");
 
 /**
   Standard error thrown by `SC.Scanner` when it can any kind a string in the
@@ -40,7 +40,7 @@ SC.SCANNER_SKIP_ERROR = new Error("Did not find the string to skip.");
   @constant
   @type Error
 */
-SC.SCANNER_SCAN_ARRAY_ERROR = new Error("Did not find any string of the given array to scan.");
+SC.SCANNER_SCAN_ARRAY_ERROR = SC.$error("Did not find any string of the given array to scan.");
 
 /**
   Standard error thrown when trying to compare two dates in different
@@ -50,7 +50,7 @@ SC.SCANNER_SCAN_ARRAY_ERROR = new Error("Did not find any string of the given ar
   @constant
   @type Error
 */
-SC.DATETIME_COMPAREDATE_TIMEZONE_ERROR = new Error("Can't compare the dates of two DateTimes that don't have the same timezone.");
+SC.DATETIME_COMPAREDATE_TIMEZONE_ERROR = SC.$error("Can't compare the dates of two DateTimes that don't have the same timezone.");
 
 /**
   Standard ISO8601 date format
@@ -106,7 +106,7 @@ SC.Scanner = SC.Object.extend(
     @returns {String} The characters
   */
   scan: function(len) {
-    if (this.scanLocation + len > this.length) throw SC.SCANNER_OUT_OF_BOUNDS_ERROR;
+    if (this.scanLocation + len > this.length) SC.SCANNER_OUT_OF_BOUNDS_ERROR.throw();
     var str = this.string.substr(this.scanLocation, len);
     this.scanLocation += len;
     return str;
@@ -125,7 +125,7 @@ SC.Scanner = SC.Object.extend(
     var str = this.scan(max_len);
     var re = new RegExp("^\\d{" + min_len + "," + max_len + "}");
     var match = str.match(re);
-    if (!match) throw SC.SCANNER_INT_ERROR;
+    if (!match) SC.SCANNER_INT_ERROR.throw();
     if (match[0].length < max_len) {
       this.scanLocation += match[0].length - max_len;
     }
@@ -140,7 +140,7 @@ SC.Scanner = SC.Object.extend(
     @returns {Boolean} YES if the given string was successfully scanned, NO otherwise
   */
   skipString: function(str) {
-    if (this.scan(str.length) !== str) throw SC.SCANNER_SKIP_ERROR;
+    if (this.scan(str.length) !== str) SC.SCANNER_SKIP_ERROR.throw();
     return YES;
   },
 
@@ -158,7 +158,7 @@ SC.Scanner = SC.Object.extend(
       }
       this.scanLocation -= ary[i].length;
     }
-    throw SC.SCANNER_SCAN_ARRAY_ERROR;
+    SC.SCANNER_SCAN_ARRAY_ERROR.throw();
   }
 
 });
@@ -1227,7 +1227,7 @@ SC.DateTime.mixin(SC.Comparable,
   */
   compareDate: function(a, b) {
     if (SC.none(a) || SC.none(b)) throw new Error("You must pass two valid dates to compareDate()");
-    if (a.get('timezone') !== b.get('timezone')) throw SC.DATETIME_COMPAREDATE_TIMEZONE_ERROR;
+    if (a.get('timezone') !== b.get('timezone')) SC.DATETIME_COMPAREDATE_TIMEZONE_ERROR.throw();
     var ma = a.adjust({hour: 0}).get('milliseconds');
     var mb = b.adjust({hour: 0}).get('milliseconds');
     return ma < mb ? -1 : ma === mb ? 0 : 1;
@@ -1273,7 +1273,7 @@ SC.DateTime.mixin(SC.Comparable,
       divider = 6048e5; // week: 1000 * 60 * 60 * 24 * 7
       break;
     default:
-      throw format + " is not supported";
+      throw new Error(format + " is not supported");
     }
 
     var ret = diff/divider;

data/lib/frameworks/sproutcore/frameworks/designer/coders/object.js

@@ -309,7 +309,7 @@ SC.ObjectCoder = SC.Object.extend({
   begin: function(object) {
     var methodName = this.get('encodeMethodName');
     if (SC.typeOf(object[methodName]) !== SC.T_FUNCTION) {
-      throw SC.$error("Cannot encode %@ because it does not respond to %@()".fmt(object, methodName)) ;
+      SC.throw("Cannot encode %@ because it does not respond to %@()".fmt(object, methodName));
     } 
     
     // save className for later coding

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

@@ -557,7 +557,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @returns {SC.View} receiver
   */
   createChildViews: function () {
-    var scroll, menuView, menuItemViews;
+    var scroll, menuView;
 
     // Create the menu items collection view.
     // TODO: Should this not be an SC.ListView?
@@ -1273,3 +1273,32 @@ SC._menu_fetchItem = function (k) {
   if (!k) return null;
   return this.get ? this.get(k) : this[k];
 };
+
+
+/**
+  Default metrics for the different control sizes.
+*/
+SC.MenuPane.TINY_MENU_ITEM_HEIGHT = 10;
+// SC.MenuPane.TINY_MENU_ITEM_SEPARATOR_HEIGHT = 2;
+// SC.MenuPane.TINY_MENU_HEIGHT_PADDING = 2;
+// SC.MenuPane.TINY_SUBMENU_OFFSET_X = 0;
+
+SC.MenuPane.SMALL_MENU_ITEM_HEIGHT = 16;
+// SC.MenuPane.SMALL_MENU_ITEM_SEPARATOR_HEIGHT = 7;
+// SC.MenuPane.SMALL_MENU_HEIGHT_PADDING = 4;
+// SC.MenuPane.SMALL_SUBMENU_OFFSET_X = 2;
+
+SC.MenuPane.REGULAR_MENU_ITEM_HEIGHT = 22;
+// SC.MenuPane.REGULAR_MENU_ITEM_SEPARATOR_HEIGHT = 9;
+// SC.MenuPane.REGULAR_MENU_HEIGHT_PADDING = 6;
+// SC.MenuPane.REGULAR_SUBMENU_OFFSET_X = 2;
+
+SC.MenuPane.LARGE_MENU_ITEM_HEIGHT = 31;
+// SC.MenuPane.LARGE_MENU_ITEM_SEPARATOR_HEIGHT = 20;
+// SC.MenuPane.LARGE_MENU_HEIGHT_PADDING = 0;
+// SC.MenuPane.LARGE_SUBMENU_OFFSET_X = 4;
+
+SC.MenuPane.HUGE_MENU_ITEM_HEIGHT = 20;
+// SC.MenuPane.HUGE_MENU_ITEM_SEPARATOR_HEIGHT = 9;
+// SC.MenuPane.HUGE_MENU_HEIGHT_PADDING = 0;
+// SC.MenuPane.HUGE_SUBMENU_OFFSET_X = 0;

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

@@ -309,7 +309,7 @@ SC.PickerPane = SC.PalettePane.extend(
       // Throw an error if a null or empty value is set. You're not allowed to go anchorless.
       // (TODO: why can't we go anchorless? positionPane happily centers an unmoored pane.)
       if (!value) {
-        throw "You must set 'anchorElement' to either a view or a DOM element";
+        SC.throw("You must set 'anchorElement' to either a view or a DOM element");
       }
 
       // Clean up any previous anchor elements.
@@ -641,11 +641,22 @@ SC.PickerPane = SC.PalettePane.extend(
 
       frame = this.fitPositionToScreen(origin, frame, anchor);
 
+      // Create an adjustment layout from the computed position.
       adjustHash = {
         left: frame.x,
         top: frame.y
       };
 
+      // If the computed position also constrains width or height, add it to the adjustment.
+      /*jshint eqnull:true*/
+      if (frame.width != null) {
+        adjustHash.width = frame.width;
+      }
+
+      if (frame.height != null) {
+        adjustHash.height = frame.height;
+      }
+
       /*
         Special case behavior for transitions that include scale or rotate: notably SC.View.SCALE_IN and SC.View.POP_IN.
 

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

@@ -100,7 +100,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
   },
 
   /** @private @see SC.ScrollView. When the content view's size changes, we need to update our scroll offset properties. */
-  _sc_contentViewSizeDidChangeUnfiltered: function () {
+  _sc_repositionContentViewUnfiltered: function () {
     var hasVerticalScroller = this.get('hasVerticalScroller'),
         // UNUSED. minimumVerticalScrollOffset = this.get('minimumVerticalScrollOffset'),
         maximumVerticalScrollOffset = this.get('maximumVerticalScrollOffset');
@@ -120,6 +120,8 @@ SC.MenuScrollView = SC.ScrollView.extend(
         this.setIfChanged('isVerticalScrollerVisible', contentHeight > containerHeight);
       }
     }
+
+    sc_super();
   },
 
   /** @private @see SC.ScrollView. Re-position the scrollers and content depending on the need to scroll or not. */
@@ -214,7 +216,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
         layout: { height: 0 },
 
         value: this.get('verticalScrollOffset'),
-        valueBinding: '.owner.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.
+        valueBinding: '.parentView.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.
         minimum: this.get('minimumVerticalScrollOffset'),
         maximum: this.get('maximumVerticalScrollOffset')
       });
@@ -242,7 +244,7 @@ SC.MenuScrollView = SC.ScrollView.extend(
         layout: { bottom: 0, height: 0 },
 
         value: this.get('verticalScrollOffset'),
-        valueBinding: '.owner.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.
+        valueBinding: '.parentView.verticalScrollOffset', // Bind the value of the scroller to our vertical offset.
         minimum: this.get('minimumVerticalScrollOffset'),
         maximum: this.get('maximumVerticalScrollOffset')
       });

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

@@ -87,12 +87,6 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
     }
   },
 
-  /** @private */
-  willDestroyLayer: function () {
-    var callback = this._sc_scroller_scrollDidChange;
-    SC.Event.remove(this.$(), 'scroll', this, callback);
-  },
-
   /** @private */
   mouseEntered: function (evt) {
     this.set('isMouseOver', YES);
@@ -104,36 +98,6 @@ SC.MenuScrollerView = SC.ScrollerView.extend(
     this.set('isMouseOver', NO);
   },
 
-  /** @private */
-  _sc_scroller_armScrollTimer: function () {
-    if (!this._sc_scrollTimer) {
-      SC.run(function () {
-        var method = this._sc_scroller_scrollDidChange;
-        this._sc_scrollTimer = this.invokeLater(method, 50);
-      });
-    }
-  },
-
-  /** @private */
-  _sc_scroller_scrollDidChange: function () {
-    var now = Date.now(),
-        last = this._sc_lastScroll,
-        layer = this.get('layer'),
-        scroll = 0;
-
-    if (last && (now - last) < 50) return this._sc_scroller_armScrollTimer();
-    this._sc_scrollTimer = null;
-    this._sc_lastScroll = now;
-
-    SC.run(function () {
-      if (!this.get('isEnabledInPane')) return; // nothing to do.
-
-      this._sc_scrollValue = scroll = layer.scrollTop;
-      this.set('value', scroll); // will now enforce minimum and maximum
-    });
-  },
-
-
   /** @private
     Scroll the menu if it is is an up or down arrow. This is called by
     the function that simulates mouseOver.