sproutcore 1.0.1008 → 1.0.1009

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 0
-:patch: 1008
-:digest: 1f1bdc7c02d51c49bd6d5e2b07a0dd2b0a75150c
+:patch: 1009
+:digest: 88cb568a49aec110427db79f1e1249ca840b2a66

data/frameworks/sproutcore/README

@@ -25,7 +25,7 @@ Brian Cully
 Charles Jolley
 Chris Hyle
 Colin Campbell
-Cortlan Klien
+Cortlan Klein
 Erich Ocean
 Evin Grano
 Geoffrey Donaldson

data/frameworks/sproutcore/frameworks/datastore/system/record_array.js

@@ -446,7 +446,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
         changed.forEach(function(storeKey) {
           // get record - do not include EMPTY or DESTROYED records
           status = store.peekStatus(storeKey);
-          if (!(status & K.EMPTY) && !(status & K.DESTROYED)) {
+          if (!(status & K.EMPTY) && !((status & K.DESTROYED) || (status === K.BUSY_DESTROYING))) {
             rec = store.materializeRecord(storeKey);
             included = !!(rec && query.contains(rec));
           } else included = NO ;
@@ -490,7 +490,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       storeKeys = [];
       sourceKeys.forEach(function(storeKey) {
         status = store.peekStatus(storeKey);
-        if (!(status & K.EMPTY) && !(status & K.DESTROYED)) {
+        if (!(status & K.EMPTY) && !((status & K.DESTROYED) || (status === K.BUSY_DESTROYING))) {
           rec = store.materializeRecord(storeKey);
           if (rec && query.contains(rec)) storeKeys.push(storeKey);
         }

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

@@ -61,6 +61,24 @@ SC.ListView = SC.CollectionView.extend(
   classNames: ['sc-list-view'],
 
   acceptsFirstResponder: YES,
+  
+  /**
+  * If set to YES, the default theme will show alternating rows
+  * for the views this ListView created through exampleView property.
+  *
+  * @property {Boolean} 
+  */
+  showAlternatingRows: NO,
+  
+  // ..........................................................
+  // METHODS
+  //
+  
+  render: function(context, firstTime) {
+    context.setClass('alternating', this.get('showAlternatingRows'));
+    
+    return sc_super();
+  },
 
   // ..........................................................
   // COLLECTION ROW DELEGATE SUPPORT

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

@@ -127,6 +127,7 @@ SC.ListItemView = SC.View.extend(
   */
   contentIsBranchKey: null,
   
+
   /**
     YES if the item view is currently editing.
   */
@@ -152,9 +153,22 @@ SC.ListItemView = SC.View.extend(
   
   contentPropertyDidChange: function() {
     //if (this.get('isEditing')) this.discardEditing() ;
+    if (this.get('contentIsEditable') !== this.contentIsEditable()) {
+      this.notifyPropertyChange('contentIsEditable');
+    }
+    
     this.displayDidChange();
   },
   
+  /**
+    Determines if content is editable or not.  Checkboxes and other related
+    components will render disabled if an item is not editable.
+  */
+  contentIsEditable: function() {
+    var content = this.get('content');
+    return content && (content.get('isEditable')!==NO);
+  }.property('content').cacheable(),
+  
   /**
     Fills the passed html-array with strings that can be joined to form the
     innerHTML of the receiver element.  Also populates an array of classNames
@@ -171,6 +185,10 @@ SC.ListItemView = SC.View.extend(
         indent  = this.get('outlineIndent'),
         key, value, working ;
     
+    // add alternating row classes
+    context.addClass((this.get('contentIndex')%2 === 0) ? 'even' : 'odd');
+    context.setClass('disabled', !this.get('isEnabled'));
+
     // outline level wrapper
     working = context.begin("div").addClass("sc-outline");
     if (level>=0 && indent>0) working.addStyle("left", indent*(level+1));
@@ -282,8 +300,10 @@ SC.ListItemView = SC.View.extend(
     
     var key = (state === SC.MIXED_STATE) ? "mixed" : state ? "sel" : "nosel",
         cache = this._scli_checkboxHtml,
+        isEnabled = this.get('contentIsEditable') && this.get('isEnabled'),
         html, tmp;
         
+    if (!isEnabled) key = SC.keyFor('disabled', key);
     if (!cache) cache = this.constructor.prototype._scli_checkboxHtml = {};
     html = cache[key];
     
@@ -294,6 +314,9 @@ SC.ListItemView = SC.View.extend(
       // set state on html
       if (state === SC.MIXED_STATE) tmp.addClass('mixed');
       else tmp.setClass('sel', state);
+      
+      // disabled
+      tmp.setClass('disabled', !isEnabled);
 
       // now add inner content.  note we do not add a real checkbox because
       // we don't want to have to setup a change observer on it.
@@ -463,6 +486,11 @@ SC.ListItemView = SC.View.extend(
   button.
   */
   mouseDown: function(evt) {
+    
+    // if content is not editable, then always let collection view handle the
+    // event.
+    if (!this.get('contentIsEditable')) return NO ; 
+    
     // if occurred inside checkbox, item view should handle the event.
     if (this._isInsideCheckbox(evt)) {
       this._addCheckboxActiveState() ;
@@ -608,6 +636,7 @@ SC.ListItemView = SC.View.extend(
   
   beginEditing: function() {
     if (this.get('isEditing')) return YES ;
+    //if (!this.get('contentIsEditable')) return NO ;
     return this._beginEditing(YES);
   },
   

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

@@ -512,10 +512,14 @@ SC.SplitView = SC.View.extend(
   mouseUp: function(evt) {
     // console.log('%@.mouseUp(%@, %@)'.fmt(this, evt));
     // console.log(evt.originalEvent);
-    this._thumbView = null ; // avoid memory leaks
-    this._inLiveResize = NO ;
-    this.endLiveResize() ;
-    return YES ;
+		if (this._inLiveResize === YES) {
+    	this._thumbView = null ; // avoid memory leaks
+    	this._inLiveResize = NO ;
+    	this.endLiveResize() ;
+    	return YES ;
+		}
+		
+		return NO ;
   },
   
   doubleClickInThumbView: function(evt, thumbView) {

data/frameworks/sproutcore/frameworks/foundation/system/json.js

@@ -33,7 +33,7 @@ SC.json = {
 
 /*
     http://www.JSON.org/json2.js
-    2008-11-19
+    2009-09-29
 
     Public Domain.
 
@@ -66,7 +66,7 @@ SC.json = {
             value represented by the name/value pair that should be serialized,
             or undefined if nothing should be serialized. The toJSON method
             will be passed the key associated with the value, and this will be
-            bound to the object holding the key.
+            bound to the value
 
             For example, this would serialize Dates as ISO strings.
 
@@ -177,9 +177,7 @@ SC.json = {
     NOT CONTROL.
 */
 
-/*jslint evil: true */
-
-/*global JSON */
+/*jslint evil: true, strict: false */
 
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
@@ -188,12 +186,14 @@ SC.json = {
     test, toJSON, toString, valueOf
 */
 
+
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
 if (!this.JSON) {
-    JSON = {};
+    this.JSON = {};
 }
+
 (function () {
 
     function f(n) {
@@ -205,12 +205,13 @@ if (!this.JSON) {
 
         Date.prototype.toJSON = function (key) {
 
-            return this.getUTCFullYear()   + '-' +
+            return isFinite(this.valueOf()) ?
+                   this.getUTCFullYear()   + '-' +
                  f(this.getUTCMonth() + 1) + '-' +
                  f(this.getUTCDate())      + 'T' +
                  f(this.getUTCHours())     + ':' +
                  f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
+                 f(this.getUTCSeconds())   + 'Z' : null;
         };
 
         String.prototype.toJSON =
@@ -267,14 +268,9 @@ if (!this.JSON) {
             value = holder[key];
 
 // If the value has a toJSON method, call it to obtain a replacement value.
-				
-				/* FIXME: Prototype.js is creating an object.toJSON function which is not
-					is not playing well with json2.js. Arrays are not being JSON.stringify
-					correctly. Someone may want to check that this is correct.
-				*/
+
         if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function' &&
-								Object.prototype.toString.apply(value) !== '[object Array]') {
+                typeof value.toJSON === 'function') {
             value = value.toJSON(key);
         }
 
@@ -344,7 +340,7 @@ if (!this.JSON) {
                                 mind + ']' :
                           '[' + partial.join(',') + ']';
                 gap = mind;
-								return v;
+                return v;
             }
 
 // If the replacer is an array, use it to select the members to be stringified.
@@ -435,6 +431,82 @@ if (!this.JSON) {
 // If the JSON object does not yet have a parse method, give it one.
 
     if (typeof JSON.parse !== 'function') {
-      JSON.parse = function(text) { return eval('('+text+')'); };
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
     }
-})();
+}());

data/frameworks/sproutcore/themes/standard_theme/english.lproj/collection.css

@@ -10,11 +10,19 @@
 	color: #000;
 }
 
+.sc-theme .sc-collection-view.alternating .sc-collection-item.even {
+  background-color: #e4e4e4;
+}
+
 .sc-theme .sc-collection-view .sc-collection-item.sel {
 	background-color: #ddd;
 	color: #333;
 }
 
+.sc-theme.focus .sc-collection-view.alternating .sc-collection-item.even {
+  background-color: #f4f7fb;
+}
+
 .sc-theme.focus .sc-collection-view.focus .sc-collection-item.sel {
 	background-color: #2370d8;
 	color: white ;

data/gen/data-source/templates/data_sources/@filename@.js

@@ -10,7 +10,7 @@
 
   @extends <%= base_class_name || 'SC.DataSource' %>
 */
-<%= namespace_class_name %> = <%= base_class_name || 'SC.DataSource' %>.create(
+<%= namespace_class_name %> = <%= base_class_name || 'SC.DataSource' %>.extend(
 /** @scope <%= namespace_class_name %>.prototype */ {
 
   // ..........................................................

data/sproutcore-abbot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sproutcore}
-  s.version = "1.0.1008"
+  s.version = "1.0.1009"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sprout Systems, Inc.  Apple Inc. and contributors"]
-  s.date = %q{2009-10-23}
+  s.date = %q{2009-10-26}
   s.description = %q{sproutcore - abbot
     by Charles Jolley and contributors
     http://www.sproutcore.com

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1008
+  version: 1.0.1009
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -07:00
+date: 2009-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency