sproutcore 1.0.1046 → 1.0.1049.pre.1

data/frameworks/sproutcore/frameworks/foundation/english.lproj/strings.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('system/locale');

data/frameworks/sproutcore/frameworks/foundation/english.lproj/text_field.css

@@ -2,7 +2,6 @@
 
 .sc-view .sc-text-field-view {
   border:none;
-  z-index:100;
   overflow: visible;
   background :white;
 }
@@ -78,24 +77,21 @@
 	background: transparent;
 	vertical-align: middle;
 }
-	
-.msie .sc-text-field-view input {
-  	line-height:1.8em;
-}
-
-.mozilla .sc-text-field-view input {
-  	top: 3px;
-}
-
 
 .sc-text-field-view input {
 	border: none;
 	outline: none;
-	}
+	-webkit-appearance:none;
+}
+
+.msie .sc-text-field-view input {
+  padding-bottom: 1px;
+}
 
 .sc-text-field-view textarea {
 	border: none;
 	outline: none;
+	-webkit-appearance:none;
 }
 
 
@@ -106,17 +102,19 @@
 	width:100%;
   bottom: 0px;
 	right: 0px;
-	height: 100%;
 	display: block;
 	background: transparent;
 	vertical-align: middle;
 	resize: none;
-	line-height: 1.8em;
 	overflow: auto;
 }
 
+.msie .sc-text-field-view textarea {
+	height: 100%;
+}
+
 .mozilla .sc-text-field-view textarea {
-  
+	height: 100%;
 }
 
 
@@ -144,3 +142,7 @@
   display: none ;
 }
 
+.sc-text-field-view.sc-hint .field{
+  color: #B3B3B3 !important;
+}
+

data/frameworks/sproutcore/frameworks/foundation/english.lproj/view.css

@@ -45,6 +45,11 @@
   text-align:right;
 }
 
+/* 3D-accelerate panes in MobileSafari */
+.mobile-safari .sc-pane {
+  -webkit-transform: translate3d(0,0,0);
+}
+
 /*User the following to know what view has the focus in webkit*/
 /*.sc-view .focus {
   outline: auto 5px -webkit-focus-ring-color; 

data/frameworks/sproutcore/frameworks/foundation/ext/object.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // Extensions to the core SC.Object class

data/frameworks/sproutcore/frameworks/foundation/ext/run_loop.js

@@ -2,7 +2,7 @@
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
-// License:   Licened under MIT license (see license.js)
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 // Create anonymous subclass of SC.RunLoop to add support for processing 
@@ -90,7 +90,9 @@ SC.RunLoop = SC.RunLoop.extend(
     if (!this._timerQueue || this._firing) return NO; // nothing to do
 
     // max time we are allowed to run timers
-    var now = this.get('startTime') ;
+    var now = this.get('startTime'),
+        timers = this.TIMER_ARRAY,
+        idx, len, didFire;
     
     // avoid recursive calls
     this._firing = YES;
@@ -98,15 +100,14 @@ SC.RunLoop = SC.RunLoop.extend(
     // collect timers to fire.  we do this one time up front to avoid infinite 
     // loops where firing a timer causes it to schedule itself again, causing 
     // it to fire again, etc.
-    var timers = this.TIMER_ARRAY ;
     this._timerQueue = this._timerQueue.collectExpiredTimers(timers, now);
 
     // now step through timers and fire them.
-    var idx, len = timers.length;
+    len = timers.length;
     for(idx=0;idx<len;idx++) timers[idx].fire();
     
     // cleanup
-    var didFire = timers.length > 0 ;
+    didFire = timers.length > 0 ;
     timers.length = 0 ; // reset for later use...
     this._firing = NO ;
     return didFire; 

data/frameworks/sproutcore/frameworks/foundation/gestures/pinch.js

@@ -0,0 +1,81 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+sc_require("system/gesture");
+
+SC.PinchGesture = SC.Gesture.extend({
+  name: "pinch",
+  acceptsMultitouch: YES,
+
+  scale: 1,
+
+  /**
+    The default for this method is to loop through each touch one by one to see if it qualifies.
+    Here, however, we want to take the touches when there are 2, and only 2 of them. As a result
+    we can do the work here, with no need to pass them on.
+  */
+  unassignedTouchesDidChange: function(evt, touches) {
+    if (touches.length == 2) {
+      this.take(touches[0]);
+      this.take(touches[1]);
+    }
+  },
+
+  /**
+    We could probably just return YES here, since unassignedTouchesDidChange shouldn't let more
+    than 2 touches through, however, we're double checking here to make sure that we haven't
+    already captured 2 touches.
+  */
+  touchStart: function(touch) {
+    var touches = touch.touchesForResponder(this);
+    if (!touches || touches.length == 0) {
+      return YES;
+    } else if (touches.length == 1) {
+      this.start([touches[0], touch]);
+      return YES;
+    } else {
+      return NO;
+    }
+  },
+
+  /**
+    Here we're getting the distance between the 2 touches and comparing it to their starting
+    distance. It's possible we'll want to implement a more complex algorithm to make things
+    a bit smoother. Once we have the relative change, we trigger the pinch action in the view.
+  */
+  touchesDragged: function(evt, touches) {
+    var touch = touches.firstObject(),
+        avg = touch.averagedTouchesForView(this);
+
+    if (avg.touchCount == 2) {
+      if (!this._startDistance) {
+        this._startDistance = avg.d;
+      }
+
+      this.scale = avg.d / this._startDistance;
+
+      this.change(touches, this.scale);
+    }
+  },
+
+  /**
+    Once one touch has ended we don't need to watch the other so we release all touches.
+  */
+  touchEnd: function(touch) {
+    this._startDistance = null;
+
+    var touches = touch.touchesForResponder(this);
+
+    this.trigger(touches, this.scale)
+    this.end(touches, this.scale);
+
+    if (touches) {
+      touches.forEach(function(touch){
+        this.release(touch);
+      }, this);
+    }
+  }
+});

