sproutcore 1.10.0.rc.3 → 1.10.0

data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -40,6 +40,42 @@ sc_require('system/query');
 SC.Record = SC.Object.extend(
 /** @scope SC.Record.prototype */ {
 
+  //@if(debug)
+  /* BEGIN DEBUG ONLY PROPERTIES AND METHODS */
+  /** @private
+    Creates string representation of record, with status.
+
+    @returns {String}
+  */
+
+  toString: function() {
+    // We won't use 'readOnlyAttributes' here because accessing them directly
+    // avoids a SC.clone() -- we'll be careful not to edit anything.
+    var attrs = this.get('store').readDataHash(this.get('storeKey'));
+    return "%@(%@) %@".fmt(this.constructor.toString(), SC.inspect(attrs), this.statusString());
+  },
+
+  /** @private
+    Creates string representation of record, with status.
+
+    @returns {String}
+  */
+
+  statusString: function() {
+    var ret = [], status = this.get('status');
+
+    for(var prop in SC.Record) {
+      if(prop.match(/[A-Z_]$/) && SC.Record[prop]===status) {
+        ret.push(prop);
+      }
+    }
+
+    return ret.join(" ");
+  },
+
+  /* END DEBUG ONLY PROPERTIES AND METHODS */
+  //@endif
+
   /**
     Walk like a duck
 
@@ -814,37 +850,6 @@ SC.Record = SC.Object.extend(
     return sc_super();
   },
 
-  /** @private
-    Creates string representation of record, with status.
-
-    @returns {String}
-  */
-
-  toString: function() {
-    // We won't use 'readOnlyAttributes' here because accessing them directly
-    // avoids a SC.clone() -- we'll be careful not to edit anything.
-    var attrs = this.get('store').readDataHash(this.get('storeKey'));
-    return "%@(%@) %@".fmt(this.constructor.toString(), SC.inspect(attrs), this.statusString());
-  },
-
-  /** @private
-    Creates string representation of record, with status.
-
-    @returns {String}
-  */
-
-  statusString: function() {
-    var ret = [], status = this.get('status');
-
-    for(var prop in SC.Record) {
-      if(prop.match(/[A-Z_]$/) && SC.Record[prop]===status) {
-        ret.push(prop);
-      }
-    }
-
-    return ret.join(" ");
-  },
-
   /**
     Registers a child record with this parent record.
 
@@ -1501,4 +1506,4 @@ SC.Record.mixin( /** @scope SC.Record */ {
     if(SC.Query) SC.Query._scq_didDefineRecordType(ret);
     return ret ;
   }
-}) ;
+});

data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js

