sproutcore 1.10.2 → 1.10.3.1

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/bounce_transition.js

@@ -105,8 +105,10 @@ SC.mixin(SC.View,
         { value: value, duration: duration, timing: 'ease-in-out' }
       ];
 
-      var callback = function () {
-        view.didTransitionIn();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionIn();
+        }
       };
 
       // Animate through the frames.
@@ -198,8 +200,10 @@ SC.mixin(SC.View,
         { value: finalValue, duration: duration, timing: 'ease-in' }
       ];
 
-      var callback = function () {
-        view.didTransitionOut();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionOut();
+        }
       };
 
       // Animate through the frames.

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/fade_transition.js

@@ -28,7 +28,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionIn();
+        if (!data.isCancelled) {
+          this.didTransitionIn();
+        }
       });
     }
   },
@@ -48,7 +50,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionOut();
+        if (!data.isCancelled) {
+          this.didTransitionOut();
+        }
       });
     }
 

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/pop_transition.js

@@ -37,8 +37,10 @@ SC.mixin(SC.View,
         { value: { scale: scale }, duration: duration * 0.4, timing: 'ease-in-out' }
       ];
 
-      var callback = function () {
-        view.didTransitionIn();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionIn();
+        }
       };
 
       // Animate through the frames.
@@ -71,8 +73,10 @@ SC.mixin(SC.View,
         { value: { scale: 0 }, duration: duration * 0.6, timing: 'ease-in-out' }
       ];
 
-      var callback = function () {
-        view.didTransitionOut();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionOut();
+        }
       };
 
       // Animate through the frames.

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/scale_transition.js

@@ -27,7 +27,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionIn();
+        if (!data.isCancelled) {
+          this.didTransitionIn();
+        }
       });
     }
   },
@@ -46,7 +48,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionOut();
+        if (!data.isCancelled) {
+          this.didTransitionOut();
+        }
       });
     }
 

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/slide_transition.js

@@ -71,7 +71,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionIn();
+        if (!data.isCancelled) {
+          this.didTransitionIn();
+        }
       });
     }
   },
@@ -132,7 +134,9 @@ SC.mixin(SC.View,
         duration: options.duration || 0.4,
         timing: options.timing || 'ease'
       }, function (data) {
-        this.didTransitionOut();
+        if (!data.isCancelled) {
+          this.didTransitionOut();
+        }
       });
     }
   }

data/lib/frameworks/sproutcore/frameworks/foundation/transitions/spring_transition.js

@@ -108,8 +108,10 @@ SC.mixin(SC.View,
         { value: value, duration: duration, timing: 'ease-in-out' } // Hit target.
       ];
 
-      var callback = function () {
-        view.didTransitionIn();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionIn();
+        }
       };
 
       // Animate through the frames.
@@ -192,8 +194,10 @@ SC.mixin(SC.View,
         { value: finalValue, duration: duration, timing: 'ease-in' }
       ];
 
