sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -311,7 +311,9 @@ SC.ObjectController = SC.Controller.extend(
     // notify!
     if ((last && last.isEnumerable) || (cur && cur.isEnumerable)) {
       this._scoc_enumerableContentDidChange();
-    } else this.contentPropertyDidChange(cur, '*');
+    } else {
+      this.contentPropertyDidChange(cur, '*');
+    }
 
   }.observes("observableContent"),
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js

@@ -88,6 +88,31 @@ SC.ALIGN_BOTTOM_LEFT = 'bottom-left';
 */
 SC.ALIGN_BOTTOM_RIGHT = 'bottom-right';
 
+/**
+  Indicates that the content does not specify its own alignment.
+*/
+SC.ALIGN_DEFAULT = 'default';
+
+/**
+  Indicates that the content should be positioned to the right.
+*/
+SC.POSITION_RIGHT = 0;
+
+/**
+  Indicates that the content should be positioned to the left.
+*/
+SC.POSITION_LEFT = 1;
+
+/**
+  Indicates that the content should be positioned above.
+*/
+SC.POSITION_TOP = 2;
+
+/**
+  Indicates that the content should be positioned below.
+*/
+SC.POSITION_BOTTOM = 3;
+
 
 SC.mixin(/** @lends SC */ {
 
@@ -144,6 +169,61 @@ SC.mixin(/** @lends SC */ {
   stringsFor: function(lang, strings) {
     SC.mixin(SC.STRINGS, strings);
     return this ;
+  },
+
+  /**
+    Returns the SC.View instance managing the given element.
+
+    If no instance is found, returns `null`.
+
+    @param {DOMElement} element The element to check.
+    @returns {SC.View} The view managing the element or null if none found.
+  */
+  viewFor: function (element) {
+    //@if(debug)
+    // Debug mode only arrgument validation.
+    // Ensure that every argument is correct and that the proper number of arguments is given.
+    if (!(element instanceof Element)) {
+      SC.error("Developer Error: Attempt to retrieve the SC.View instance for a non-element in SC.viewFor(): %@".fmt(element));
+    }
+
+    if (arguments.length > 1) {
+      SC.warn("Developer Warning: SC.viewFor() is meant to be used with only one argument: element");
+    }
+    //@endif
+
+    // Search for the view for the given element.
+    var viewCache = SC.View.views,
+      view = viewCache[element.getAttribute('id')];
+
+    // If the element itself is not managed by an SC.View, walk up its element chain searching for an
+    // element that is.
+    if (!view) {
+      var parentNode;
+
+      while (!view && (parentNode = element.parentNode) && (parentNode !== document)) {
+        var id;
+
+        // Ensure that the parent node is an Element and not some other type of Node.
+        // Note: while `instanceOf Element` is the most accurate determiner, performance tests show
+        // that it's much quicker to check for the existence of either the `nodeType` property or
+        // the `querySelector` method.
+        // See http://jsperf.com/nodetype-1-vs-instanceof-htmlelement/4
+        // if (parentNode.querySelector && (id = parentNode.getAttribute('id'))) {
+        if ((id = parentNode.getAttribute('id'))) {
+          view = viewCache[id];
+        }
+
+        // Check the parent node.
+        element = parentNode;
+      }
+
+      // Avoid memory leaks (i.e. IE).
+      element = parentNode = null;
+    }
+
+    // If view isn't found, return null rather than undefined.
+    return view || null;
   }
 
-}) ;
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/english.lproj/ordinal.js

@@ -0,0 +1,17 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+/**
+ * Returns the ordinal associated for the current number.
+ */
+SC.methodForLocale('en', 'ordinalForNumber', function(number) {
+  var d = number % 10;
+  return (~~ (number % 100 / 10) === 1) ? 'th' :
+         (d === 1) ? 'st' :
+         (d === 2) ? 'nd' :
+         (d === 3) ? 'rd' : 'th';
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/string.js

@@ -38,6 +38,13 @@ SC.supplement(String.prototype,
     return SC.String.dasherize(this, arguments);
   },
 
+  /**
+    @see SC.String.escapeCssIdForSelector
+  */
+  escapeCssIdForSelector: function () {
+    return SC.String.escapeCssIdForSelector(this);
+  },
+
   /**
     @see SC.String.loc
   */

data/lib/frameworks/sproutcore/frameworks/{desktop/tests/views/disclosure/methods.js → core_foundation/french.lproj/ordinal.js}

@@ -1,10 +1,13 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            portions copyright @2011 Apple Inc.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
-
-module("TODO: Test SC.DisclosureView Methods");
+/**
+ * Returns the ordinal associated for the current number.
+ */
+SC.methodForLocale('fr', 'ordinalForNumber', function(number) {
+  return number == 1 ? 'er' : 'e';
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/layout.js

@@ -81,7 +81,7 @@ SC.Pane.reopen(
   windowSizeDidChange: function (oldSize, newSize) {
     this.set('currentWindowSize', newSize);
     this.setBodyOverflowIfNeeded();
-    this.parentViewDidResize(); // start notifications.
+    this.parentViewDidResize(newSize); // start notifications.
     return this;
   },
 
@@ -127,10 +127,6 @@ SC.Pane.reopen(
   */
   unsetBodyOverflowIfNeeded: function () {
     SC.bodyOverflowArbitrator.withdrawRequest(this);
-  },
+  }
 
-  recomputeDependentProperties: function (original) {
-    this.set('currentWindowSize', this.rootResponder.computeWindowSize());
-    original();
-  }.enhance()
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/main.js

@@ -9,7 +9,7 @@ sc_require('panes/pane');
 sc_require('panes/keyboard');
 sc_require('panes/layout');
 sc_require('panes/manipulation');
-sc_require('panes/visibility');
+sc_require('panes/pane_statechart');
 
 /** @class
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js

@@ -23,7 +23,7 @@ sc_require('mixins/responder_context');
 
   @type String
 */
-SC.MIXED_STATE = '__MIXED__';
+SC.MIXED_STATE = '__MIXED__' ;
 
 /** @class
   A Pane is like a regular view except that it does not need to live within a
@@ -123,23 +123,49 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   rootResponder: null,
 
   /**
-    Attempts to send the event down the responder chain for this pane.  If you
-    pass a target, this method will begin with the target and work up the
-    responder chain.  Otherwise, it will begin with the current rr
-    and walk up the chain looking for any responder that implements a handler
-    for the passed method and returns YES when executed.
-
-    @param {String} action
-    @param {SC.Event} evt
-    @param {Object} target
+    Attempts to send the specified event up the responder chain for this pane. This
+    method is used by the RootResponder to correctly delegate mouse, touch and keyboard
+    events. You can also use it to send your own events to the pane's responders, though
+    you will usually not do this.
+
+    A responder chain is a linked list of responders - mostly views - which are each
+    sequentially given an opportunity to handle the event. The responder chain begins with
+    the event's `target` view, and proceeds up the chain of parentViews (via the customizable
+    nextResponder property) until it reaches the pane and its defaultResponder. You can
+    specify the `target` responder; by default, it is the pane's current `firstResponder`
+    (see SC.View keyboard event documentation for more on the first responder).
+
+    Beginning with the target, each responder is given the chance to handle the named event.
+    In order to handle an event, a responder must implement a method with the name of the
+    event. For example, to handle the mouseDown event, expose a `mouseDown` method. If a
+    responder handles a method, then the event will stop bubbling up the responder chain.
+    (If your responder exposes a handler method but you do not always want to handle that
+    method, you can signal that the method should continue bubbling up the responder chain by
+    returning NO from your handler.)
+
+    In some rare cases, you may want to only alert part of the responder chain. For example,
+    SC.ScrollView uses this to capture a touch to give the user a moment to begin scrolling
+    on otherwise-tappable controls. To accomplish this, pass a view (or responder) as the
+    `untilResponder` argument. If the responder chain includes this view, it will break the
+    chain there and not proceed. (Note that the `untilResponder` object will not be given a
+    chance to respond to the event.)
+
+    @param {String} action The name of the event (i.e. method name) to invoke.
+    @param {SC.Event} evt The optional event object.
+    @param {SC.Responder} target The responder chain's first member. If not specified, will
+      use the pane's current firstResponder instead.
+    @param {SC.Responder} untilResponder If specified, the responder chain will break when
+      this object is reached, preventing it and subsequent responders from receiving
+      the event.
     @returns {Object} object that handled the event
   */
-  sendEvent: function (action, evt, target) {
-    var handler;
+  sendEvent: function(action, evt, target, untilResponder) {
+    // Until there's time for a refactor of this method, note the early return for untilResponder, marked
+    // below with "FAST PATH".
 
     // walk up the responder chain looking for a method to handle the event
-    if (!target) target = this.get('firstResponder');
-    while (target) {
+    if (!target) target = this.get('firstResponder') ;
+    while(target) {
       if (action === 'touchStart') {
         // first, we must check that the target is not already touch responder
         // if it is, we don't want to have "found" it; that kind of recursion is sure to
@@ -162,9 +188,13 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
         if (target.tryToPerform(action, evt)) break;
       }
 
-      // even if someone tries to fill in the nextResponder on the pane, stop
-      // searching when we hit the pane.
+      // If we've reached the pane, we're at the end of the chain.
       target = (target === this) ? null : target.get('nextResponder');
+      // FAST PATH: If we've reached untilResponder, break the chain. (TODO: refactor out this early return. The
+      // point is to avoid pinging defaultResponder if we ran into the untilResponder.)
+      if (target === untilResponder) {
+        return (evt && evt.mouseHandler) || null;
+      }
     }
 
     // if no handler was found in the responder chain, try the default
@@ -174,16 +204,16 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
       }
 
       if (!target) target = null;
-      else target = target.tryToPerform(action, evt) ? target : null;
+      else target = target.tryToPerform(action, evt) ? target : null ;
     }
 
     // if we don't have a default responder or no responders in the responder
     // chain handled the event, see if the pane itself implements the event
     else if (!target && !(target = this.get('defaultResponder'))) {
-      target = this.tryToPerform(action, evt) ? this : null;
+      target = this.tryToPerform(action, evt) ? this : null ;
     }
 
-    return evt.mouseHandler || target;
+    return (evt && evt.mouseHandler) || target;
   },
 
   // .......................................................
@@ -196,7 +226,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @property {SC.Responder}
     @readOnly
   */
-  nextResponder: function () {
+  nextResponder: function() {
     return null;
   }.property().cacheable(),
 
@@ -231,11 +261,11 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
 
     @returns {SC.Pane} receiver
   */
-  becomeKeyPane: function () {
-    if (this.get('isKeyPane')) return this;
-    if (this.rootResponder) this.rootResponder.makeKeyPane(this);
+  becomeKeyPane: function() {
+    if (this.get('isKeyPane')) return this ;
+    if (this.rootResponder) this.rootResponder.makeKeyPane(this) ;
 
-    return this;
+    return this ;
   },
 
   /**
@@ -244,11 +274,11 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
 
     @returns {SC.Pane} receiver
   */
-  resignKeyPane: function () {
-    if (!this.get('isKeyPane')) return this;
+  resignKeyPane: function() {
+    if (!this.get('isKeyPane')) return this ;
     if (this.rootResponder) this.rootResponder.makeKeyPane(null);
 
-    return this;
+    return this ;
   },
 
   /**
@@ -261,15 +291,14 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {Event} evt that cause this to become first responder
     @returns {SC.Pane} receiver
   */
-  makeFirstResponder: function (original, view, evt) {
+  makeFirstResponder: function(original, view, evt) {
     // firstResponder should never be null
-    if (!view) view = this;
+    if(!view) view = this;
 
     var current = this.get('firstResponder'),
       isKeyPane = this.get('isKeyPane');
 
-    if (current === view) return this; // nothing to do
-    if (SC.platform.touch && view && view.kindOf(SC.TextFieldView) && !view.get('focused')) return this;
+    if (current === view) return this ; // nothing to do
 
     // if we are currently key pane, then notify key views of change also
     if (isKeyPane) {
@@ -291,8 +320,8 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
 
     original(view, evt);
 
-    if (current) current.endPropertyChanges();
-    if (view) view.endPropertyChanges();
+    if(current) current.endPropertyChanges();
+    if(view) view.endPropertyChanges();
 
     // and notify again if needed.
     if (isKeyPane) {
@@ -304,7 +333,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
       }
     }
 
-    return this;
+    return this ;
   }.enhance(),
 
   /**
@@ -315,9 +344,9 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane
     @returns {SC.Pane} receiver
   */
-  willLoseKeyPaneTo: function (pane) {
+  willLoseKeyPaneTo: function(pane) {
     this._forwardKeyChange(this.get('isKeyPane'), 'willLoseKeyResponderTo', pane, NO);
-    return this;
+    return this ;
   },
 
   /**
@@ -329,13 +358,13 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane
     @returns {SC.Pane} receiver
   */
-  willBecomeKeyPaneFrom: function (pane) {
+  willBecomeKeyPaneFrom: function(pane) {
     this._forwardKeyChange(!this.get('isKeyPane'), 'willBecomeKeyResponderFrom', pane, YES);
-    return this;
+    return this ;
   },
 
 
-  didBecomeKeyResponderFrom: function (responder) {},
+  didBecomeKeyResponderFrom: function(responder) {},
 
   /**
     Called just after the pane has lost its keyPane status.  Notifies the
@@ -345,11 +374,11 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane
     @returns {SC.Pane} receiver
   */
-  didLoseKeyPaneTo: function (pane) {
+  didLoseKeyPaneTo: function(pane) {
     var isKeyPane = this.get('isKeyPane');
     this.set('isKeyPane', NO);
     this._forwardKeyChange(isKeyPane, 'didLoseKeyResponderTo', pane);
-    return this;
+    return this ;
   },
 
   /**
@@ -362,11 +391,11 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @returns {SC.Pane} receiver
 
   */
-  didBecomeKeyPaneFrom: function (pane) {
+  didBecomeKeyPaneFrom: function(pane) {
     var isKeyPane = this.get('isKeyPane');
     this.set('isKeyPane', YES);
     this._forwardKeyChange(!isKeyPane, 'didBecomeKeyResponderFrom', pane, YES);
-    return this;
+    return this ;
   },
 
   // .......................................................
@@ -388,7 +417,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane the pane that currently have focus
     @returns {void}
   */
-  focusFrom: function (pane) {},
+  focusFrom: function(pane) {},
 
   /**
     Invoked when the the pane is about to lose its focused pane status.
@@ -397,7 +426,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane the pane that will receive focus next
     @returns {void}
   */
-  blurTo: function (pane) {},
+  blurTo: function(pane) {},
 
   /**
     Invoked when the view is about to lose its mainPane status.  The default
@@ -407,8 +436,8 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane
     @returns {void}
   */
-  blurMainTo: function (pane) {
-    this.set('isMainPane', NO);
+  blurMainTo: function(pane) {
+    this.set('isMainPane', NO) ;
   },
 
   /**
@@ -420,7 +449,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.Pane} pane
     @returns {void}
   */
-  focusMainFrom: function (pane) {
+  focusMainFrom: function(pane) {
     this.set('isMainPane', YES);
   },
 
@@ -435,8 +464,8 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     @param {SC.RootResponder} rootResponder
     @returns {SC.Pane} receiver
   */
-  append: function () {
-    return this.appendTo(document.body);
+  append: function() {
+    return this.appendTo(document.body) ;
   },
 
   /**
@@ -446,10 +475,10 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
 
     @returns {SC.Pane} receiver
   */
-  remove: function () {
+  remove: function() {
     this._doDetach();
 
-    return this;
+    return this ;
   },
 
   /**
@@ -459,7 +488,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     is not already attached, and for calling `paneDidAttach` when done.
 
         pane = SC.Pane.create();
-        pane.insert(function (layer) {
+        pane.insert(function(layer) {
           jQuery(layer).insertBefore("#otherElement");
         });
 
@@ -467,7 +496,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
       necessary in order to insert the pane's layer into the DOM.
     @returns {SC.Pane} receiver
    */
-  insert: function (fn) {
+  insert: function(fn) {
     // Render the layer.
     this.createLayer();
 
@@ -485,7 +514,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
       This is passed to `jQuery()`, so any value supported by `jQuery()` will work.
     @returns {SC.Pane} receiver
   */
-  appendTo: function (elem) {
+  appendTo: function(elem) {
     var self = this;
 
     return this.insert(function () {
@@ -501,7 +530,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
 
     @deprecated Version 1.10
   */
-  paneDidAttach: function () {
+  paneDidAttach: function() {
     // Does nothing.  Left here so that subclasses that implement the method
     // and call sc_super() won't fail.
   },
@@ -512,7 +541,10 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
     method to recompute properties that depend on the pane's existence
     in the document but must be run prior to child view notification.
    */
-  recomputeDependentProperties: function () {},
+  recomputeDependentProperties: function () {
+    // Does nothing.  Left here so that subclasses that implement the method
+    // and call sc_super() won't fail.
+  },
 
   /**
     YES when the pane is currently attached to a document DOM.  Read only.
@@ -531,13 +563,14 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   /**
     Returns YES if wantsTouchIntercept and this is a touch platform.
   */
-  hasTouchIntercept: function () {
+  hasTouchIntercept: function(){
     return this.get('wantsTouchIntercept') && SC.platform.touch;
   }.property('wantsTouchIntercept').cacheable(),
 
   /**
     The Z-Index of the pane. Currently, you have to match this in CSS.
     TODO: ALLOW THIS TO AUTOMATICALLY SET THE Z-INDEX OF THE PANE (as an option).
+    ACTUAL TODO: Remove this because z-index is evil.
   */
   zIndex: 0,
 
@@ -547,7 +580,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   touchZ: 99,
 
   /** @private */
-  _addIntercept: function () {
+  _addIntercept: function() {
     if (this.get('hasTouchIntercept')) {
       var div = document.createElement("div");
       var divStyle = div.style;
@@ -556,7 +589,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
       divStyle.top = "0px";
       divStyle.right = "0px";
       divStyle.bottom = "0px";
-      divStyle.webkitTransform = "translateZ(0px)";
+      divStyle[SC.browser.experimentalStyleNameFor('transform')] = "translateZ(0px)";
       divStyle.zIndex = this.get("zIndex") + this.get("touchZ");
       div.className = "touch-intercept";
       div.id = "touch-intercept-" + SC.guidFor(this);
@@ -566,7 +599,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   },
 
   /** @private */
-  _removeIntercept: function () {
+  _removeIntercept: function() {
     if (this._touchIntercept) {
       document.body.removeChild(this._touchIntercept);
       this._touchIntercept = null;
@@ -574,12 +607,12 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   },
 
   /** @private */
-  hideTouchIntercept: function () {
+  hideTouchIntercept: function() {
     if (this._touchIntercept) this._touchIntercept.style.display = "none";
   },
 
   /** @private */
-  showTouchIntercept: function () {
+  showTouchIntercept: function() {
     if (this._touchIntercept) this._touchIntercept.style.display = "block";
   },
 
@@ -592,18 +625,20 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   // },
 
   /** @private */
-  init: function () {
+  init: function() {
     // Backwards compatibility
+    //@if(debug)
     // TODO: REMOVE THIS
     if (this.hasTouchIntercept === YES) {
-      SC.Logger.warn("Do not set hasTouchIntercept directly. Use wantsTouchIntercept instead.");
-      this.hasTouchIntercept = SC.platform.touch;
+      SC.error("Developer Error: Do not set `hasTouchIntercept` on a pane directly. Please use `wantsTouchIntercept` instead.");
     }
+    //@endif
 
-    // if a layer was set manually then we will just attach to existing
-    // HTML.
+    // if a layer was set manually then we will just attach to existing HTML.
     var hasLayer = !!this.get('layer');
+
     sc_super();
+
     if (hasLayer) {
       this._attached();
     }
@@ -612,4 +647,4 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   /** @private */
   classNames: ['sc-pane']
 
-});
+}) ;