sproutcore 1.11.0.rc1 → 1.11.0.rc2

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

@@ -56,7 +56,7 @@ SC.DRAG_REORDER = 0x0010;
   @extends SC.CollectionContent
   @since SproutCore 0.9
 */
-SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionContent,
+SC.CollectionView = SC.View.extend(SC.ActionSupport, SC.CollectionViewDelegate, SC.CollectionContent,
 /** @scope SC.CollectionView.prototype */ {
 
   /** @private */
@@ -472,13 +472,9 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     If you do not specify an action, then the collection view will also try to
     invoke the action named on the target item view.
 
-    Older versions of SproutCore expected the action property to contain an
-    actual function that would be run.  This format is still supported but is
-    deprecated for future use.  You should generally use the responder chain
-    to handle your action for you.
-
     @type String
     @default null
+    @see SC.ActionSupport
   */
   action: null,
 
@@ -490,9 +486,6 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
     This can be either an actual object or a property path that will resolve
     to an object at the time that the action is invoked.
 
-    This property is ignored if you use the deprecated approach of making the
-    action property a function.
-
     @type String|Object
     @default null
   */
@@ -3240,17 +3233,17 @@ SC.CollectionView = SC.View.extend(SC.CollectionViewDelegate, SC.CollectionConte
   */
   _cv_action: function(view, evt, context) {
     var action = this.get('action');
-    var target = this.get('target') || null;
 
     this._cv_actionTimer = null;
     if (action) {
-      // if the action is a function, just call it
-      if (SC.typeOf(action) === SC.T_FUNCTION) return this.action(view, evt) ;
 
-      // otherwise, use the new sendAction style
-      var pane = this.get('pane') ;
-      if (pane) {
-        pane.rootResponder.sendAction(action, target, this, pane, context);
+      // Legacy support for action functions.
+      if (action && (SC.typeOf(action) === SC.T_FUNCTION)) {
+        return this.action(view, evt);
+
+      // Use SC.ActionSupport.
+      } else {
+        return this.fireAction(context);
       }
 
     // if no action is specified, then trigger the support action,

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

@@ -187,10 +187,10 @@ SC.ScrollView = SC.View.extend({
   _sc_scale: null,
 
   /** @private Flag used to indicate when we should resize the content width manually. */
-  _sc_shouldResizeContentWidth: false,
+  // _sc_shouldResizeContentWidth: false,
 
   /** @private Flag used to indicate when we should resize the content height manually. */
-  _sc_shouldResizeContentHeight: false,
+  // _sc_shouldResizeContentHeight: false,
 
   /** @private The offset center x of a multi-touch gesture. */
   _sc_touchCenterX: null,
@@ -944,27 +944,34 @@ SC.ScrollView = SC.View.extend({
   _sc_containerViewFrameDidChange: function () {
     // Run the content view size change code (updates min & max offsets, sets content alignment if necessary, shows scrollers if necessary)
     var containerFrame = this.getPath('containerView.frame'),
-      contentView = this.get('contentView');
+      contentView = this.get('contentView'),
+      lastMaximumHorizontalScrollOffset = this.get('maximumHorizontalScrollOffset'),
+      lastMaximumVerticalScrollOffset = this.get('maximumVerticalScrollOffset'),
+      lastMinimumHorizontalScrollOffset = this.get('minimumHorizontalScrollOffset'),
+      lastMinimumVerticalScrollOffset = this.get('minimumVerticalScrollOffset');
 
     // Cache the current height and width of the container view, so we can only watch for size changes.
+    // This will update the maximum scroll offsets when they are requested.
     this.set('_sc_containerHeight', containerFrame.height);
     this.set('_sc_containerWidth', containerFrame.width);
 
     if (contentView) {
-      var didAdjust = false;
+      // var didAdjust = false;
 
-      if (this._sc_shouldResizeContentHeight) {
-        contentView.adjust('height', containerFrame.height);
-        didAdjust = true;
-      }
+      // if (this._sc_shouldResizeContentHeight) {
+      //   contentView.adjust('height', containerFrame.height);
+      //   didAdjust = true;
+      // }
 
-      if (this._sc_shouldResizeContentWidth) {
-        contentView.adjust('width', containerFrame.width);
-        didAdjust = true;
-      }
+      // if (this._sc_shouldResizeContentWidth) {
+      //   contentView.adjust('width', containerFrame.width);
+      //   didAdjust = true;
+      // }
 
       // Update the scrollers regardless.
-      if (!didAdjust) { this._sc_contentViewSizeDidChange(); }
+      // if (!didAdjust) {
+      this._sc_contentViewSizeDidChange(lastMinimumHorizontalScrollOffset, lastMaximumHorizontalScrollOffset, lastMinimumVerticalScrollOffset, lastMaximumVerticalScrollOffset);
+      // }
     }
 
   },
@@ -979,8 +986,8 @@ SC.ScrollView = SC.View.extend({
     this._sc_removeContentViewObservers();
 
     // Reset caches.
-    this._sc_shouldResizeContentWidth = false;
-    this._sc_shouldResizeContentHeight = false;
+    // this._sc_shouldResizeContentWidth = false;
+    // this._sc_shouldResizeContentHeight = false;
     this._sc_contentHeight = 0;
     this._sc_contentWidth = 0;
     this._sc_contentScale = 1;
@@ -1004,29 +1011,29 @@ SC.ScrollView = SC.View.extend({
 
         // When a view wants an accelerated layer and isn't a fixed size, we convert it to a fixed
         // size and resize it when our container resizes.
-        if (!newView.get('isFixedSize')) {
-          var contentViewLayout = newView.get('layout');
-
-          // Fix the width.
-          if (contentViewLayout.width == null) {
-            this._sc_shouldResizeContentWidth = true; // Flag to indicate that when the container's width changes, we should update the content's width.
-
-            newView.adjust({
-              right: null,
-              width: this._sc_containerWidth
-            });
-          }
-
-          // Fix the height.
-          if (contentViewLayout.height == null) {
-            this._sc_shouldResizeContentHeight = true; // Flag to indicate that when the container's height changes, we should update the content's height.
-
-            newView.adjust({
-              bottom: null,
-              height: this._sc_containerHeight
-            });
-          }
-        }
+        // if (newView.get('wantsAcceleratedLayer') && !newView.get('isFixedSize')) {
+        //   var contentViewLayout = newView.get('layout');
+
+        //   // Fix the width.
+        //   if (contentViewLayout.width == null) {
+        //     this._sc_shouldResizeContentWidth = true; // Flag to indicate that when the container's width changes, we should update the content's width.
+
+        //     newView.adjust({
+        //       right: null,
+        //       width: this._sc_containerWidth
+        //     });
+        //   }
+
+        //   // Fix the height.
+        //   if (contentViewLayout.height == null) {
+        //     this._sc_shouldResizeContentHeight = true; // Flag to indicate that when the container's height changes, we should update the content's height.
+
+        //     newView.adjust({
+        //       bottom: null,
+        //       height: this._sc_containerHeight
+        //     });
+        //   }
+        // }
       }
 
       // TODO: Can we remove this if a calculated property exists?
@@ -1050,7 +1057,11 @@ SC.ScrollView = SC.View.extend({
     var lastHeight = this._sc_contentHeight,
         lastScale = this._sc_contentScale,
         lastWidth = this._sc_contentWidth,
-        newFrame = this.getPath('contentView.borderFrame');
+        newFrame = this.getPath('contentView.borderFrame'),
+        lastMaximumHorizontalScrollOffset = this.get('maximumHorizontalScrollOffset'),
+        lastMaximumVerticalScrollOffset = this.get('maximumVerticalScrollOffset'),
+        lastMinimumHorizontalScrollOffset = this.get('minimumHorizontalScrollOffset'),
+        lastMinimumVerticalScrollOffset = this.get('minimumVerticalScrollOffset');
 
     if (newFrame) {
       // Determine whether the scale has changed.
@@ -1071,14 +1082,13 @@ SC.ScrollView = SC.View.extend({
 
       // If any of the size values changed, update.
       if (this._sc_contentScaleDidChange || this._sc_contentWidthDidChange || this._sc_contentHeightDidChange) {
-        // Filter the observer input.
-        this.invokeOnce(this._sc_contentViewSizeDidChange);
+        this._sc_contentViewSizeDidChange(lastMinimumHorizontalScrollOffset, lastMaximumHorizontalScrollOffset, lastMinimumVerticalScrollOffset, lastMaximumVerticalScrollOffset);
       }
     }
   },
 
   /** @private When the content view's size changes, we need to update our scroll offset properties. */
-  _sc_contentViewSizeDidChange: function () {
+  _sc_contentViewSizeDidChange: function (lastMinimumHorizontalScrollOffset, lastMaximumHorizontalScrollOffset, lastMinimumVerticalScrollOffset, lastMaximumVerticalScrollOffset) {
     var maximumHorizontalScrollOffset = this.get('maximumHorizontalScrollOffset'),
       maximumVerticalScrollOffset = this.get('maximumVerticalScrollOffset'),
       containerHeight, containerWidth,
@@ -1116,6 +1126,35 @@ SC.ScrollView = SC.View.extend({
           if (this._sc_gestureAnchorHOffset != null) {
             this._sc_gestureAnchorHOffset = value;
           }
+        } else {
+          // Take alignment into account.
+          var horizontalAlign = this.get('horizontalAlign'),
+              horizontalScrollOffset = this._sc_horizontalScrollOffset,
+              minimumHorizontalScrollOffset = this.get('minimumHorizontalScrollOffset');
+
+          switch (horizontalAlign) {
+          case SC.ALIGN_CENTER:
+            // Switched to scrolling horizontally, stick to center OR was scrolled at center and size changed.
+            if ((lastMinimumHorizontalScrollOffset < 0 && minimumHorizontalScrollOffset === 0) ||
+              (horizontalScrollOffset === lastMaximumHorizontalScrollOffset / 2)) {
+              this.set('horizontalScrollOffset', maximumHorizontalScrollOffset / 2);
+            }
+
+            break;
+          case SC.ALIGN_RIGHT:
+            // Switched to scrolling horizontally, stick to right side OR was scrolled to right and size changed.
+            if ((lastMinimumHorizontalScrollOffset < 0 && minimumHorizontalScrollOffset === 0) ||
+              (horizontalScrollOffset === lastMaximumHorizontalScrollOffset)) {
+              this.set('horizontalScrollOffset', maximumHorizontalScrollOffset);
+            }
+
+            break;
+          }
+
+          // Was at right side and size shrunk.
+          if (horizontalScrollOffset > maximumHorizontalScrollOffset) {
+            this.set('horizontalScrollOffset', maximumHorizontalScrollOffset);
+          }
         }
       }
     }
@@ -1146,6 +1185,34 @@ SC.ScrollView = SC.View.extend({
           if (this._sc_gestureAnchorVOffset != null) {
             this._sc_gestureAnchorVOffset = value;
           }
+        } else {
+          var verticalAlign = this.get('verticalAlign'),
+              verticalScrollOffset = this._sc_verticalScrollOffset,
+              minimumVerticalScrollOffset = this.get('minimumVerticalScrollOffset');
+
+          switch (verticalAlign) {
+          case SC.ALIGN_MIDDLE:
+            // Switched to scrolling vertically, stick to middle OR was scrolled at middle and size changed.
+            if ((lastMinimumVerticalScrollOffset < 0 && minimumVerticalScrollOffset === 0) ||
+              (verticalScrollOffset === lastMaximumVerticalScrollOffset / 2)) {
+              this.set('verticalScrollOffset', maximumVerticalScrollOffset / 2);
+            }
+
+            break;
+          case SC.ALIGN_BOTTOM:
+            // Switched to scrolling vertically, stick to bottom side OR was scrolled to bottom and size changed.
+            if ((lastMinimumVerticalScrollOffset < 0 && minimumVerticalScrollOffset === 0) ||
+              (verticalScrollOffset === lastMaximumVerticalScrollOffset)) {
+              this.set('verticalScrollOffset', maximumVerticalScrollOffset);
+            }
+
+            break;
+          }
+
+          // Was at bottom side and size shrunk.
+          if (verticalScrollOffset > maximumVerticalScrollOffset) {
+            this.set('verticalScrollOffset', maximumVerticalScrollOffset);
+          }
         }
       }
     }
@@ -1502,8 +1569,8 @@ SC.ScrollView = SC.View.extend({
       oldView.removeObserver('frame', this, frameChangeFunc);
       // oldView.removeObserver('layer', this, layerChangeFunc);
 
-      this._sc_shouldResizeContentWidth = false;
-      this._sc_shouldResizeContentHeight = false;
+      // this._sc_shouldResizeContentWidth = false;
+      // this._sc_shouldResizeContentHeight = false;
     }
   },
 

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

@@ -535,6 +535,8 @@ SC.SegmentedView = SC.View.extend(SC.Control,
     Whenever the view resizes, we need to check to see if we're overflowing.
   */
   viewDidResize: function () {
+    this._viewFrameDidChange();
+
     var isHorizontal = this.get('layoutDirection') === SC.LAYOUT_HORIZONTAL,
       visibleDim = isHorizontal ? this.$().width() : this.$().height();
 

data/lib/frameworks/sproutcore/frameworks/foundation/system/module.js

@@ -8,7 +8,10 @@
 /*globals jQuery */
 
 sc_require('tasks/task');
+
+//@if(debug)
 SC.LOG_MODULE_LOADING = YES;
+//@endif
 
 /**
   SC.Module is responsible for dynamically loading in JavaScript and other
@@ -51,10 +54,20 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     @returns {Boolean} YES if already loaded, NO otherwise
   */
   loadModule: function (moduleName, target, method) {
-    var module = SC.MODULE_INFO[moduleName], callbacks, targets,
-        args   = SC.A(arguments).slice(3),
+    var module = SC.MODULE_INFO[moduleName],
+        //@if(debug)
         log    = SC.LOG_MODULE_LOADING,
-        idx, len;
+        //@endif
+        args;
+
+    if (arguments.length > 3) {
+      // Fast arguments access.
+      // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+      args = new Array(arguments.length - 3); //  SC.A(arguments).slice(3)
+      for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i + 3]; }
+    } else {
+      args = [];
+    }
 
     // Treat the first parameter as the callback if the target is a function and there is
     // no method supplied.
@@ -63,7 +76,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       target = null;
     }
 
+    //@if(debug)
     if (log) SC.debug("SC.Module: Attempting to load '%@'", moduleName);
+    //@endif
 
     // If we couldn't find anything in the SC.MODULE_INFO hash, we don't have any record of the
     // requested module.
@@ -78,7 +93,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     // If the module is already loaded, execute the callback immediately if SproutCore is loaded,
     // or else as soon as SC has finished loading.
     if (module.isLoaded && !module.isWaitingForRunLoop) {
+      //@if(debug)
       if (log) SC.debug("SC.Module: Module '%@' already loaded.", moduleName);
+      //@endif
 
       // we can't just eval it if its dependencies have not been met...
       if (!this._dependenciesMetForModule(moduleName)) {
@@ -94,7 +111,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       // If the module has finished loading and we have the string
       // representation, try to evaluate it now.
       if (module.source) {
+        //@if(debug)
         if (log) SC.debug("SC.Module: Evaluating JavaScript for module '%@'.", moduleName);
+        //@endif
         this._evaluateStringLoadedModule(module);
 
         // we can't let it return normally here, because we need the module to wait until the end of the run loop.
@@ -131,7 +150,10 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     // The module is not yet loaded, so register the callback and, if necessary, begin loading
     // the code.
     else {
+
+      //@if(debug)
       if (log) SC.debug("SC.Module: Module '%@' is not loaded, loading now.", moduleName);
+      //@endif
 
       // If this method is called more than once for the same module before it is finished
       // loading, we might have multiple callbacks that need to be executed once it loads.
@@ -392,7 +414,10 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
   _loadDependenciesForModule: function (moduleName) {
     // Load module's dependencies first.
     var moduleInfo      = SC.MODULE_INFO[moduleName];
+
+    //@if(debug)
     var log             = SC.LOG_MODULE_LOADING;
+    //@endif
     var dependencies    = moduleInfo.dependencies || [];
     var dependenciesMet = YES;
     var len             = dependencies.length;
@@ -433,7 +458,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
           dependents.push(moduleName);
 
+          //@if(debug)
           if (log) SC.debug("SC.Module: '%@' depends on '%@', loading dependency…", moduleName, requiredModuleName);
+          //@endif
 
           // Load dependencies
           SC.Module.loadModule(requiredModuleName);
@@ -492,7 +519,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     var moduleInfo = SC.MODULE_INFO[moduleName], callbacks;
     if (!moduleInfo) return; // shouldn't happen, but recover anyway
 
+    //@if(debug)
     if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Module '%@' has completed loading, invoking callbacks.", moduleName);
+    //@endif
 
     callbacks = moduleInfo.callbacks || [];
 
@@ -504,9 +533,11 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
   _evaluateAndInvokeCallbacks: function (moduleName) {
     var moduleInfo = SC.MODULE_INFO;
     var module = moduleInfo[moduleName];
+    //@if(debug)
     var log = SC.LOG_MODULE_LOADING;
 
     if (log) SC.debug("SC.Module: Evaluating and invoking callbacks for '%@'.", moduleName);
+    //@endif
 
     if (module.source) {
       this._evaluateStringLoadedModule(module);
@@ -526,7 +557,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
   _moduleDidBecomeReady: function (moduleName) {
     var moduleInfo = SC.MODULE_INFO;
     var module = moduleInfo[moduleName];
+    //@if(debug)
     var log = SC.LOG_MODULE_LOADING;
+    //@endif
 
     module.isWaitingForRunLoop = NO;
 
@@ -548,7 +581,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       dependentName = dependents[idx];
       dependent = moduleInfo[dependentName];
       if (dependent.isLoaded && this._dependenciesMetForModule(dependentName)) {
+        //@if(debug)
         if (log) SC.debug("SC.Module: Now that %@ has loaded, all dependencies for a dependent %@ are met.", moduleName, dependentName);
+        //@endif
         this._evaluateAndInvokeCallbacks(dependentName);
       }
     }
@@ -566,20 +601,27 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
   */
   _moduleDidLoad: function (moduleName) {
     var module = SC.MODULE_INFO[moduleName];
+    //@if(debug)
     var log    = SC.LOG_MODULE_LOADING;
+    //@endif
     var dependenciesMet;
-    var callbacks, targets;
 
+    //@if(debug)
     if (log) SC.debug("SC.Module: Module '%@' finished loading.", moduleName);
+    //@endif
 
     if (!module) {
+      //@if(debug)
       if (log) SC.debug("SC._moduleDidLoad() called for unknown module '@'.", moduleName);
+      //@endif
       module = SC.MODULE_INFO[moduleName] = { isLoaded: YES, isReady: YES };
       return;
     }
 
     if (module.isLoaded) {
+      //@if(debug)
       if (log) SC.debug("SC._moduleDidLoad() called more than once for module '%@'. Skipping.", moduleName);
+      //@endif
       return;
     }
 
@@ -592,11 +634,15 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       if (dependenciesMet) {
         this._evaluateAndInvokeCallbacks(moduleName);
       } else {
+        //@if(debug)
         if (log) SC.debug("SC.Module: Dependencies for '%@' not met yet, waiting to evaluate.", moduleName);
+        //@endif
       }
     } else {
       delete module.isPrefetching;
+      //@if(debug)
       if (log) SC.debug("SC.Module: Module '%@' was prefetched, not evaluating until needed.", moduleName);
+      //@endif
     }
   },
 
@@ -698,7 +744,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     //Yummy variables.
     var methods = this.get('methodsForSuspend'),
         calls = this._bufferedCalls,
-        key, i, method, call;
+        key, i, call;
 
     //Restore the original methods to where they belong for normal functionality.
     for (i = 0; (key = methods[i]); i++) this[key] = this["__saved_" + key + "__"];