data/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js

@@ -0,0 +1,142 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+sc_require("system/gesture");
+
+SC.SWIPE_HORIZONTAL = "X";
+SC.SWIPE_VERTICAL = "Y";
+SC.SWIPE_ANY = "XY";
+SC.SWIPE_LEFT = "LEFT";
+SC.SWIPE_RIGHT = "RIGHT";
+SC.SWIPE_UP = "UP";
+SC.SWIPE_DOWN = "DOWN";
+
+SC.SwipeGesture = SC.Gesture.extend({
+  name: "swipe",
+  acceptsMultitouch: YES,
+  
+  direction: SC.SWIPE_HORIZONTAL,
+
+  /**
+    Will be populated with the current direction of the swipe once
+    one has been determined.
+  */
+  currentDirection: null,
+
+  startDistance: 5,
+  swipeDistance: 40,
+  
+  tolerance: 0.5, // we accept .5 the distance in the other direction as a swipe
+  
+  touchIsInGesture: function(touch, status) {
+    // if we have not "flunked" the touch before, and it has moved 
+    if (!status.flunked) {
+      var d = this.get('direction'),
+          cd = this.get('currentDirection'),
+          startDistance = this.get('startDistance'),
+          deltaX = touch.pageX - touch.startX,
+          deltaY = touch.pageY - touch.startY;
+
+      if (Math.abs(deltaX) > startDistance || Math.abs(deltaY) > startDistance) {
+
+        if (!cd) {
+          if (d == SC.SWIPE_ANY) {
+            if      (deltaX > deltaY) cd = SC.SWIPE_HORIZONTAL;
+            else if (deltaY > deltaX) cd = SC.SWIPE_VERTICAL;
+            else                      return NO; // We can't determine a direction yet
+          } else {
+            cd = d;
+          }
+          this.set('currentDirection', cd);
+        }
+
+        var delta  = (cd == SC.SWIPE_HORIZONTAL) ? deltaX : deltaY,
+            oDelta = (cd == SC.SWIPE_HORIZONTAL) ? deltaY : deltaX;
+
+        if (Math.abs(delta) * this.get("tolerance") > Math.abs(oDelta)) {
+          return YES;
+        }
+
+      }
+    }
+    return NO;
+  },
+  
+  touchStart: function(touch) {
+    var d = this.get("currentDirection"), 
+        delta = touch["page" + d] - touch["start" + d],
+        swipeDirection;
+    
+    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
+    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
+    
+    this.start(touch, swipeDirection, delta);
+    return YES;
+  },
+  
+  touchesDragged: function(evt, touches) {
+    var touch = touches.firstObject();
+    var d = this.get("currentDirection"), 
+        o = (d === SC.SWIPE_HORIZONTAL ? "Y" : "X"),
+        delta = touch["page" + d] - touch["start" + d],
+        oDelta = touch["page" + o] - touch["start" + o],
+        swipeDirection;
+    
+    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
+    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
+    
+    if (
+      Math.abs(delta) < this.get("startDistance") ||
+      Math.abs(delta) * this.get("tolerance") < Math.abs(oDelta)
+    ) {
+      // does not qualify anymore
+      this.release(touch);
+
+      var allTouches = touch.touchesForResponder(this);
+      if (!allTouches || allTouches.length == 0) this.end(touch, swipeDirection, delta);
+    } else {
+      this.change(touch, swipeDirection, delta);
+    }
+  },
+  
+  touchEnd: function(touch) {
+    var d = this.get("currentDirection"), 
+        o = (d === SC.SWIPE_HORIZONTAL ? "Y" : "X"),
+        delta = touch["page" + d] - touch["start" + d],
+        oDelta = touch["page" + o] - touch["start" + o],
+        swipeDirection;
+    
+    // determine swipe direction
+    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
+    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
+
+    // trigger
+    if (
+      Math.abs(delta) > this.get("swipeDistance") ||
+      Math.abs(delta) * this.get("tolerance") < Math.abs(oDelta)
+    ) {
+      this.trigger(touch, swipeDirection);
+    }
+
+    this.end(touch, swipeDirection, delta);
+
+    this.set('currentDirection', null);
+
+    // and release all others
+    var touches = touch.touchesForResponder(this);
+    if (touches) {
+      touches.forEach(function(touch){
+        this.release(touch);
+      }, this);
+    }
+  },
+
+  cancel: function(){
+    sc_super();
+    this.set('currentDirection', null);
+  }
+
+});