-      var callback = function () {
-        view.didTransitionOut();
+      var callback = function (data) {
+        if (!data.isCancelled) {
+          view.didTransitionOut();
+        }
       };
 
       // Animate through the frames.

data/lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js

@@ -335,8 +335,11 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
   */
   // TODO: this seems to do almost the same thing as fieldDidBlur
   blurEditor: function(evt) {
-    if (!this.get('isEditing')) return YES ;
-    return this.commitOnBlur ? this.commitEditing() : this.discardEditing();
+    if (this.get('isEditing')) {
+      return this.commitOnBlur ? this.commitEditing() : this.discardEditing();
+    } else {
+      return true;
+    }
   },
 
   /**
@@ -436,7 +439,6 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
   insertTab: function(evt) {
     var target = this.target; // removed by commitEditing()
     this.resignFirstResponder();
-    this.commitEditing() ;
     if(target){
       var next = target.get('nextValidKeyView');
       if(next && next.beginEditing) next.beginEditing();
@@ -448,7 +450,6 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.InlineEditor,
   insertBacktab: function(evt) {
     var target = this.target; // removed by commitEditing()
     this.resignFirstResponder();
-    this.commitEditing() ;
     if(target){
       var prev = target.get('previousValidKeyView');
       if(prev && prev.beginEditing) prev.beginEditing();

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

@@ -59,7 +59,7 @@ window.SproutCore = window.SproutCore || SC;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.10.2';
+SC.VERSION = '1.10.3';
 
 /**
   @private

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -1179,7 +1179,7 @@ SC.Observable = /** @scope SC.Observable.prototype */{
           // observer during that round of notification.  Similarly, if you're
           // added as an observer during the notification round by another
           // observer, you will not be notified until the next time.)
-          members = SC.clone(observers.getMembers());
+          members = observers.getMembers();
           membersLength = members.length;
           for (memberLoc = 0; memberLoc < membersLength; memberLoc++) {
             member = members[memberLoc];
@@ -1224,7 +1224,7 @@ SC.Observable = /** @scope SC.Observable.prototype */{
         if (starObservers && key !== '*') {
           // We clone the structure per the justification, above, for regular
           // observers.
-          members = SC.clone(starObservers.getMembers());
+          members = starObservers.getMembers();
           membersLength = members.length;
           for (memberLoc = 0; memberLoc < membersLength; memberLoc++) {
             member = members[memberLoc];

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -267,6 +267,12 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   beget: function (fromPath) {
     var ret = SC.beget(this);
     ret.parentBinding = this;
+    // Logic gates must be recreated on beget.
+    if (ret._LogicGate) {
+      ret._logicGate = ret._LogicGate.create(ret._logicGateHash);
+      ret = ret.from('logicProperty', ret._logicGate).oneWay();
+    }
+    // Enables duplicate API calls for SC.Binding.beget and SC.Binding.from
     if (fromPath !== undefined) ret = ret.from(fromPath);
     return ret;
   },
@@ -471,8 +477,13 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     // Mark it destroyed.
     this.isDestroyed = YES;
 
-    // Destroy the logic gate, if any. (See and & or methods.)
-    if (this._logicGate) this._logicGate.destroy();
+    // Clean up the logic gate, if any. (See logic gate methods.)
+    if (this._logicGate) {
+      this._logicGate.destroy();
+      this._logicGate = null;
+      this._LogicGate = null;
+      this._logicGateHash = null;
+    }
 
     // Disconnect the binding.
     this.disconnect();
@@ -494,6 +505,20 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   fromPropertyDidChange: function (target, key) {
     var v = target ? target.get(key) : null;
 
+    // In rare circumstances, getting a property can result in observers firing,
+    // which may in turn run code that disconnects the binding. The cause of
+    // this pattern has been difficult to determine and so until a concrete test
+    // scenario and a lower level fix can be found, show a warning and ignore
+    // the update.
+    if (!this.isConnected) {
+      //@if(debug)
+      SC.Logger.warn("Developer Warning: A binding attempted to update after it was disconnected. The update will be ignored for binding: %@".fmt(this._fromPropertyPath, this._fromTarget, this));
+      //@endif
+
+      // Break early.
+      return;
+    }
+
     // if the new value is different from the current binding value, then
     // schedule to register an update.
     if (v !== this._bindingValue || key === '[]') {
@@ -523,6 +548,20 @@ SC.Binding = /** @scope SC.Binding.prototype */{
 
     var v = target.get(key);
 
+    // In rare circumstances, getting a property can result in observers firing,
+    // which may in turn run code that disconnects the binding. The cause of
+    // this pattern has been difficult to determine and so until a concrete test
+    // scenario and a lower level fix can be found, show a warning and ignore
+    // the update.
+    if (!this.isConnected) {
+      //@if(debug)
+      SC.Logger.warn("Developer Warning: A binding attempted to update after it was disconnected. The update will be ignored for binding: %@".fmt(this));
+      //@endif
+
+      // Break early.
+      return;
+    }
+
     // if the new value is different from the current binding value, then
     // schedule to register an update.
     if (v !== this._transformedBindingValue) {
@@ -773,7 +812,7 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       if (tuple) {
         this._toTarget = tuple[0];
         this._toPropertyKey = tuple[1];
-        // Hook up _logicGate if needed (see and & or methods).
+        // Hook up _logicGate if needed (see logic gate methods).
         if (this._logicGate) {
           this._logicGate.set('localObject', this._toTarget);
         }
@@ -978,112 +1017,117 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   },
 
   /**
-    Adds a transform that forwards the logical 'AND' of values at 'pathA' and
-    'pathB' whenever either source changes.  Note that the transform acts strictly
-    as a one-way binding, working only in the direction
-
-      'pathA' AND 'pathB' --> value  (value returned is the result of ('pathA' && 'pathB'))
+    Adds a transform to convert the value to the inverse of a bool value.  This
+    uses the same transform as bool() but inverts it.
 
-    Usage example where a delete button's 'isEnabled' value is determined by whether
-    something is selected in a list and whether the current user is allowed to delete:
+    @param {String} [fromPath]
+    @returns {SC.Binding} this
+  */
+  not: function (fromPath) {
+    return this.from(fromPath).transform(function (v) {
+      var t = SC.typeOf(v);
+      if (t === SC.T_ERROR) return v;
+      return !((t == SC.T_ARRAY) ? (v.length > 0) : (v === '') ? NO : !!v);
+    });
+  },
 
-      deleteButton: SC.ButtonView.design({
-        isEnabledBinding: SC.Binding.and('MyApp.itemsController.hasSelection', 'MyApp.userController.canDelete')
-      })
+  /**
+    Adds a transform that will return YES if the value is null or undefined, NO otherwise.
 
-    @param {String} pathA The first part of the conditional
-    @param {String} pathB The second part of the conditional
+    @param {String} [fromPath]
+    @returns {SC.Binding} this
   */
-  and: function (pathA, pathB) {
+  isNull: function (fromPath) {
+    return this.from(fromPath).transform(function (v) {
+      var t = SC.typeOf(v);
+      return (t === SC.T_ERROR) ? v : SC.none(v);
+    });
+  },
 
-    // If either path is local, append the localObject path to it.
+  /* @private Used with the logic gate bindings. */
+  _LogicGateAnd: SC.Object.extend({
+    logicProperty: function() {
+      return (this.get('valueA') && this.get('valueB'));
+    }.property('valueA', 'valueB').cacheable()
+  }),
+  /* @private Used with the logic gate bindings. */
+  _LogicGateOr: SC.Object.extend({
+    logicProperty: function() {
+      return (this.get('valueA') || this.get('valueB'));
+    }.property('valueA', 'valueB').cacheable()
+  }),
+  /* @private Used by logic gate bindings. */
+  _logicGateBinding: function (gateClass, pathA, pathB) {
+    // If either path is local, remove any * chains and append the localObject path to it.
     if (pathA.indexOf('*') === 0 || pathA.indexOf('.') === 0) {
-      pathA = '*localObject.' + pathA.slice(1);
+      pathA = pathA.slice(1).replace(/\*/g, '.');
+      pathA = '*localObject.' + pathA;
     }
     if (pathB.indexOf('*') === 0 || pathB.indexOf('.') === 0) {
-      pathB = '*localObject.' + pathB.slice(1);
+      pathB = pathB.slice(1).replace(/\*/g, '.');
+      pathB = '*localObject.' + pathB;
     }
 
-    // create an object to do the logical computation
-    var gate = SC.Object.create({
-      localObject: null,
-
-      valueABinding: SC.Binding.oneWay(pathA),
-      valueBBinding: SC.Binding.oneWay(pathB),
-
-      and: function () {
-        return (this.get('valueA') && this.get('valueB'));
-      }.property('valueA', 'valueB').cacheable()
-    });
-
-    // add a transform that depends on the result of that computation.
-    var ret = this.from('and', gate).oneWay();
+    // Gets the gate class and instantiates a nice copy.
+    var gateHash = {
+          localObject: null,
+          valueABinding: SC.Binding.oneWay(pathA),
+          valueBBinding: SC.Binding.oneWay(pathB)
+        },
+        gate = gateClass.create(gateHash);
+
+    // Creates and populates the return binding.
+    var ret = this.from('logicProperty', gate).oneWay();
+    // This is all needed later on by beget, which must create a new logic gate instance
+    // or risk bad behavior.
+    ret._LogicGate = gateClass;
+    ret._logicGateHash = gateHash;
     ret._logicGate = gate;
+
+    // On our way.
     return ret;
   },
 
   /**
-    Adds a transform that forwards the 'OR' of values at 'pathA' and
+    Adds a transform that forwards the logical 'AND' of values at 'pathA' and
     'pathB' whenever either source changes.  Note that the transform acts strictly
     as a one-way binding, working only in the direction
 
-      'pathA' AND 'pathB' --> value  (value returned is the result of ('pathA' || 'pathB'))
+      'pathA' AND 'pathB' --> value  (value returned is the result of ('pathA' && 'pathB'))
+
+    Usage example where a delete button's 'isEnabled' value is determined by whether
+    something is selected in a list and whether the current user is allowed to delete:
+
+      deleteButton: SC.ButtonView.design({
+        isEnabledBinding: SC.Binding.and('MyApp.itemsController.hasSelection', 'MyApp.userController.canDelete')
+      })
 
     @param {String} pathA The first part of the conditional
     @param {String} pathB The second part of the conditional
   */
-  or: function (pathA, pathB) {
-    // If either path is local, append the localObject path to it.
-    if (pathA.indexOf('*') === 0 || pathA.indexOf('.') === 0) {
-      pathA = '*localObject.' + pathA.slice(1);
-    }
-    if (pathB.indexOf('*') === 0 || pathB.indexOf('.') === 0) {
-      pathB = '*localObject.' + pathB.slice(1);
-    }
-
-    // create an object to the logical computation
-    var gate = SC.Object.create({
-      localObject: null,
-      
-      valueABinding: pathA,
-      valueBBinding: pathB,
-
-      or: function () {
-        return (this.get('valueA') || this.get('valueB'));
-      }.property('valueA', 'valueB').cacheable()
-    });
-
-    var ret = this.from('or', gate).oneWay();
-    ret._logicGate = gate;
-    return ret;
+  and: function (pathA, pathB) {
+    return this._logicGateBinding(this._LogicGateAnd, pathA, pathB);
   },
 
   /**
-    Adds a transform to convert the value to the inverse of a bool value.  This
-    uses the same transform as bool() but inverts it.
+    Adds a transform that forwards the 'OR' of values at 'pathA' and
+    'pathB' whenever either source changes.  Note that the transform acts strictly
+    as a one-way binding, working only in the direction
 
-    @param {String} [fromPath]
-    @returns {SC.Binding} this
-  */
-  not: function (fromPath) {
-    return this.from(fromPath).transform(function (v) {
-      var t = SC.typeOf(v);
-      if (t === SC.T_ERROR) return v;
-      return !((t == SC.T_ARRAY) ? (v.length > 0) : (v === '') ? NO : !!v);
-    });
-  },
+      'pathA' OR 'pathB' --> value  (value returned is the result of ('pathA' || 'pathB'))
 
-  /**
-    Adds a transform that will return YES if the value is null or undefined, NO otherwise.
+    Usage example where a delete button's 'isEnabled' value is determined by if the
+    content is editable, or if the user has admin rights:
 
-    @param {String} [fromPath]
-    @returns {SC.Binding} this
+      deleteButton: SC.ButtonView.design({
+        isEnabledBinding: SC.Binding.or('*content.isEditable', 'MyApp.userController.isAdmin')
+      })
+
+    @param {String} pathA The first part of the conditional
+    @param {String} pathB The second part of the conditional
   */
-  isNull: function (fromPath) {
-    return this.from(fromPath).transform(function (v) {
-      var t = SC.typeOf(v);
-      return (t === SC.T_ERROR) ? v : SC.none(v);
-    });
+  or: function (pathA, pathB) {
+    return this._logicGateBinding(this._LogicGateOr, pathA, pathB);
   },
 
   toString: function () {