sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js

@@ -463,8 +463,7 @@ SC.Benchmark = {
       title: SC.LabelView.extend({
         classNames: ['sc-benchmark-title'],
         layout: { left: 20, top: 23, right: 200, height: 30 },
-        value: ((appName) ? appName : 'SproutCore Application') + (' - Total Captured Time: ' + chartCapturedTime +' ms - Points Captured: ' + chartLen),
-        fontWeight: 'bold'
+        value: ((appName) ? appName : 'SproutCore Application') + (' - Total Captured Time: ' + chartCapturedTime +' ms - Points Captured: ' + chartLen)
       })
 
     }).append();
@@ -523,7 +522,7 @@ SC.Benchmark = {
 
   // ..........................................................
   // Internal Support
-  // 
+  //
 
   /** @private
     Loads data from both the browser's own event hash and SC's pre-load event hash.

data/lib/frameworks/sproutcore/frameworks/foundation/system/module.js

@@ -67,7 +67,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     // If we couldn't find anything in the SC.MODULE_INFO hash, we don't have any record of the
     // requested module.
     if (!module) {
-      throw "SC.Module: could not find module '%@'".fmt(moduleName) ;
+      throw new Error("SC.Module: could not find module '%@'".fmt(moduleName));
     }
 
     // If this module was in the middle of being prefetched, we now need to
@@ -226,7 +226,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     method = this._methodForMethodNameInTarget(methodName, target);
 
     if (!method) {
-      throw "SC.Module: could not find callback for lazily instantiated module '%@'".fmt(moduleName);
+      throw new Error("SC.Module: could not find callback for lazily instantiated module '%@'".fmt(moduleName));
     }
   },
 
@@ -284,6 +284,12 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
       if (url.length > 0) {
         if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Loading CSS file in '%@' -> '%@'", moduleName, url);
+
+        // if we are on a retina device lets load the retina style sheet instead
+        if (window.devicePixelRatio > 1 || window.location.search.indexOf("2x") > -1) {
+            url = url.replace('.css', '@2x.css')
+        }
+
         el = document.createElement('link') ;
         el.setAttribute('href', url) ;
         el.setAttribute('rel', "stylesheet") ;
@@ -368,7 +374,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       dependencyName = dependencies[idx];
       module = SC.MODULE_INFO[dependencyName];
 
-      if (!module) throw "SC.loadModule: Unable to find dependency %@ for module %@.".fmt(dependencyName, moduleName);
+      if (!module) throw new Error("SC.loadModule: Unable to find dependency %@ for module %@.".fmt(dependencyName, moduleName));
 
       if (!module.isReady) {
         return NO;
@@ -400,7 +406,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
         // Try to find dependent module in MODULE_INFO
         if (!requiredModule) {
-          throw "SC.Module: could not find required module '%@' for module '%@'".fmt(requiredModuleName, moduleName) ;
+          throw new Error("SC.Module: could not find required module '%@' for module '%@'".fmt(requiredModuleName, moduleName));
         } else {
 
           // Required module has been requested but hasn't loaded yet.
@@ -456,7 +462,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
           target = this._targetForTargetName(targetName);
           method = this._methodForMethodNameInTarget(methodName, target);
         } else {
-          throw "SC.Module: could not find callback for '%@'".fmt(moduleName);
+          throw new Error("SC.Module: could not find callback for '%@'".fmt(moduleName));
         }
       }
 

data/lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js

@@ -7,17 +7,17 @@
 
 /**
   @class
-  
+
   A simple object representing the selection inside a text field.  Each
   object is frozen and contains exactly three properties:
-  
+
     *  start
     *  end
     *  length
-  
+
   Important note:  In Internet Explorer, newlines in textarea elements are
   considered two characters.  SproutCore does not currently try to hide this from you.
-  
+
   @extends SC.Object
   @extends SC.Copyable
   @extends SC.Freezable
@@ -25,34 +25,34 @@
 */
 
 SC.TextSelection = SC.Object.extend(SC.Copyable, SC.Freezable,
-/** @scope SC.TextSelection.prototype */ {  
+/** @scope SC.TextSelection.prototype */ {
 
   /**
     The number of characters appearing to the left of the beginning of the
     selection, starting at 0.
-    
+
     @type {Number}
   */
   start: -1,
-  
-  
+
+
   /**
     The number of characters appearing to the left of the end of the
     selection.
 
     This will have the same value as 'start' if there is no selection and
     instead there is only a caret.
-    
+
     @type {Number}
   */
   end: -1,
- 
-   
+
+
   /**
     The length of the selection.  This is equivalent to (end - start) and
     exists mainly as a convenience.
-    
-    @property {Number}
+
+    @type Number
   */
   length: function() {
     var start = this.get('start') ;
@@ -64,27 +64,27 @@ SC.TextSelection = SC.Object.extend(SC.Copyable, SC.Freezable,
       return end - start ;
     }
   }.property('start', 'end').cacheable(),
-  
-  
-  
+
+
+
   // ..........................................................
   // INTERNAL SUPPORT
   //
-  
+
   init: function() {
     sc_super();
     this.freeze();
   },
-  
-  
+
+
   copy: function() {
     return SC.TextSelection.create({
       start: this.get('start'),
       end:   this.get('end')
     });
   },
-  
-  
+
+
   toString: function() {
     var length = this.get('length');
     if (length  &&  length > 0) {

data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js

@@ -29,6 +29,10 @@ SC.mixin( /** @scope SC */ {
       - minHeight: a minimum height
       - maxWidth: a maximum width
       - maxHeight: a maximum height
+      - rotateX
+      - rotateY
+      - rotateZ
+      - scale
 
     @param layout {Hash} The layout hash to stringify.
     @returns {String} A string representation of the layout hash.
@@ -40,7 +44,8 @@ SC.mixin( /** @scope SC */ {
     var keys = ['maxHeight', 'maxWidth', 'minHeight', 'minWidth', 'centerY',
                 'centerX', 'width', 'height', 'bottom', 'right', 'top',
                 'left', 'zIndex', 'opacity', 'border', 'borderLeft',
-                'borderRight', 'borderTop', 'borderBottom'],
+                'borderRight', 'borderTop', 'borderBottom', 'rotateX',
+                'rotateY', 'rotateZ', 'scale'],
         keyValues = [], key,
         i = keys.length;
     while (--i >= 0) {
@@ -50,7 +55,7 @@ SC.mixin( /** @scope SC */ {
       }
     }
 
-    return '{' + keyValues.join(', ') + '}';
+    return '{ ' + keyValues.join(', ') + ' }';
   },
 
   /**
@@ -214,7 +219,7 @@ SC.mixin( /** @scope SC */ {
     padding = 0;
 
     if (!element) {
-      throw "measureString requires a string measurement environment to be set up. Did you mean metricsForString?";
+      throw new Error("measureString requires a string measurement environment to be set up. Did you mean metricsForString?");
     }
 
     // since the string has already been escaped (if the user wants it to be),

data/lib/frameworks/sproutcore/frameworks/foundation/tests/controllers/tree/selection_support.js

@@ -41,13 +41,13 @@ module("Test SC.SelectionSupport mixin with TreeController.", {
         displayName: 'Vegetables',
         treeItemChildren: vegetables
       });
-      
+
     content = SC.Object.create(SC.TreeItemContent, {
       treeItemIsGrouped: YES,
       treeItemIsExpanded: YES,
       treeItemChildren: [fruitGroup, vegetableGroup]
     });
-    
+
     controller = SC.TreeController.create({
       treeItemIsGrouped: NO,
       content: content
@@ -79,7 +79,7 @@ function() {
   // Reorder the content
   // content.treeItemChildren.sort(function(a,b) { return b > a; });
   // controller.set('orderBy', 'DESC title');
-  // 
+  //
   // equals(controller.get('firstSelectableObject'), content.treeItemChildren[4], 'first selectable object should be the first object in arrangedObjects (changed order)');
 });
 
@@ -339,28 +339,53 @@ function() {
   ok(indexSet === null, 'selection set should not have an indexSet');
 });
 
+/**
+  Test that selection is cleared if the content is nulled.
+
+  There was a bug that setting the content of a tree controller to null would
+  throw an exception.
+*/
+test("SC.TreeController(SC.SelectionSupport) selection cleared if content is removed.",
+function() {
+  var newObject1, newObject2, selectionSet, source, indexSet;
+
+  // Select 3 items
+  controller.selectObjects([content.treeItemChildren[0].treeItemChildren[1], content.treeItemChildren[0].treeItemChildren[2], content.treeItemChildren[1].treeItemChildren[0]], NO);
+
+  selectionSet = controller.get('selection');
+  equals(selectionSet.get('length'), 3, 'selection set should length 1');
+  ok(selectionSet.containsObject(content.treeItemChildren[1].treeItemChildren[0]), 'selection should contain the first content object of the second group');
+
+  // Clear out the content of the tree controller.
+  controller.set('content', null);
+
+  // Selection should be empty.
+  selectionSet = controller.get('selection');
+  equals(selectionSet.get('length'), 0, 'selection set should have length 0');
+});
+
 test("SC.TreeController(SC.SelectionSupport) selection settings should persist between controller and tree item observer",
 function() {
   var treeItemObserver = controller.get('arrangedObjects');
-  
+
   SC.RunLoop.begin();
   controller.set('allowsSelection', YES);
   controller.set('allowsMultipleSelection', YES);
   controller.set('allowsEmptySelection', YES);
   SC.RunLoop.end();
-  
+
   equals(treeItemObserver.get('allowsSelection'), YES, 'allowsSelection on the treeItemObserver should be YES');
   equals(treeItemObserver.get('allowsMultipleSelection'), YES, 'allowsMultipleSelection on the treeItemObserver should be YES');
   equals(treeItemObserver.get('allowsEmptySelection'), YES, 'allowsEmptySelection on the treeItemObserver should be YES');
-  
+
   SC.RunLoop.begin();
   controller.set('allowsSelection', NO);
   controller.set('allowsMultipleSelection', NO);
   controller.set('allowsEmptySelection', NO);
   SC.RunLoop.end();
-  
+
   equals(treeItemObserver.get('allowsSelection'), NO, 'allowsSelection on the treeItemObserver should be NO');
   equals(treeItemObserver.get('allowsMultipleSelection'), NO, 'allowsMultipleSelection on the treeItemObserver should be NO');
   equals(treeItemObserver.get('allowsEmptySelection'), NO, 'allowsEmptySelection on the treeItemObserver should be NO');
-  
+
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/delegates/inline_text_field/inline_text_field.js

@@ -55,7 +55,6 @@ failEditor = SC.View.extend(SC.InlineEditor, {
   }
 });
 
-testPane.show();
 
 module("SC.InlineTextFieldDelegate basic", testPane.standardSetup());
 
@@ -65,10 +64,12 @@ test("basic acquire and release", function() {
 
   ok(editor.kindOf(SC.InlineTextFieldView), "acquired an inlineTextFieldView");
   same(editor.get('pane'), label.get('pane'), "editor created in the correct pane");
+  same(editor.get('parentView'), label.get('parentView'), "editor created in the correct parent");
 
   SC.InlineTextFieldDelegate.releaseEditor(editor);
 
   same(editor.get('pane'), null, "editor removed from pane after release");
+  same(editor.get('parentView'), null, "editor removed from parent view after release");
 });
 
 test("acquire custom editor", function() {

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js

@@ -28,12 +28,16 @@ module('ContentDisplay', {
 });
 
 test('should dirty layer when content changes', function () {
-  view.set('content', contentB);
+  SC.run(function () {
+    view.set('content', contentB);
+  });
   ok(view.get('layerNeedsUpdate'));
 });
 
 test('should dirty layer when any of contentDisplayProperties change', function () {
-  contentA.set('foo', 'newFoo');
+  SC.run(function () {
+    contentA.set('foo', 'newFoo');
+  });
   ok(view.get('layerNeedsUpdate'));
 });
 
@@ -46,7 +50,9 @@ test('should stop observing old content when content changes', function () {
 test('should begin observing new content when content changes', function () {
   view.set('content', contentB);
   view.set('layerNeedsUpdate', NO);
-  contentB.set('bar', 'newBar');
+  SC.run(function () {
+    contentB.set('bar', 'newBar');
+  });
   ok(view.get('layerNeedsUpdate'));
 });
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/control/displayProperties.js

@@ -9,11 +9,12 @@
 var view ;
 module("SC.Control#displayProperties", {
   setup: function() {
-    view = SC.View.create(SC.Control, { 
-        isVisibleInWindow: YES 
+    view = SC.View.create(SC.Control, {
+        isVisibleInWindow: YES
     }).createLayer();
+    view._doAttach(document.body);
   },
-  
+
   teardown: function() {
     view.destroy();
   }
@@ -39,7 +40,7 @@ test("setting isSelected to ON removes sel class name", function() {
   view.set('isSelected', YES);
   SC.RunLoop.end();
   ok(view.$().hasClass('sel'), 'precond - should have sel class');
-  
+
   SC.RunLoop.begin();
   view.set('isSelected', NO);
   SC.RunLoop.end();

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/flowed_layout/tests.js

@@ -171,11 +171,11 @@ var checkSteps = [
       }
 
       ok(
-        equal, 
-        "Actual: " + 
-        str(cv.get('layout')) + "; expected: " + 
+        equal,
+        "Actual: " +
+        str(cv.get('layout')) + "; expected: " +
         str(expect) + "; canWrap: " + view.get('canWrap') + "; " +
-        "orientation: " + view.get('layoutDirection') + "; " + 
+        "orientation: " + view.get('layoutDirection') + "; " +
         "layout: " + str(view.get('layout'))
       );
     }
@@ -218,6 +218,9 @@ test("Basic flow", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -247,6 +250,8 @@ test("Basic flow", function() {
   };
 
   checkPositions(view, expect);
+
+  view.destroy();
 });
 
 module("FlowedLayout -- Alignment");
@@ -269,6 +274,9 @@ test("Align center", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -310,6 +318,7 @@ test("Align center", function() {
   expect.noWrap['400'][2].left = 300;
 
   checkPositions(view, expect);
+  view.destroy();
 });
 
 test("Align right", function() {
@@ -331,6 +340,9 @@ test("Align right", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -372,6 +384,7 @@ test("Align right", function() {
   expect.noWrap['400'][2].left = 200;
 
   checkPositions(view, expect);
+  view.destroy();
 });
 
 test("Align justify", function() {
@@ -393,6 +406,9 @@ test("Align justify", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -436,6 +452,7 @@ test("Align justify", function() {
   expect.noWrap['600'][2].left = 400;
 
   checkPositions(view, expect);
+  view.destroy();
 });
 
 module("FlowedLayout - Flags");
@@ -459,6 +476,9 @@ test("flowPadding", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -518,6 +538,7 @@ test("flowPadding", function() {
 
   checkPositions(view, expect);
 
+  view.destroy();
 });
 
 test("FlowedLayout - defaultFlowSpacing", function() {
@@ -539,6 +560,9 @@ test("FlowedLayout - defaultFlowSpacing", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -590,6 +614,7 @@ test("FlowedLayout - defaultFlowSpacing", function() {
   expect.noWrap[600] = expect.noWrap[400] = expect.wrap[600];
 
   checkPositions(view, expect);
+  view.destroy();
 });
 
 module("FlowedLayout - Child View Flags");
@@ -641,6 +666,9 @@ test("startsNewRow", function() {
     }
   };
 
+  view._doRender();
+  view._doAttach(document.body);
+
   checkPositions(view, expect);
 
   SC.RunLoop.begin();
@@ -658,6 +686,7 @@ test("startsNewRow", function() {
 
   checkPositions(view, expect);
 
+  view.destroy();
 });
 
 test("flowSpacing", function() {
@@ -679,6 +708,9 @@ test("flowSpacing", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -727,6 +759,7 @@ test("flowSpacing", function() {
 
   checkPositions(view, expect);
 
+  view.destroy();
 });
 
 test("fillHeight", function() {
@@ -748,6 +781,9 @@ test("fillHeight", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -789,6 +825,7 @@ test("fillHeight", function() {
 
   checkPositions(view, expect);
 
+  view.destroy();
 });
 
 
@@ -811,6 +848,9 @@ test("isSpacer", function() {
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -856,6 +896,7 @@ test("isSpacer", function() {
 
   checkPositions(view, expect);
 
+  view.destroy();
 });
 
 test("undefined and null can be passed for both defaultFlowSpacing and child's flowSpacing", function() {
@@ -875,6 +916,9 @@ test("undefined and null can be passed for both defaultFlowSpacing and child's f
     })
   });
 
+  view._doRender();
+  view._doAttach(document.body);
+
   var expect = {
     wrap: {
       400: [
@@ -909,5 +953,6 @@ test("undefined and null can be passed for both defaultFlowSpacing and child's f
 
   checkPositions(view, expect);
 
+  view.destroy();
 });