sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/selection_set.js

@@ -23,14 +23,14 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
   /**
     Walk like a duck.
 
-    @property {Boolean}
+    @type Boolean
   */
   isSelectionSet: YES,
 
   /**
     Total number of indexes in the selection set
 
-    @property {Number}
+    @type Number
   */
   length: function() {
     var ret     = 0,
@@ -49,7 +49,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     A set of all the source objects used in the selection set.  This
     property changes automatically as you add or remove index sets.
 
-    @property {SC.Array}
+    @type SC.Array
   */
   sources: function() {
     var ret  = [],
@@ -164,7 +164,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
     // normalize
     if (start === undefined && length === undefined) {
-      if (!source) throw "Must pass params to SC.SelectionSet.add()";
+      if (!source) throw new Error("Must pass params to SC.SelectionSet.add()");
       if (source.isIndexSet) return this.add(source.source, source);
       if (source.isSelectionSet) {
         sets = source._sets;
@@ -224,7 +224,7 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
 
     // normalize
     if (start === undefined && length === undefined) {
-      if (!source) throw "Must pass params to SC.SelectionSet.remove()";
+      if (!source) throw new Error("Must pass params to SC.SelectionSet.remove()");
       if (source.isIndexSet) return this.remove(source.source, source);
       if (source.isSelectionSet) {
         sets = source._sets;

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/sparse_array.js

@@ -51,7 +51,7 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     The length of the sparse array.  The delegate for the array should set
     this length.
 
-    @property {Number}
+    @type Number
   */
   length: function() {
     var del = this.delegate ;
@@ -92,7 +92,7 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     If this value is set to larger than 1, then the sparse array will always
     fit a requested index into a range of this size and request it.
 
-    @property {Number}
+    @type Number
   */
   rangeWindowSize: 1,
 
@@ -133,6 +133,8 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
   */
   objectAt: function(idx, omitMaterializing) {
     var content = this._sa_content, ret ;
+
+    if (idx >= this.get('length')) return undefined;
     if (!content) content = this._sa_content = [] ;
     if ((ret = content[idx]) === undefined) {
       if(!omitMaterializing) this.requestIndex(idx);
@@ -317,15 +319,15 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
     var c, ret, del = this.delegate ;
     if (del && del.sparseArrayDidRequestIndexOf) {
       ret = del.sparseArrayDidRequestIndexOf(this, obj);
-    } 
-    
+    }
+
     if (SC.none(ret)) {
       c = this._sa_content ;
       if (!c) c = this._sa_content = [] ;
       ret = c.indexOf(obj) ;
     }
     return ret;
-  },  
+  },
 
   // ..........................................................
   // EDITING
@@ -368,15 +370,15 @@ SC.SparseArray = SC.Object.extend(SC.Observable, SC.Enumerable, SC.Array,
       this._length += delta;
       this.propertyDidChange('length');
     }
-    
+
     // Both arrayContentDidChange and enumerableContentDidChange will invoke
-    // "this.notifyPropertyChange('[]')". To prevent multiple notifications 
+    // "this.notifyPropertyChange('[]')". To prevent multiple notifications
     // these calls are made as grouped property changes.
     this.beginPropertyChanges();
     this.arrayContentDidChange(idx, amt, len) ;
     this.enumerableContentDidChange(idx, amt, delta) ;
     this.endPropertyChanges();
-    
+
     return this ;
   },
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/theme.js

@@ -56,7 +56,7 @@ SC.Theme = {
     These class names include the name of the theme and the names
     of all parent themes. You can also add your own.
    */
-  classNames: SC.CoreSet.create(),
+  classNames: [],
 
   /**
     @private
@@ -69,14 +69,35 @@ SC.Theme = {
     if (classNames) {
       if (SC.typeOf(classNames) === SC.T_HASH && !classNames.isSet) {
         for (var className in classNames) {
-          if (classNames[className]) this.classNames.add(className);
-          else this.classNames.remove(className);
+          var index = this.classNames.indexOf(className);
+          if (classNames[className] && index < 0) {
+            this.classNames.push(className)
+          } else if (index >= 0) {
+            this.classNames.removeAt(index);
+          }
         }
-      } else if (typeof classNames === "string") {
-        this.classNames.addEach(classNames.split(' '));
       } else {
-        // it must be an array or another CoreSet... same difference.
-        this.classNames.addEach(classNames);
+        if (typeof classNames === "string") {
+          //@if(debug)
+          // There is no reason to support classNames as a String, it's just extra cases to have to support and makes for inconsistent code style.
+          SC.warn("Developer Warning: The classNames of a Theme should be an Array.");
+          //@endif
+          classNames = classNames.split(' ');
+        }
+
+        //@if(debug)
+        // There is no reason to support classNames as a Set, it's just extra cases to have to support and makes for inconsistent code style.
+        if (classNames.isSet) {
+          SC.warn("Developer Warning: The classNames of a Theme should be an Array.");
+        }
+        //@endif
+
+        // it must be an array or a CoreSet...
+        classNames.forEach(function (className) {
+          if (!this.classNames.contains(className)) {
+            this.classNames.push(className)
+          }
+        }, this);
       }
     }
   },
@@ -123,7 +144,7 @@ SC.Theme = {
     } else {
       result.themes = SC.beget(this.themes);
     }
-    
+
     // we also have private ("invisible") child themes; look at invisibleSubtheme
     // method.
     result._privateThemes = {};
@@ -141,7 +162,7 @@ SC.Theme = {
       result._extend_self(args[idx]);
     }
 
-    if (result.name) result.classNames.add(result.name);
+    if (result.name && !result.classNames.contains(result.name)) result.classNames.push(result.name);
 
     return result;
   },
@@ -160,21 +181,21 @@ SC.Theme = {
     // and return the theme class
     return t;
   },
-  
+
   /**
     Semi-private, only used by SC.View to create "invisible" subthemes. You
     should never need to call this directly, nor even worry about.
-    
+
     Invisible subthemes are only available when find is called _on this theme_;
     if find() is called on a child theme, it will _not_ locate this theme.
-    
+
     The reason for "invisible" subthemes is that SC.View will create a subtheme
-    when it finds a theme name that doesn't exist. For example, imagine that you 
+    when it finds a theme name that doesn't exist. For example, imagine that you
     have a parent view with theme "base", and a child view with theme "popup".
     If no "popup" theme can be found inside "base", SC.View will call
     base.subtheme. This will create a new theme with the name "popup",
     derived from "base". Everyone is happy.
-    
+
     But what happens if you then change the parent theme to "ace"? The view
     will try again to find "popup", and it will find it-- but it will still be
     a child theme of "base"; SC.View _needs_ to re-subtheme it, but it won't
@@ -186,11 +207,11 @@ SC.Theme = {
 
     // add to our set of themes
     this._privateThemes[name] = t;
-    
+
     // and return the theme class
     return t;
   },
-  
+
   //
   // THEME MANAGEMENT
   //

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/timer.js

@@ -143,7 +143,7 @@ SC.Timer = SC.Object.extend(
     want to leave this set, but if you plan to use bindings or observers with
     this timer, then you must set isPooled to NO to avoid reusing your timer.
 
-    @property {Boolean}
+    @type Boolean
   */
   isPooled: NO,
 
@@ -243,7 +243,7 @@ SC.Timer = SC.Object.extend(
     property resets each time the timer fires.  Returns -1 if the timer
     cannot fire again.
 
-    @property {Time}
+    @type Time
   */
   fireTime: function() {
     if (!this.get('isValid')) { return -1 ; }  // not valid - can't fire
@@ -319,10 +319,10 @@ SC.Timer = SC.Object.extend(
   invalidate: function() {
     this.beginPropertyChanges();
     this.set('isValid', NO);
-    
+
     var runLoop = SC.RunLoop.currentRunLoop;
     if(runLoop) runLoop.cancelTimer(this);
-    
+
     this.action = this.target = null ; // avoid memory leaks
     this.endPropertyChanges();
 
@@ -381,7 +381,7 @@ SC.Timer = SC.Object.extend(
         if (action && SC.typeOf(action) == SC.T_FUNCTION) {
           action.call(target, this) ;
         } else {
-          throw '%@: Timer could not find a function at %@'.fmt(this, this.action) ;
+          throw new Error('%@: Timer could not find a function at %@'.fmt(this, this.action));
         }
 
       // otherwise, try to execute action direction on target or send down

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/utils/rect.js

@@ -96,7 +96,7 @@ SC.mixin( /** @scope SC */ {
       return "(null)";
     }
     else {
-      return '{x:'+r.x+', y:'+r.y+', width:'+r.width+', height:'+r.height+'}';
+      return '{ x:'+r.x+', y:'+r.y+', width:'+r.width+', height:'+r.height+' }';
     }
   }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js

@@ -168,6 +168,21 @@ test("arrangedObjects", function() {
   equals(controller.get("arrangedObjects"), controller, 'c.arrangedObjects should return receiver');
 });
 
+
+test("The computed properties firstObject, firstSelectableObject & lastObject should update when content changes.", function(){
+  equals(controller.get('firstObject'), content[0], 'first object should be the first object in content');
+  equals(controller.get('firstSelectableObject'), content[0], 'first selectable object should be the first object in content');
+  equals(controller.get('lastObject'), content[4], 'lastObject should be the last object in content');
+
+  // Reorder the content
+  var newObject = TestObject.create({ title: "BLAH" });
+  controller.set('content', [newObject]);
+
+  equals(controller.get('firstObject'), newObject, 'first object should be the new first object in content');
+  equals(controller.get('firstSelectableObject'), newObject, 'first selectable object should be the new first object in content');
+  equals(controller.get('lastObject'), newObject, 'lastObject should be the new last object in content');
+});
+
 test("array orderBy using String", function(){
   var testController = SC.ArrayController.create({
     content: content,

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/selection_support.js

@@ -342,3 +342,24 @@ test("replacing content in an ArrayController propagates changes to bound arrang
   equals(obj.getPath('list.length'), 0, "binding has 0 items");
   equals(listChanged, 1, "listDidChange was called");
 });
+
+/**
+  There was a bug that when the content swapped out of an ArrayController with allowsEmptySelection
+  set to false, the selection would remain as the first object from the last content.
+  This was due to the firstObject (and lastObject) not being updated properly.
+*/
+test("SC.ArrayController(SC.SelectionSupport) selection updates properly when allowsEmptySelection is false and the content changes",
+function() {
+  var firstSelectableObject,
+    newObject = TestObject.create({
+        title: 'New Object'
+      });
+
+  // Disable allowing empty selection
+  controller.set('allowsEmptySelection', NO);
+  ok(controller.get('selection').containsObject(content[0]), 'selection should be the first original content object');
+
+  // Swap the content.
+  controller.set('content', [newObject]);
+  ok(controller.get('selection').containsObject(newObject), 'selection should be the first new content object');
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/cursor.js

@@ -0,0 +1,28 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*global module, test, htmlbody*/
+
+module("SC.Cursor", {
+  setup: function () {
+    htmlbody('<style title="wrong-style"></style>');
+  },
+
+  teardown: function () {
+    clearHtmlbody();
+  }
+});
+
+/**
+  There was a bug that if any additional style elements exist in the body
+  the cursor would create a stylesheet in the head, but then retrieve the
+  last stylesheet object which would be wrong.
+*/
+test("The cursor's stylesheet object should be the right object.", function () {
+  var actual = SC.Cursor.sharedStyleSheet(),
+    wrong;
+
+  wrong = document.styleSheets[document.styleSheets.length - 1];
+  ok(actual !== wrong, "The last stylesheet is not correct.");
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/platform.js

@@ -0,0 +1,18 @@
+// ==========================================================================
+// Project: SproutCore - JavaScript Application Framework
+// Copyright: ©2012 Michael Krotscheck and contributors. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+ * Test for correct cordova detection.
+ */
+test("SC.platform.cordova", function() {
+  
+  ok(typeof SC.platform.cordova == 'boolean', "Cordova check must have been executed.");
+  
+  // Is there a chance we're in a cordova runtime?
+  var isCordova = typeof window.cordova !== "undefined";
+  equals(isCordova, SC.platform.cordova, "Cordova detection must match what we've been able to determine for ourselves");
+  
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/end.js

@@ -22,9 +22,9 @@ test("should replace opening tag with string and add closing tag, leaving middle
   equals(context.get(2), "</div>", "closing tag");
 });
 
-test("should emit any CSS class names included in the tag opts.classNames array", function() {
-  context.classNames("foo bar".w()).end();
-  ok(context.get(0).match(/class=\"foo bar\"/), '<div> has class attr') ;
+test("should emit any CSS class names included in the tag opts.addClass array", function() {
+  context.addClass("foo bar".w()).end();
+  ok(context.get(0).match(/class=\"(?:bar|foo)\s*(?:foo|bar)\s*\"/), '<div> has classes foo bar') ;
 });
 
 test("should emit id in tag opts.id", function() {
@@ -33,34 +33,34 @@ test("should emit id in tag opts.id", function() {
 });
 
 test("should emit style in tag if opts.styles is defined", function() {
-  context.styles({ alpha: "beta", foo: "bar" }).end();
+  context.setStyle({ alpha: "beta", foo: "bar" }).end();
   ok(context.get(0).match(/style=\"alpha: beta; foo: bar; \"/), '<div> has style="alpha: beta; foo: bar; "');
 });
 
 test("should emit style with custom browser attributes", function() {
-  context.styles({ mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' }).end();
+  context.setStyle({ mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' }).end();
   ok(context.get(0).match('<div style="-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3; " >'),
                             '<div> has style="-moz-column-count: 3; -webkit-column-count: 3, -o-column-count: 3, -ms-column-count: 3; "');
 });
 
 test("should write arbitrary attrs has in opts", function() {
-  context.attr({ foo: "bar", bar: "baz" }).end();
+  context.setAttr({ foo: "bar", bar: "baz" }).end();
   ok(context.get(0).match(/foo=\"bar\"/), 'has foo="bar"');
   ok(context.get(0).match(/bar=\"baz\"/), 'has bar="baz"');
 });
 
-test("classNames should override attrs.class", function() {
-  context.classNames("foo".w()).attr({ "class": "bar" }).end();
+test("addClass should override attrs.class", function() {
+  context.addClass("foo".w()).setAttr({ "class": "bar" }).end();
   ok(context.get(0).match(/class=\"foo\"/), 'has class="foo"');
 });
 
 test("opts.id should override opts.attrs.id", function() {
-  context.id("foo").attr({ id: "bar" }).end();
+  context.id("foo").setAttr({ id: "bar" }).end();
   ok(context.get(0).match(/id=\"foo\"/), 'has id="foo"');
 });
 
 test("opts.styles should override opts.attrs.style", function() {
-  context.styles({ foo: "foo" }).attr({ style: "bar: bar" }).end();
+  context.setStyle({ foo: "foo" }).setAttr({ style: "bar: bar" }).end();
   ok(context.get(0).match(/style=\"foo: foo; \"/), 'has style="foo: foo; "');
 });
 
@@ -82,7 +82,7 @@ test("emits self closing tag if tag has no content and c._selfClosing !== NO", f
 
 test("emits two tags even if tag has no content if opts.selfClosing == NO", function() {
   context._selfClosing = NO;
-  
+
   context.end();
   equals(context.length, 2, "has two lines");
   equals(context.get(0), "<div>", "has opening tag");
@@ -97,15 +97,15 @@ test("does NOT emit self closing tag if it has content, even if opts.selfClosing
 });
 
 test("it should make sure to clear reused temporary attributes object", function() {
-  
+
   // generate one tag...
   context.begin('input')
     .id("foo")
-    .styles({ foo: "bar" })
-    .classNames("foo bar".w())
+    .setStyle({ foo: "bar" })
+    .addClass("foo bar".w())
     .push("line")
-  .end(); 
-  
+  .end();
+
   // generate second tag...will reuse internal temporary attrs object.
   context.begin('input').id("bar").end();
   var str = context.get(context.length-1);
@@ -116,7 +116,7 @@ test("it should work when nested more than one level deep", function() {
   context.begin().id("foo")
     .begin().id("bar").end()
   .end();
-  
+
   var str = context.join('');
   ok(str.match(/id="foo"/), 'has foo');
   ok(str.match(/id="bar"/), 'has bar');