sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/foundation/gestures/tap.js

@@ -30,10 +30,10 @@ SC.TapGesture = SC.Gesture.extend(
 
   /** @private */
   _tapCount: null,
-  
+
   /** @private */
   _candidateTouch: null,
-  
+
   /** @private */
   _eventTimer: null,
 

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

@@ -199,13 +199,13 @@ SC.AutoResize = {
     @private
     Begins observing the auto resize field.
   */
+  // @if (debug)
   initMixin: function() {
-    // @if (debug)
     if (!this.get('supportsAutoResize')) {
       throw new Error("View `%@` does not support automatic resize. See documentation for SC.AutoResize".fmt(this));
     }
-    // @endif
   },
+  // @endif
 
   /**
     If this property is provided, all views that share the same value for this property will be resized as a batch for increased performance.
@@ -228,8 +228,10 @@ SC.AutoResize = {
     SC.AutoResizeManager.scheduleMeasurementForView(this, batchResizeId);
   }.observes('isVisibleInWindow', 'shouldMeasureSize', 'autoResizeText', 'batchResizeId'),
 
+  /** @private */
   _lastMeasuredText: null,
 
+  /** @private */
   _cachedMetrics: function(key, value) {
     if(!this.get('shouldCacheSizes')) return;
 
@@ -250,11 +252,12 @@ SC.AutoResize = {
     @param batch For internal use during batch resizing.
   */
   measureSize: function(batch) {
-    var metrics, layer = this.get('autoResizeLayer'), autoResizeText = this.get('autoResizeText'),
+    var metrics, layer = this.get('autoResizeLayer'),
+        autoResizeText = this.get('autoResizeText'),
         ignoreEscape = !this.get('escapeHTML'),
         batchResizeId = this.get('batchResizeId'),
-        cachedMetrics = this.get('_cachedMetrics'),
-        maxFontSize = this.get('maxFontSize');
+        cachedMetrics = this.get('_cachedMetrics');
+        // maxFontSize = this.get('maxFontSize');
 
     if (!layer) return;
 
@@ -353,7 +356,8 @@ SC.AutoResize = {
         // the frame will be truncated
         width = frame.width - 1, height = frame.height - 1,
         measured = this.get('measuredSize'),
-        mWidth = measured.width, mHeight = measured.height;
+        mWidth = measured.width, mHeight = measured.height,
+        actual;
 
     // figure out and apply padding to the width/height
     if(SC.typeOf(padding) === SC.T_NUMBER) {
@@ -382,7 +386,6 @@ SC.AutoResize = {
       var xProportion = width / mWidth, yProportion = height / mHeight,
 
           guestimate = Math.floor(maxFontSize * Math.min(xProportion, yProportion)),
-          actual,
 
           classNames = this.get('classNames'),
           ignoreEscape = !this.get('escapeHTML'),
@@ -472,7 +475,7 @@ SC.AutoResize = {
 
     TODO: consider making the measurement state a formal SC.View state
   */
-  _transitionIn: function (original) {
+  _transitionIn: function (original, inPlace) {
     // In order to allow views to measure and adjust themselves on append, we
     // can't transition until after the measurement is done.
     var preTransitionOpacity = this.get('layout').opacity || 1;
@@ -480,7 +483,7 @@ SC.AutoResize = {
     this.adjust('opacity', 0);
     this.invokeNext(function () {
       this.adjust('opacity', preTransitionOpacity);
-      original();
+      original(inPlace);
     });
   }.enhance()
 
@@ -515,7 +518,7 @@ SC.AutoResizeManager = {
   scheduleMeasurementForView: function(view) {
     this.measurementQueue.add(view);
 
-    SC.RunLoop.currentRunLoop.invokeLast(this.doBatchResize);
+    SC.RunLoop.currentRunLoop.invokeOnce(this.doBatchResize);
   },
 
   /**
@@ -587,4 +590,5 @@ SC.AutoResizeManager = {
       }
     }
   }
+
 };

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

@@ -7,132 +7,173 @@
 
 /**
   @namespace
-  
+
   You can mix in SC.Gesturable to your views to add some support for recognizing
   gestures.
-  
+
   SproutCore views have built-in touch events. However, sometimes you may want
   to recognize gestures like tap, pinch, swipe, etc. This becomes tedious if you
   need to do this often, and more so if you need to check for multiple possible
   gestures on the same view.
-  
+
   SC.Gesturable allows you to define a collection of gestures (SC.Gesture objects)
   that your view should recognize. When a gesture is recognized, methods will be
   called on the view:
-  
-    - [gestureName](gesture, args...): called when the gesture has occurred. This is 
+
+    - [gestureName](gesture, args...): called when the gesture has occurred. This is
       useful for event-style gestures, where you aren't interested in when it starts or
       ends, but just that it has occurred. SC.SwipeGesture triggers this after the
       swipe has moved a minimum amount—40px by default.
-    - [gestureName]Start(gesture, args...): called when the gesture is first recognized. 
-      For instance, a swipe gesture may be recognized after the finger has moved a 
+    - [gestureName]Start(gesture, args...): called when the gesture is first recognized.
+      For instance, a swipe gesture may be recognized after the finger has moved a
       minimum distance in a horizontal.
-    - [gestureName]Changed(gesture, args...): called when some property of the gesture 
-      has changed. For instance, this may be called continuously as the user swipes as 
+    - [gestureName]Changed(gesture, args...): called when some property of the gesture
+      has changed. For instance, this may be called continuously as the user swipes as
       the swipe's distance changes.
-    - [gestureName]Cancelled(gesture, args...): called when a gesture, for one reason 
-      or another, is no longer recognized. For instance, a horizontal swipe gesture 
+    - [gestureName]Cancelled(gesture, args...): called when a gesture, for one reason
+      or another, is no longer recognized. For instance, a horizontal swipe gesture
       could cancel if the user moves too far in a vertical direction.
     - [gestureName]End(gesture, args...): called when a gesture ends. A swipe would end
       when the user lifts their finger.
-  
+
   Each of these methods is passed the gesture instance, in addition to any arguments
   the gesture sends for your convenience. The default swipe gesture sends an SC.Touch
   instance, the swipe direction, and the distance the swipe has moved in that direction.
-  
+
   Using SC.Gesturable
   -------------------
-  
+
   To make your view recognize gestures, mix in Gesturable and add items to the 'gestures'
   property:
-  
+
       SC.View.extend(SC.Gesturable, {
         gestures: [SC.PinchGesture, 'mySwipeGesture'],
-        
+
         // specifying as a string allows you to configure it:
         mySwipeGesture: SC.SwipeGesture.extend({
           direction: SC.SWIPE_VERTICAL,
           startDistance: 3,
           swipeDistance: 20
         }),
-        
+
         // handle the swipe action
         swipe: function(touch, direction) {
           console.error("Swiped! In direction: " + direction);
         },
-        
+
         swipeStart: function(touch, direction, delta) {
           console.error("Swipe started in direction: " + direction + "; dist: " + delta);
         },
-        
+
         swipeChanged: function(touch, direction, delta) {
           console.error("Swipe continued in direction: " + direction + "; dist: " + delta);
         },
-        
+
         swipeEnd: function(touch, direction, delta) {
           console.error("Completed swipe in direction: " + direction + "; dist: " + delta);
         }
-        
+
       })
-  
+
+  @extends SC.ObjectMixinProtocol
 */
 SC.Gesturable = {
 
-  concatenatedProperties: ["gestures"],
-  gestures: [],
-  
   /**
-    @private
-    When SC.Gesturable initializes, any gestures on the view must be instantiated.
+    @type Array
+    @default ['gestures']
+    @see SC.Object#concatenatedProperties
+  */
+  concatenatedProperties: ['gestures'],
+
+  /**
+    The gestures that the view will support. This property must be set on the consumer of
+    `SC.Gesturable` before it is initialized.
+
+    These gestures should be objects that extend the `SC.Gesture` class. You can use SproutCore's
+    pre-built gestures or create your own. If you create your own, you can use a property name
+    in the list of gestures to refer to the actual gesture class, similar to how the childViews
+    array works. For example,
+
+        gestures: [SC.PinchGesture, 'mySwipeGesture'],
+
+        // Specifying the Gesture by property name allows you to configure it.
+        mySwipeGesture: SC.SwipeGesture.extend({
+          direction: SC.SWIPE_VERTICAL,
+          startDistance: 3,
+          swipeDistance: 20
+        }),
+
+    Note that `gestures` is a *concatenated property*, which means that it will not be overwritten
+    by subclasses. So for example, if the base class lists gestures as `[SC.PinchGesture]` and its
+    subclass lists gestures as `[SC.TapGesture]`, the actual gestures supported by the subclass will
+    be `[SC.PinchGesture, SC.TapGesture]`.
+
+    @type Array
+    @default null
+  */
+  gestures: null,
+
+  /**
+    When SC.Gesturable initializes, any gestures named on the view are instantiated.
+
+    @see SC.ObjectMixinProtocol#initMixin
   */
   initMixin: function() {
+    //@if(debug)
+    if (SC.none(this.gestures)) {
+      SC.error("Developer Error: When mixing in SC.Gesturable, you must define a list of gestures to use.");
+    }
+    //@endif
     this.createGestures();
   },
-  
-  /**
-    @private
-    Instantiates the gestures.
-  */
+
+  /** @private  Instantiates the gestures. */
   createGestures: function() {
-    var gestures = this.get("gestures"), idx, len = gestures.length, g, _g = [];
+    var gestures = this.get("gestures"),
+        len = gestures.length,
+        instantiatedGestures = [],
+        idx;
 
     // loop through all gestures
     for (idx = 0; idx < len; idx++) {
+      var gesture;
+
       // get the proper gesture
       if (SC.typeOf(gestures[idx]) === SC.T_STRING) {
-        g = this.get(gestures[idx]);
+        gesture = this.get(gestures[idx]);
       } else {
-        g = gestures[idx];
+        gesture = gestures[idx];
       }
-      
+
       // if it was not found, well, that's an error.
-      if (!g) {
-        throw new Error("Could not find gesture named '" + gestures[idx] + "' on view.");
+      if (!gesture) {
+        throw new Error("Developer Error: Could not find gesture named '" + gestures[idx] + "' on view.");
       }
-      
+
       // if it is a class, instantiate (it really ought to be a class...)
-      if (g.isClass) {
-        g = g.create({
+      if (gesture.isClass) {
+        gesture = gesture.create({
           view: this
         });
       }
-      
+
       // and set the gesture instance and add it to the array.
-      if (SC.typeOf(gestures[idx]) === SC.T_STRING) this[gestures[idx]] = g;
-      _g.push(g);
+      if (SC.typeOf(gestures[idx]) === SC.T_STRING) this[gestures[idx]] = gesture;
+      instantiatedGestures.push(gesture);
     }
-    
-    this.set("gestures", _g);
+
+    this.set("gestures", instantiatedGestures);
   },
-  
+
   /**
     Handles touch start by handing it to the gesture recognizing code.
-    
+
     If you override touchStart, you will need to call gestureTouchStart to
     give the gesture system control of the touch. You will continue to get
     events until if and when a gesture decides to take "possession" of a touch—
     at this point, you will get a [gestureName]Start event.
-    
+
     You do not have to call gestureTouchStart immediately; you can call it
     at any time. This allows you to avoid passing control until _after_ you
     have determined your own touchStart, touchesDragged, and touchEnd methods
@@ -141,50 +182,50 @@ SC.Gesturable = {
   touchStart: function(touch) {
     this.gestureTouchStart(touch);
   },
-  
+
   /**
     Tells the gesture recognizing code about touches moving.
-    
+
     If you override touchesDragged, you will need to call gestureTouchesDragged
-    (at least for any touches you called gestureTouchStart for in touchStart) to 
+    (at least for any touches you called gestureTouchStart for in touchStart) to
     allow the gesture system to update.
   */
   touchesDragged: function(evt, touches) {
     this.gestureTouchesDragged(evt, touches);
   },
-  
+
   /**
     Tells the gesture recognizing code about a touch ending.
-    
+
     If you override touchEnd, you will need to call gestureTouchEnd
     for any touches you called touchStart for.
   */
   touchEnd: function(touch) {
     this.gestureTouchEnd(touch);
   },
-  
+
   /**
     Tells the gesture recognizing system about a new touch.
-    
+
     This informs all gestures that a new touch, "unassigned" to any gesture,
     has been located. Later, each gesture has an opportunity to claim the touch.
-    
+
     Once they have claimed the touch, further events will go _directly_ to them—
     this view will cease receiving the touchesDragged and will not receive a touchEnd.
   */
   gestureTouchStart: function(touch) {
     touch.isInteresting = 0;
-    
+
     var gestures = this.get("gestures"), idx, len = gestures.length, g;
     for (idx = 0; idx < len; idx++) {
       g = gestures[idx];
       g.unassignedTouchDidStart(touch);
     }
   },
-  
+
   /**
     Tells the gesture recognition system that some touches have moved.
-    
+
     This informs all gestures that these touches have changed. All such touches
     are "unassigned" because all "assigned" touches already get sent directly
     to the gesture.
@@ -196,10 +237,10 @@ SC.Gesturable = {
       g.unassignedTouchesDidChange(evt, touches);
     }
   },
-  
+
   /**
     Tells the gesture recognition system that a touch have ended.
-    
+
     This informs all of the gestures that the touch ended. The touch is
     an unassigned touch as, if it were assigned to a gesture, it would have
     been sent directly to the gesture, bypassing this view.
@@ -211,4 +252,4 @@ SC.Gesturable = {
       g.unassignedTouchDidEnd(touch);
     }
   }
-};
+};

data/lib/frameworks/sproutcore/frameworks/foundation/protocols/swap_transition_protocol.js

@@ -6,11 +6,16 @@
 
 
 /** @namespace
-  This protocol defines the allowable transition plugin methods.
+  The `SC.SwapTransitionProtocol` protocol defines the properties and methods that you may
+  implement in your custom swap transition plugins. All methods are optional, but a plugin is
+  expected to use at least one of the methods.
 
-  SC.ContainerView uses transition plugins to setup, execute and cleanup the
-  swapping between views and expects the given transition plugin object
-  to implement the methods in this protocol.
+  SC.ContainerView uses transition plugins to setup, execute and cleanup the swapping between views
+  and expects the given transition plugin object to implement the methods in this protocol.
+
+  *Note: Do not mix `SC.SwapTransitionProtocol` into your classes. As a protocol, it exists only
+  for reference sake. You only need define any of the properties or methods listed below in order to
+  use this protocol.*
 */
 SC.SwapTransitionProtocol = {
 

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

@@ -1,6 +1,5 @@
 // ==========================================================================
-// Project:   Showcase
-// Copyright: ©2013 7x7 Software, Inc.
+// Project:   SproutCore
 // License:   Licensed under MIT license
 // ==========================================================================
 /*globals module, test, ok, equals */

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

@@ -13,9 +13,11 @@ var view;
 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.”"
+    SC.run(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.”"
+      });
     });
   },
 
@@ -40,10 +42,10 @@ test("Resize height only.", function () {
 
   // Set the view up for height only resizing.
   // i.e. It should grow to fit the text wrapped within the width of the view.
-  view.set('shouldResizeWidth', false);
-  view.set('shouldResizeHeight', true);
-
   SC.run(function () {
+    view.set('shouldResizeWidth', false);
+    view.set('shouldResizeHeight', true);
+
     pane.appendChild(view);
     pane.append();
   });
@@ -101,7 +103,7 @@ test("Resize with transition plugin - conflict", function () {
 
     // Width transition plugin.
     run: function (view, options, finalLayout, finalFrame) {
-      view.animate('width', finalFrame.width, { duration: 0.5 }, function (data) {
+      view.animate('width', finalFrame.width, { duration: 1 }, function (data) {
         this.didTransitionIn();
       });
     }
@@ -119,7 +121,7 @@ test("Resize with transition plugin - conflict", function () {
     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);
+  }, 250);
 
   setTimeout(function () {
     var jqEl = view.$();
@@ -132,13 +134,10 @@ test("Resize with transition plugin - conflict", function () {
     });
 
     start();
-  }, 700);
+  }, 1250);
 });
 
-
 test("Resize with child view layout", function () {
-  stop(700);
-
   var pane, view2;
 
   SC.run(function () {
@@ -147,8 +146,8 @@ test("Resize with child view layout", function () {
       layout: { top: 200, left: 0, width: 200, height: 200 },
       childViewLayout: SC.View.HORIZONTAL_STACK,
 
-      a: SC.View.extend({
-        layout: { width: 100 }
+      a: SC.LabelView.extend(SC.AutoResize, {
+        value: "XYZ"
       }),
 
       b: SC.View.extend({
@@ -167,23 +166,24 @@ test("Resize with child view layout", function () {
     pane.appendChild(view2);
   });
 
-  setTimeout(function () {
-    ok(view.get('layout').width > 2000, 'width is > 2000');
-    equals(view.get('layout').left, 150, 'left is');
-    ok(view2.get('layout').left > 2000, 'left: %@ is > 2000'.fmt(view2.get('layout').left));
+  var childViews = pane.get('childViews'),
+      viewA = childViews.objectAt(0),
+      viewB = childViews.objectAt(1);
 
-    pane.destroy();
-    pane.remove();
+  ok(view.get('layout').width > 2000, 'width is > 2000');
+  equals(viewB.get('layout').left, viewA.get('frame').width, 'second view left is');
+  equals(view.get('layout').left, viewA.get('frame').width + 50, 'third view left is');
+  ok(view2.get('layout').left > 2000, 'left: %@ is > 2000'.fmt(view2.get('layout').left));
 
-    start();
-  }, 500);
+  pane.destroy();
+  pane.remove();
 });
 
 /**
-  For a TextFieldView where we set it to only resize its height every time its value changes 
+  For a TextFieldView where we set it to only resize its height every time its value changes
   we get the textareas width and set its max-width to this if no autoResizeLayer has been set.
 
-  This test checks that every-time the value changes the max-width we set doesn't change the 
+  This test checks that every-time the value changes the max-width we set doesn't change the
   textarea width (i.e. takes padding into account when measuring).
  */
 test("Resize height only for textarea where textarea has padding.", function () {
@@ -218,10 +218,10 @@ test("Resize height only for textarea where textarea has padding.", function ()
   SC.run(function () {
     view.$('textarea').css({
       'padding': '10px',
-      '-webkit-box-sizing': 'border-box', 
+      '-webkit-box-sizing': 'border-box',
       '-moz-box-sizing': 'border-box',
-      'box-sizing': 'border-box' 
-    })
+      'box-sizing': 'border-box'
+    });
   });
 
   // now the css is applied measure the textareas width
@@ -236,7 +236,7 @@ test("Resize height only for textarea where textarea has padding.", function ()
   setTimeout(function () {
     // check the frame and textarea have the expected dimensions
     ok(view.get('frame').width == 200, 'frame width is 200');
-    equals(origWidth, view.$('textarea').outerWidth(), 'textarea width has not changed since update of value')
+    equals(origWidth, view.$('textarea').outerWidth(), 'textarea width has not changed since update of value');
 
     pane.destroy();
     pane.remove();
@@ -280,10 +280,10 @@ test("Resize text only for input where input has padding.", function () {
   SC.run(function () {
     view.$('input').css({
       'padding': '10px',
-      '-webkit-box-sizing': 'border-box', 
+      '-webkit-box-sizing': 'border-box',
       '-moz-box-sizing': 'border-box',
-      'box-sizing': 'border-box' 
-    })
+      'box-sizing': 'border-box'
+    });
   });
 
   // now the css is applied measure the input fields width
@@ -298,11 +298,11 @@ test("Resize text only for input where input has padding.", function () {
   setTimeout(function () {
     // check the frame and input field have the expected dimensions
     ok(view.get('frame').width == 200, 'frame width is 200');
-    equals(origWidth, view.$('input').outerWidth(), 'input field width has not changed since update of value')
+    equals(origWidth, view.$('input').outerWidth(), 'input field width has not changed since update of value');
 
     pane.destroy();
     pane.remove();
 
     start();
   }, 500);
-})
+});