data/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js

@@ -0,0 +1,33 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  @namespace 
+
+  A mixin that automatically mixes in a set of mixins into the child views created
+  by this view (that go through createChildView).
+  @since SproutCore 1.0
+*/
+SC.AutoMixin = {
+  /**
+    The mixins to automatically mix in.
+  */
+  autoMixins: [],
+  
+  createChildView: function(v, attrs) {
+    if (!attrs) attrs = {};
+    attrs.owner = attrs.parentView = this;
+    attrs.isVisibleInWindow = this.get('isVisibleInWindow');
+    if (!attrs.page) attrs.page = this.page;
+    
+    var applyMixins = this.get("autoMixins");
+    applyMixins.push(attrs);
+    
+    v = v.create.apply(v, applyMixins);
+    return v;
+  }
+};

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

@@ -0,0 +1,74 @@
+/**
+  Implements some automatic resizing utilities.
+*/
+SC.AutoResize = {
+  autoResizeField: "value",
+  
+  shouldAutoResize: YES, // if NO, only measuredSize is changed.
+  shouldMeasureSize: YES, // if NO, nothing happens.
+  
+  /**
+    Determines if the view's width should be resized
+    on calculation. Default is YES.
+    
+    @property {Boolean}
+  */
+  shouldResizeWidth: YES,
+  
+  /**
+    Determines if the view's height should be resized
+    on calculation. Default is NO to retain backwards
+    compatibility.
+    
+    @property {Boolean}
+  */
+  shouldResizeHeight: NO,
+  
+  measuredSize: { width: 0, height: 0 },
+  
+  autoSizePadding: 10, // just to add some nice space.
+  
+  initMixin: function() {
+    this.addObserver(this.get("autoResizeField"), this, "_scar_valueDidChange");
+  },
+  
+  measureSize: function() {
+    if (!this.get("shouldMeasureSize")) return;
+    
+    // get the layer
+    var layer = this.get("layer");
+    
+    // return if there wasn't one (no font sizes, etc. to use with measuring)
+    if (!layer) return;
+     
+    // get metrics, using layer as example element
+    var metrics = SC.metricsForString(this.get(this.get("autoResizeField")), layer);
+    
+    // set it
+    this.set("measuredSize", metrics);
+    if (this.get("shouldAutoResize")) {
+      if (this.get('shouldResizeWidth')) this.adjust("width", metrics.width + this.get("autoSizePadding"));
+      if (this.get('shouldResizeHeight')) this.adjust("height", metrics.height + this.get("autoSizePadding"));
+    }
+  },
+  
+  // we need to update the measurement when the value changes
+  _scar_valueDidChange: function(){ 
+    sc_super(); // just in case
+    this.measureSize();
+  },
+  
+  // also, need to update when the layer is created
+  // note: not so much need to update when the layer is updated; 
+  // we could then end up changing the size due to the layer being updated, causing another layer update;
+  // which would not be great for performance.
+  didAppendToDocument: function(){
+    sc_super(); // just in case
+    this.invokeLast("measureSize");
+  },
+  
+  didCreateLayer: function() {
+    sc_super();
+    this.invokeLast("measureSize");
+  }
+};