sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/lib/frameworks/sproutcore/apps/tests/english.lproj/strings.js

@@ -14,6 +14,7 @@ SC.stringsFor('English', {
   "Kind.app": "Apps",
   "Kind.framework" : "Frameworks",
   "Kind.sproutcore" : "SproutCore",
+  "Kind.theme": "Themes",
   
   "_Test Runner" : "Test Runner",
   "_No Targets" : "No Targets",

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -22,37 +22,37 @@ SC._detectBrowser = function(userAgent, language) {
     @type Boolean
   */
   browser.windows = browser.isWindows = !!/windows/.test(userAgent);
-  
+
   /**
     @name SC.browser.isMac
     @type Boolean
   */
   browser.mac = browser.isMac = !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent));
-  
+
   /**
     @name SC.browser.isiPhone
     @type Boolean
   */
   browser.iPhone = browser.isiPhone = !!/iphone/.test(userAgent);
-  
+
   /**
     @name SC.browser.isiPod
     @type Boolean
   */
   browser.iPod = browser.isiPod = !!/ipod/.test(userAgent);
-  
+
   /**
     @name SC.browser.isiPad
     @type Boolean
   */
   browser.iPad = browser.isiPad = !!/ipad/.test(userAgent);
-  
+
   /**
     @name SC.browser.isiOS
     @type Boolean
   */
   browser.iOS = browser.isiOS = browser.iPhone || browser.iPod || browser.iPad;
-  
+
   /**
     @name SC.browser.isAndroid
     @type Boolean
@@ -64,7 +64,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.opera = /opera/.test(userAgent) ? version : 0;
-  
+
   /**
     @name SC.browser.isOpera
     @type Boolean
@@ -76,13 +76,13 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.msie = /msie/.test(userAgent) && !browser.opera ? version : 0;
-  
+
   /**
     @name SC.browser.isIE
     @type Boolean
   */
   browser.isIE = !!browser.msie;
-  
+
   /**
     @name SC.browser.isIE8OrLower
     @type Boolean
@@ -94,7 +94,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.mozilla = /mozilla/.test(userAgent) && !/(compatible|webkit|msie)/.test(userAgent) ? version : 0;
-  
+
   /**
     @name SC.browser.isMozilla
     @type Boolean
@@ -106,7 +106,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.webkit = /webkit/.test(userAgent) ? webkitVersion : 0;
-  
+
   /**
     @name SC.browser.isWebkit
     @type Boolean
@@ -118,7 +118,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.chrome = /chrome/.test(userAgent) ? version: 0;
-  
+
   /**
     @name SC.browser.isChrome
     @type Boolean
@@ -129,8 +129,8 @@ SC._detectBrowser = function(userAgent, language) {
     @name SC.browser.mobileSafari
     @type String
   */
-  browser.mobileSafari = /apple.*mobile.*safari/.test(userAgent) && browser.iOS ? webkitVersion : 0;
-  
+  browser.mobileSafari = /apple.*mobile/.test(userAgent) && browser.iOS ? webkitVersion : 0;
+
   /**
     @name SC.browser.isMobileSafari
     @type Boolean
@@ -142,7 +142,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.iPadSafari = browser.iPad && browser.isMobileSafari ? webkitVersion : 0;
-  
+
   /**
     @name SC.browser.isiPadSafari
     @type Boolean
@@ -154,7 +154,7 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.iPhoneSafari = browser.iPhone && browser.isMobileSafari ? webkitVersion : 0;
-  
+
   /**
     @name SC.browser.isiPhoneSafari
     @type Boolean
@@ -166,19 +166,25 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.iPodSafari = browser.iPod && browser.isMobileSafari ? webkitVersion : 0;
-  
+
   /**
     @name SC.browser.isiPodSafari
     @type Boolean
   */
   browser.isiPodSafari = !!browser.iPodSafari;
 
+  /**
+    @name SC.browser.isiOSHomeScreen
+    @type Boolean
+  */
+  browser.isiOSHomeScreen = browser.isMobileSafari && !/apple.*mobile.*safari/.test(userAgent);
+
   /**
     @name SC.browser.safari
     @type String
   */
   browser.safari = browser.webkit && !browser.chrome && !browser.iOS && !browser.android ? webkitVersion : 0;
-  
+
   /**
     @name SC.browser.isSafari
     @type Boolean
@@ -190,10 +196,10 @@ SC._detectBrowser = function(userAgent, language) {
     @type String
   */
   browser.language = language.split('-', 1)[0];
-  
+
   /**
     Possible values:
-    
+
       - 'msie'
       - 'mozilla'
       - 'chrome'
@@ -212,14 +218,14 @@ SC._detectBrowser = function(userAgent, language) {
 
 
 /** @class
-  
+
   Contains information about the browser environment that SproutCore
   is running in. String properties, such as `SC.browser.webkit` or
   `SC.browser.msie`, will have a value that represents the browser build
   number if that browser is being used. Otherwise, they will have a
   falsey value. For convenience, Boolean counterparts for all of the
   versioned properties are provided.
-  
+
   @since SproutCore 1.0
 */
 SC.browser = SC._detectBrowser();

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

@@ -77,7 +77,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     step.  You can use this orderBy property, however, for displaying smaller
     arrays of content.
 
-    Note that you can only to use addObject() to insert new objects into an
+    Note that you can only use addObject() to insert new objects into an
     array that is ordered.  You cannot manually reorder or insert new objects
     into specific locations because the order is managed by this property
     instead.
@@ -403,15 +403,19 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
 
   _scac_arrayContentWillChange: function(start, removed, added) {
     this.arrayContentWillChange(start, removed, added);
-    var removedObjects = this.slice(start, start+removed);
-    this.teardownEnumerablePropertyChains(removedObjects);
+    if (this._kvo_enumerable_property_chains) {
+      var removedObjects = this.slice(start, start+removed);
+      this.teardownEnumerablePropertyChains(removedObjects);
+    }
   },
 
   _scac_arrayContentDidChange: function(start, removed, added) {
     this.arrayContentDidChange(start, removed, added);
-    var addedObjects = this.slice(start, start+added);
+    if (this._kvo_enumerable_property_chains) {
+      var addedObjects = this.slice(start, start+added);
+      this.setupEnumerablePropertyChains(addedObjects);
+    }
     this._scac_cached = NO;
-    this.setupEnumerablePropertyChains(addedObjects);
     this.updateSelectionAfterContentChange();
   },
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js

@@ -53,7 +53,7 @@ SC.Controller = SC.Object.extend(
 
     if (!this.get('destroyContentOnReplace')) return;
 
-    oldContent = this._oldContent,
+    oldContent = this._oldContent;
     newContent = this.get('content');
     if (oldContent && newContent !== oldContent && oldContent.destroy) {
       oldContent.destroy();

data/lib/frameworks/sproutcore/frameworks/core_foundation/controls/button.js

@@ -1,10 +1,23 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+sc_require('mixins/action_support');
 sc_require('views/template');
 
-SC.Button = SC.TemplateView.extend({
+/**
+  @class
+  @extends SC.TemplateView
+  @extends SC.ActionSupport
+*/
+SC.Button = SC.TemplateView.extend(SC.ActionSupport,
+/** @scope SC.Button.prototype */{
+
   classNames: ['sc-button'],
 
-  // Setting isActive to true will trigger the classBinding and add
-  // 'is-active' to our layer's class names.
   mouseDown: function() {
     this.set('isActive', true);
     this._isMouseDown = YES;
@@ -25,18 +38,9 @@ SC.Button = SC.TemplateView.extend({
     return pane.get('rootResponder');
   }.property('pane').cacheable(),
 
-  // Setting isActive to false will remove 'is-active' from our
-  // layer's class names.
   mouseUp: function(event) {
     if (this.get('isActive')) {
-      var action = this.get('action'),
-          target = this.get('target') || null,
-          rootResponder = this.get('rootResponder');
-
-      if (action && rootResponder) {
-        rootResponder.sendAction(action, target, this, this.get('pane'), null, this);
-      }
-
+      this.fireAction();
       this.set('isActive', false);
     }
 
@@ -50,4 +54,5 @@ SC.Button = SC.TemplateView.extend({
   touchEnd: function(touch) {
     this.mouseUp(touch);
   }
+
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/bind.js

@@ -166,16 +166,18 @@ Handlebars.registerHelper('bindAttr', function(options) {
         return;
       }
 
+      var currentValue = elem.attr(attr);
+
       // A false result will remove the attribute from the element. This is
       // to support attributes such as disabled, whose presence is meaningful.
-      if (result === NO) {
+      if (result === NO && currentValue) {
         elem.removeAttr(attr);
 
       // Likewise, a true result will set the attribute's name as the value.
-      } else if (result === YES) {
+      } else if (result === YES && currentValue !== attr) {
         elem.attr(attr, attr);
 
-      } else {
+      } else if (currentValue !== result) {
         elem.attr(attr, result);
       }
     };

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/collection.js

@@ -15,6 +15,8 @@ Handlebars.registerHelper('collection', function(path, options) {
   // @if (debug)
   if (!collectionClass) {
     throw "%@ #collection: Could not find %@".fmt(data.view, path);
+  } else if (!SC.kindOf(collectionClass, SC.TemplateCollectionView)) {
+    throw "You must use a subclass of SC.TemplateCollectionView when using the #collection Handlebars helper";
   }
   // @endif
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/action_support.js

@@ -0,0 +1,80 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  @class
+
+  Implements basic target and action support for views.
+
+  @author Erich Ocean
+  @author Colin Campbell (colin@sproutcore.com)
+  @since SproutCore 1.7
+*/
+SC.ActionSupport =
+/** @scope SC.ActionSupport.prototype */ {
+
+  /**
+    The target object to invoke the action on when fireAction() is called.
+
+    If you set this target, the action will be called on the target object
+    directly when fireAction() is called. If you leave this property set to
+    null, then the responder chain will be searched for a view that implements
+    the action.
+
+    @type Object
+    @default null
+  */
+  target: null,
+
+  /**
+    The name of the action you want triggered when fireAction() is called.
+
+    This property is used in conjunction with the target property to execute
+    a method when fireAction() is called.
+
+    If you do not set a target, then calling fireAction() will cause the
+    responder chain to search for a view that implements the action you name
+    here.  If you set a target, then fireAction() will try to call the
+    method on the target itself.
+
+    @type String
+    @default null
+  */
+  action: null,
+
+  /**
+    Will be sent along with the action to provide the context of the action.
+    This is an easy way to include information along with the action.
+
+    @type Object
+    @default null
+  */
+  actionContext: null,
+
+   /**
+     Perform the action. If an action paramter is not provided, then
+     the action defaults to the `action` property.
+
+     @param {String} [action] The action to fire.
+
+     @returns {Boolean} true if successful
+     @returns {Boolean} false otherwise
+  */
+  fireAction: function(action) {
+    var target = this.get('target') || null,
+        rootResponder = this.getPath('pane.rootResponder');
+
+    if (action === undefined) { action = this.get('action'); }
+
+    if (action && rootResponder) {
+      return rootResponder.sendAction(action, target, this, this.get('pane'), this.get('actionContext'), this);
+    }
+
+    return false;
+  }
+
+};

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/text_field_support.js

@@ -7,60 +7,19 @@
 
 sc_require('views/template');
 
-/** @class */
-
-SC.TextField = SC.TemplateView.extend(
-  /** @scope SC.TextField.prototype */ {
-
-  classNames: ['sc-text-field'],
-
-  /**
-    If set to `YES` uses textarea tag instead of input to
-    accommodate multi-line strings.
-
-    @type Boolean
-    @default NO
-  */
-  isMultiline: NO,
-
-  // we can't use bindAttr because of a race condition:
-  //
-  // when `value` is set, the bindAttr observer immediately calls
-  // `get` in order to persist it to the DOM, but because we made
-  // the `value` property idempotent, when it gets called by
-  // bindAttr, it fetches the not-yet-updated value from the DOM
-  // and returns it.
-  //
-  // In short, because we need to be able to catch changes to the
-  // DOM made directly, we cannot also rely on bindAttr to update
-  // the property: a chicken-and-egg problem.
-  template: function(){
-    return SC.Handlebars.compile(this.get('isMultiline') ? '<textarea></textarea>' : '<input type="text">');
-  }.property('isMultiline').cacheable(),
+/**
+  @class
+*/
+SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
 
   $input: function() {
-    tagName = this.get('isMultiline') ? 'textarea' : 'input';
-    return this.$(tagName);
+    return this.$('input');
   },
 
-  didCreateLayer: function() {
-    var self = this;
-
-    var input = this.$input();
-    input.val(this._value);
-
-    if (SC.browser.msie) {
-      SC.Event.add(input, 'focusin', this, this.focusIn);
-      SC.Event.add(input, 'focusout', this, this.focusOut);
-    } else {
-      SC.Event.add(input, 'focus', this, this.focusIn);
-      SC.Event.add(input, 'blur', this, this.focusOut);
-    }
-
-    input.bind('change', function() {
-      self.domValueDidChange(SC.$(this));
-    });
-  },
+  /** @private
+    Used internally to store value because the layer may not exist
+  */
+  _value: null,
 
   /**
     The problem this property is trying to solve is twofold:
@@ -77,79 +36,18 @@ SC.TextField = SC.TemplateView.extend(
     In order to achieve (1), we need to store a local cache of the
     value, so that SproutCore can set the proper value as soon as
     the underlying DOM element is created.
-  */
-  value: function(key, value) {
-    var input = this.$input();
-
-    if (value !== undefined) {
-      // We don't want to unnecessarily set the value.
-      // Doing that could cause the selection to be lost.
-      if (this._value !== value || input.val() !== value) {
-        this._value = value;
-        input.val(value);
-      }
-    } else if (input.length) {
-      this._value = value = input.val();
-    } else {
-      value = this._value;
-    }
-
-    return value;
-  }.property().idempotent(),
-
-  domValueDidChange: function(jquery) {
-    this.set('value', jquery.val());
-  },
-
-  focusIn: function(event) {
-    this.becomeFirstResponder();
-    this.tryToPerform('focus', event);
-  },
-
-  focusOut: function(event) {
-    this.resignFirstResponder();
-    this.tryToPerform('blur', event);
-  },
-
-  willLoseFirstResponder: function() {
-    this.notifyPropertyChange('value');
-  },
 
-  keyUp: function(evt) {
-    this.domValueDidChange(this.$input());
-
-    if (evt.keyCode === SC.Event.KEY_RETURN) {
-      return this.tryToPerform('insertNewline', evt);
-    } else if (evt.keyCode === SC.Event.KEY_ESC) {
-      return this.tryToPerform('cancel', evt);
-    }
-
-    return true;
-  }
-
-});
-
-SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
-
-  /** @private
-    Used internally to store value because the layer may not exist
-  */
-  _value: null,
-
-  /**
     @type String
-    @default null
+    @default  null
   */
   value: function(key, value) {
-    var input = this.$('input');
+    var input = this.$input();
 
     if (value !== undefined) {
       // We don't want to unnecessarily set the value.
       // Doing that could cause the selection to be lost.
-      if (this._value !== value || input.val() !== value) {
-        this._value = value;
-        input.val(value);
-      }
+      if (this._value !== value) { this._value = value; }
+      if (input.val() !== value) { input.val(value); }
     } else {
       if (input.length > 0) {
         value = this._value = input.val();
@@ -162,7 +60,8 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
   }.property().idempotent(),
 
   didCreateLayer: function() {
-    var input = this.$('input');
+    var input = this.$input(),
+        self = this;
 
     input.val(this._value);
 
@@ -175,6 +74,18 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     }
   },
 
+  willDestroyLayerMixin: function() {
+    var input = this.$input();
+
+    if (SC.browser.msie) {
+      SC.Event.remove(input, 'focusin', this, this.focusIn);
+      SC.Event.remove(input, 'focusout', this, this.focusOut);
+    } else {
+      SC.Event.remove(input, 'focus', this, this.focusIn);
+      SC.Event.remove(input, 'blur', this, this.focusOut);
+    }
+  },
+
   focusIn: function(event) {
     this.becomeFirstResponder();
     this.tryToPerform('focus', event);
@@ -185,6 +96,16 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     this.tryToPerform('blur', event);
   },
 
+  touchStart: function(evt) {
+    evt.allowDefault();
+    return YES;
+  },
+
+  touchEnd: function(evt) {
+    evt.allowDefault();
+    return YES;
+  },
+
   /** @private
     Make sure our input value is synced with any bindings.
     In some cases, such as auto-filling, a value can get
@@ -196,7 +117,13 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     this.notifyPropertyChange('value');
   },
 
+  domValueDidChange: function(jquery) {
+    this.set('value', jquery.val());
+  },
+
   keyUp: function(event) {
+    this.domValueDidChange(this.$input());
+
     if (event.keyCode === SC.Event.KEY_RETURN) {
       return this.tryToPerform('insertNewline', event);
     } else if (event.keyCode === SC.Event.KEY_ESC) {
@@ -205,3 +132,44 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
   }
 };
 
+/**
+  @class
+  @extends SC.TemplateView
+  @extends SC.TextFieldSupport
+*/
+SC.TextField = SC.TemplateView.extend(SC.TextFieldSupport,
+/** @scope SC.TextField.prototype */ {
+
+  classNames: ['sc-text-field'],
+
+  /**
+    If set to `YES` uses textarea tag instead of input to
+    accommodate multi-line strings.
+
+    @type Boolean
+    @default NO
+  */
+  isMultiline: NO,
+
+  // we can't use bindAttr because of a race condition:
+  //
+  // when `value` is set, the bindAttr observer immediately calls
+  // `get` in order to persist it to the DOM, but because we made
+  // the `value` property idempotent, when it gets called by
+  // bindAttr, it fetches the not-yet-updated value from the DOM
+  // and returns it.
+  //
+  // In short, because we need to be able to catch changes to the
+  // DOM made directly, we cannot also rely on bindAttr to update
+  // the property: a chicken-and-egg problem.
+  template: function(){
+    return SC.Handlebars.compile(this.get('isMultiline') ? '<textarea></textarea>' : '<input type="text">');
+  }.property('isMultiline').cacheable(),
+
+  $input: function() {
+    var tagName = this.get('isMultiline') ? 'textarea' : 'input';
+    return this.$(tagName);
+  }
+
+});
+