@@ -580,17 +580,10 @@ SC.RecordAttribute.registerTransform(Date, {
 });
 
 if (SC.DateTime && !SC.RecordAttribute.transforms[SC.guidFor(SC.DateTime)]) {
+
   /**
     Registers a transform to allow `SC.DateTime` to be used as a record
     attribute, ie `SC.Record.attr(SC.DateTime);`
-
-    Because `SC.RecordAttribute` is in the datastore framework and
-    `SC.DateTime` in the foundation framework, and we don't know which
-    framework is being loaded first, this chunck of code is duplicated in
-    both frameworks.
-
-    IF YOU EDIT THIS CODE MAKE SURE YOU COPY YOUR CHANGES to
-    `record_attribute.js.`
   */
 
   SC.RecordAttribute.registerTransform(SC.DateTime, {

data/lib/frameworks/sproutcore/frameworks/desktop/panes/modal.js

@@ -90,9 +90,10 @@ SC.ModalPane = SC.Pane.extend(
   */
   _hideShowTextfields: function(pane, focusable){
     var view;
-    for(view in SC.View.views){
+
+    for (view in SC.View.views) {
       view = SC.View.views[view];
-      if (view!==pane && view.get('pane')===pane && view.get('isTextField')){
+      if (view.get('isTextField') && view !== pane && view.get('pane') === pane) {
         if (focusable) {
           // Setting isBrowserFocusable back to YES. If we cached the previous
           // value, use that instead.

data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js

@@ -201,11 +201,10 @@ SC.PanelPane = SC.Pane.extend(
   _isModalDidChange: function() {
     var pane, isModal = this.get('isModal');
     if (isModal) {
-       if (!this._isShowingModal && this.get('isVisibleInWindow') && (pane = this._modalPane())) {
-         this._isShowingModal = YES;
-         pane.paneWillAppend(this);
-       }
-
+      if (!this._isShowingModal && this.get('viewState') & SC.CoreView.IS_SHOWN && (pane = this._modalPane())) {
+        this._isShowingModal = YES;
+        pane.paneWillAppend(this);
+      }
     } else {
       if (this._isShowingModal && (pane = this._modalPane())) {
         this._isShowingModal = NO ;

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js

@@ -14,8 +14,7 @@ var pane ;
 test("verify panel content container is visible at correct location with right size", function() {
   pane = SC.PanelPane.create({
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
-    contentView: SC.View.extend({
-    })
+    contentView: SC.View
   });
   pane.append();
 
@@ -42,8 +41,7 @@ test("verify panel content container is visible at correct location with right s
 test("Verify panel pane has aria role set", function() {
   var pane = SC.PanelPane.create({
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
-    contentView: SC.View.extend({
-    })
+    contentView: SC.View
   });
   pane.append();
 
@@ -56,8 +54,7 @@ test("Verify panel pane has aria role set", function() {
 test("Verify panel pane has aria-label attribute set, when ariaLabel is provided", function() {
   var pane = SC.PanelPane.create({
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
-    contentView: SC.View.extend({
-    }),
+    contentView: SC.View,
     ariaLabel: "Panel is labelled by this value for voiceover"
   });
   pane.append();
@@ -68,3 +65,53 @@ test("Verify panel pane has aria-label attribute set, when ariaLabel is provided
   pane.destroy();
 });
 
+test("Verify panel pane's modal pane lifecycle", function() {
+  var pane = SC.PanelPane.create({
+    contentView: SC.View,
+    modalPane: SC.ModalPane,
+    isModal: YES
+  });
+  ok(pane.get('modalPane').isClass, "Modal pane class is not instantiated before is panel is appended.");
+  pane.append();
+  var modal = pane.get('modalPane');
+  ok(!modal.isClass, "Modal pane class is instantiated when the panel is appended.");
+  ok(modal.get('viewState') === SC.CoreView.ATTACHED_SHOWN, "Modal pane appends when panel pane is appended.");
+  pane.remove();
+  ok(modal.get('viewState') & SC.CoreView.UNATTACHED, "Modal pane is removed when panel pane is removed.");
+  pane.destroy();
+  ok(modal.get('isDestroyed'), "Modal pane is destroyed when its panel pane is destroyed.");
+
+});
+
+test("Verify SC.PanelPane#isModal", function() {
+  SC.RunLoop.begin();
+  var pane = SC.PanelPane.create({
+    contentView: SC.View,
+    modalPane: SC.ModalPane.create(),
+    isModal: NO
+  });
+  pane.append();
+  equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not use modal pane when isModal is NO");
+  pane.set('isModal', YES);
+  equals(pane.getPath('modalPane.viewState'), SC.CoreView.ATTACHED_SHOWN, "Panel pane appends modal pane when isModal becomes YES");
+  pane.set('isModal', NO);
+  equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNATTACHED, "Panel pane removes modal pane when isModal becomes NO");
+
+
+  pane.destroy()
+
+  // Tests an edge case where isModal turns YES during a transition out.
+  pane = SC.PanelPane.create({
+    contentView: SC.View,
+    modalPane: SC.ModalPane.create(),
+    isModal: NO,
+    transitionOut: SC.View.FADE_OUT,
+    transitionOutOptions: { duration: 0.1 }
+  });
+  pane.append();
+  pane.remove(); // trigger transition and then willRemoveFromDocument
+  pane.set('isModal', YES);
+  equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not add modal pane when isModal becomes YES while transitioning out");
+  pane.destroy();
+  SC.RunLoop.end();
+});

data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js

@@ -2781,7 +2781,7 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
 
   /**
     Implements the SC.DropTarget protocol.  Hides any visible insertion
-    point and clears some cached values. 
+    point and clears some cached values.
   */
   dragExited: function () {
     this.hideInsertionPoint();
@@ -2945,6 +2945,9 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     };
   },
 
+  /* @private Internal property used to track the rate of touch scroll change events. */
+  _lastTouchScrollTime: null,
+
   /** @private SC.ScrollView */
   touchScrollDidChange: function (left, top) {
     // Fast path!  Don't try to update too soon.
@@ -2958,8 +2961,11 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
 
     // Indicate that nowShowing should be re-computed (this will use the
     // in-scroll clipping frame when it does).
-    this.notifyPropertyChange('nowShowing');
-    this.invokeOnce('_cv_nowShowingDidChange');
+    // TODO: perform a raw update that doesn't require the run loop.
+    SC.run(function () {
+      this.notifyPropertyChange('nowShowing');
+      this.invokeOnce('_cv_nowShowingDidChange');
+    }, this);
 
     // Track the last time we updated.
     this._lastTouchScrollTime = Date.now();

data/lib/frameworks/sproutcore/frameworks/desktop/views/grid.js

@@ -257,7 +257,7 @@ SC.GridView = SC.ListView.extend(
 
     // A change to the width of the frame is the only variable that
     // alters the layout of item views and our computed layout.
-    if (lastFrameWidth && width !== lastFrameWidth) {
+    if (!SC.none(lastFrameWidth) && width !== lastFrameWidth) {
       var itemView,
         nowShowing = this.get('nowShowing');
 

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js

@@ -1166,13 +1166,14 @@ SC.ScrollView = SC.View.extend({
         needsScrollEnd = NO,
         contentWidth = 0,
         contentHeight = 0,
+        existingTouch = this.touch,
         viewFrame,
         view;
 
-    if (this.touch && this.touch.timeout) {
-      // clear the timeout
-      clearTimeout(this.touch.timeout);
-      this.touch.timeout = null;
+    if (existingTouch && !SC.none(existingTouch.animationID)) {
+      // If a deceleration calculation is queued to run, we need to cancel it so
+      // it doesn't run after we begin touch tracking again.
+      window.cancelAnimationFrame(existingTouch.animationID);
 
       // get the scroll offsets
       startClipOffsetX = this.touch.startClipOffset.x;
@@ -1295,6 +1296,7 @@ SC.ScrollView = SC.View.extend({
   /** @private */
   touchesDragged: function (evt) {
     var avg = evt.averagedTouchesForView(this);
+
     this.updateTouchScroll(avg.x, avg.y, avg.d, evt.timeStamp);
   },
 
@@ -1484,7 +1486,7 @@ SC.ScrollView = SC.View.extend({
     var touchStatus = this.touch;
 
     // if we are decelerating, we don't want to stop that. That would be bad. Because there's no point.
-    if (!touchStatus || !touchStatus.timeout) {
+    if (!touchStatus || !touchStatus.animationID) {
       this.beginPropertyChanges();
       this.set("scale", this._scale);
       this.set("verticalScrollOffset", this._scroll_verticalScrollOffset);
@@ -1509,7 +1511,7 @@ SC.ScrollView = SC.View.extend({
       y: touch.scrollVelocity.y * 10
     };
 
-    window.requestAnimationFrame(function () {
+    touch.animationID = window.requestAnimationFrame(function () {
       self.decelerateAnimation();
     });
   },
@@ -1547,7 +1549,7 @@ SC.ScrollView = SC.View.extend({
     return velocity;
   },
 
-  /** @private */
+  /** @private Decelerates the scrolling smoothly. */
   decelerateAnimation: function () {
     // get a bunch of properties. They are named well, so not much explanation of what they are...
     // However, note maxOffsetX/Y takes into account the scale;
@@ -1689,8 +1691,8 @@ SC.ScrollView = SC.View.extend({
     var absXVelocity = Math.abs(touch.decelerationVelocity.x),
         absYVelocity = Math.abs(touch.decelerationVelocity.y);
     if (absYVelocity < 0.05 && absXVelocity < 0.05 && Math.abs(sv) < 0.05) {
-      // we can reset the timeout, as it will no longer be required, and we don't want to re-cancel it later.
-      touch.timeout = null;
+      // We can reset the animation id, as it will no longer be required, and we don't want to accidentally try to cancel it later.
+      touch.animationID = null;
       this.touch = null;
 
       // trigger scroll end
@@ -1710,11 +1712,13 @@ SC.ScrollView = SC.View.extend({
     // We now set up the next round. We are doing this as raw as we possibly can, not touching the
     // run loop at all. This speeds up performance drastically--keep in mind, we're on comparatively
     // slow devices, here. So, we'll just make a closure, saving "this" into "self" and calling
-    // 10ms later (or however long it takes). Note also that we save both the last event time
-    // (so we may calculate elapsed time) and the timeout we are creating, so we may cancel it in future.
+    // 10ms later (or however long it takes).
+
+    // Note also that we save both the last event time (so we may calculate elapsed time) and the animation
+    // id we are creating, so we may cancel it in future.
     var self = this;
     touch.lastEventTime = Date.now();
-    window.requestAnimationFrame(function () {
+    touch.animationID = window.requestAnimationFrame(function () {
       SC.run(self.decelerateAnimation(), self);
     });
   },

data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js

@@ -357,12 +357,26 @@ SC.ScrollerView = SC.View.extend(
 
   /** @private */
   touchScrollDidEnd: function(value) {
-    this.set("_touchScrollValue", NO);
+    SC.run(function () {
+      this.set("_touchScrollValue", NO);
+    }, this);
   },
 
+  /* @private Internal property used to track the rate of touch scroll change events. */
+  _lastTouchScrollTime: null,
+
   /** @private */
   touchScrollDidChange: function(value) {
-    this.set("_touchScrollValue", value);
+    // Fast path!  Don't try to update too soon.
+    if (Date.now() - this._lastTouchScrollTime < 30) { return; }
+
+    // TODO: perform a raw update that doesn't require the run loop.
+    SC.run(function () {
+      this.set("_touchScrollValue", value);
+    }, this);
+
+    // Track the last time we updated.
+    this._lastTouchScrollTime = Date.now();
   },
 
   // ..........................................................

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js

@@ -156,12 +156,14 @@ SC.AutoResize = {
   */
   measuredSizeDidChange: function() {
     var measuredSize = this.get('measuredSize'),
-    calculatedWidth = measuredSize.width, calculatedHeight = measuredSize.height,
-    paddingHeight, paddingWidth,
-    autoResizePadding = this.get('autoResizePadding') || 0,
-    maxWidth = this.get('maxWidth'), maxHeight = this.get('maxHeight');
-
-    if(SC.typeOf(autoResizePadding) === SC.T_NUMBER) {
+      calculatedWidth = measuredSize.width,
+      calculatedHeight = measuredSize.height,
+      paddingHeight, paddingWidth,
+      autoResizePadding = this.get('autoResizePadding') || 0,
+      maxWidth = this.get('maxWidth'),
+      maxHeight = this.get('maxHeight');
+
+    if (SC.typeOf(autoResizePadding) === SC.T_NUMBER) {
       paddingHeight = paddingWidth = autoResizePadding;
     } else {
       paddingHeight = autoResizePadding.height;
@@ -171,7 +173,7 @@ SC.AutoResize = {
     calculatedHeight += paddingHeight;
     calculatedWidth += paddingWidth;
 
-    if(this.get('shouldAutoResize')) {
+    if (this.get('shouldAutoResize')) {
       // if we are allowed to autoresize, adjust the layout
       if (this.get('shouldResizeWidth')) {
         if (maxWidth && calculatedWidth > maxWidth) {
@@ -254,7 +256,7 @@ SC.AutoResize = {
         cachedMetrics = this.get('_cachedMetrics'),
         maxFontSize = this.get('maxFontSize');
 
-    if(!layer) return;
+    if (!layer) return;
 
     // There are three special cases.
     //   - size is cached: the cached size is used with no measurement

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/auto_resize_test.js

@@ -0,0 +1,102 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module, test, equals,ok */
+
+var view;
+
+/** Test the SC.View states. */
+module("SC.AutoResize", {
+
+  setup: function () {
+    view = SC.LabelView.create(SC.AutoResize, {
+      layout: { left: 0, height: 40},
+      value: "The bottom line, Williams said, is that the internet is “a giant machine designed to give people what they want.” It’s not a utopia. It’s not magical. It’s simply an engine of convenience. Those who can tune that engine well — who solve basic human problems with greater speed and simplicity than those who came before — will profit immensely. Those who lose sight of basic human needs — who want to give people the next great idea — will have problems. “We often think of the internet enables you to do new things,” Williams said. “But people just want to do the same things they’ve always done.”"
+    });
+  },
+
+  teardown: function () {
+    view.destroy();
+    view = null;
+  }
+
+});
+
+test("Resize with transition plugin - no conflict", function () {
+  stop(700);
+
+  var pane = SC.Pane.create({
+    layout: { top: 200, left: 0, width: 200, height: 200 }
+  });
+
+  view.set('transitionIn', SC.View.SLIDE_IN);
+
+  SC.run(function () {
+    pane.appendChild(view);
+    equals(view.get('layout').width, 10, 'width is');
+    equals(view.get('layout').left, 0, 'left is');
+    pane.append();
+  });
+
+  setTimeout(function () {
+    ok(view.get('layout').width > 2000, 'width is > 2000');
+    equals(view.get('layout').left, 0, 'left is');
+
+    pane.destroy();
+    pane.remove();
+
+    start();
+  }, 500);
+});
+
+test("Resize with transition plugin - conflict", function () {
+  stop(2000);
+
+  var pane = SC.Pane.create({
+    layout: { top: 200, left: 0, width: 200, height: 200 }
+  });
+
+  view.set('transitionIn', {
+    setup: function (view, options, finalLayout, finalFrame) {
+      view.adjust({ width: 100 });
+    },
+
+    // Width transition plugin.
+    run: function (view, options, finalLayout, finalFrame) {
+      view.animate('width', finalFrame.width, { duration: 0.5 }, function (data) {
+        this.didTransitionIn();
+      });
+    }
+  });
+
+  SC.run(function () {
+    pane.appendChild(view);
+    equals(view.get('layout').width, 10, 'width is');
+    pane.append();
+  });
+
+  setTimeout(function () {
+    var jqEl = view.$();
+
+    ok(jqEl.width() > 10, 'width is > 10: %@'.fmt(jqEl.width()));
+    ok(jqEl.width() < 3000, 'width is < 3000: %@'.fmt(jqEl.width()));
+    ok(view.get('layout').width > 3000, 'layout.width is > 3000: %@'.fmt(view.get('layout').width));
+  }, 200);
+
+  setTimeout(function () {
+    var jqEl = view.$();
+    ok(jqEl.width() > 3000, 'width is > 3000: %@'.fmt(jqEl.width()));
+    ok(view.get('layout').width > 3000, 'width is > 3000: %@'.fmt(view.get('layout').width));
+
+    SC.run(function () {
+      pane.destroy();
+      pane.remove();
+    });
+
+    start();
+  }, 700);
+});