sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/bootstrap.rhtml

@@ -11,7 +11,7 @@
 #
 -%>
 <% content_for('bootstrap') do %>
-var SC = SC || { BUNDLE_INFO: {}, LAZY_INSTANTIATION: {} };
+var SC = SC || { MODULE_INFO: {}, LAZY_INSTANTIATION: {} };
 SC.browser = (function() {
   // THIS CODE IS DEPRECATED AND IS NO LONGER MAINTAINED
   var userAgent = navigator.userAgent.toLowerCase();
@@ -33,19 +33,6 @@ SC.browser = (function() {
   return browser ;
 })();
 
-SC.bundleDidLoad = function(bundle) {
-  var info = this.BUNDLE_INFO[bundle] ;
-  if (!info) info = this.BUNDLE_INFO[bundle] = {} ;
-  info.loaded = true ;
-};
-
-SC.bundleIsLoaded = function(bundle) {
-  var info = this.BUNDLE_INFO[bundle] ;
-  return info ? !!info.loaded : false ;
-};
-
-SC.loadBundle = function() { throw "SC.loadBundle(): SproutCore is not loaded."; };
-
 SC.setupBodyClassNames = function() {
   var el = document.body ;
   var browser, platform, shadows, borderRad, classNames;
@@ -68,6 +55,7 @@ SC.setupBodyClassNames = function() {
   if(shadows) classNames.push('box-shadow');
   if(borderRad) classNames.push('border-rad');
   classNames.push(browser) ;
+  if (browser === 'chrome') classNames.push('safari');
   classNames.push(platform) ;
   if (SC.browser.mobileSafari) classNames.push('mobile-safari') ;
   el.className = classNames.join(' ') ;

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

@@ -5,8 +5,6 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-sc_require('system/locale');
-
 SC.stringsFor('English', {
   '_SC.DateTime.dayNames': 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday',
   '_SC.DateTime.abbreviatedDayNames': 'Sun Mon Tue Wed Thu Fri Sat',

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

@@ -2,6 +2,7 @@
 
 .sc-view .sc-text-field-view {
   border:none;
+  z-index:100;
   overflow: visible;
   background :white;
 }
@@ -84,7 +85,7 @@
 	-webkit-appearance:none;
 }
 
-.msie .sc-text-field-view input {
+.msie .sc-text-field-view input.field {
   padding-bottom: 1px;
 }
 
@@ -109,11 +110,8 @@
 	overflow: auto;
 }
 
-.msie .sc-text-field-view textarea {
-	height: 100%;
-}
-
-.mozilla .sc-text-field-view textarea {
+.msie .sc-text-field-view textarea.field,
+.mozilla .sc-text-field-view textarea.field {
 	height: 100%;
 }
 

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

@@ -0,0 +1,81 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe 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/lib/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js

@@ -0,0 +1,144 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe 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,
+          absX = Math.abs(deltaX),
+          absY = Math.abs(deltaY);
+
+      if (Math.abs(deltaX) > startDistance || Math.abs(deltaY) > startDistance) {
+
+        if (!cd) {
+          if (d == SC.SWIPE_ANY) {
+            if      (absX > absY) cd = SC.SWIPE_HORIZONTAL;
+            else if (absY > absX) 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.cancel(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/lib/frameworks/sproutcore/frameworks/foundation/gestures/tap.js

@@ -0,0 +1,113 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2010 Strobe Inc. All rights reserved.
+// Author:    Peter Wagenet
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+sc_require("system/gesture");
+
+SC.TapGesture = SC.Gesture.extend({
+  name: "tap",
+  acceptsMultitouch: NO,
+
+  _tapCount: null,
+  _candidateTouch: null,
+  _eventTimer: null,
+
+  tapWiggle: 10,
+  tapDelay: 200,
+
+  touchIsInGesture: function(touch, status) {
+    return !status.tapFlunked
+  },
+
+  touchStart: function(touch) {
+    // We don't want events triggering during a touch, will be reset when touch is over if it's a candidate
+    if (this._eventTimer) this._eventTimer.invalidate();
+
+    // We have an activeTap but another touch has been started
+    if (this._candidateTouch && this._candidateTouch.touch.identifier !== touch.identifier) {
+      this._cancelTap(touch);
+      return NO;
+    }
+
+    // This touch is a candidate
+    this._candidateTouch = {
+      startTime: Date.now(),
+      touch: touch
+    };
+
+    this.start(touch);
+
+    return YES;
+  },
+
+  touchesDragged: function(evt, touches) {
+    var touch = touches[0];
+
+    // Somehow another touch got in
+    var tooManyTouches = (
+      touches.length > 1 ||
+      !this._candidateTouch ||
+      touch.identifier !== this._candidateTouch.touch.identifier
+    );
+
+    // Touch moved too much
+    var touchMoved = this._calculateDragDistance(touch) > this.get('tapWiggle');
+
+    if (tooManyTouches || touchMoved) this._cancelTap(touch);
+  },
+
+  touchEnd: function(touch){
+    if (this._calculateDragDistance(touch) > this.get('tapWiggle') || Date.now() - this._candidateTouch.startTime > this.get('tapDelay') ) {
+      // Touch moved too much or took too long
+      this._cancelTap(touch);
+    } else {
+      this._addTap(touch);
+    }
+  },
+
+  _addTap: function(touch){
+    var self = this;
+
+    if (this._eventTimer) this._eventTimer.invalidate();
+
+    this._tapCount = (this._tapCount || 0) + 1;
+    this._candidateTouch = null;
+    this._eventTimer = SC.Timer.schedule({
+      target: self,
+      action: function(){ this._triggerTap(touch); },
+      interval: this.get('tapDelay')
+    });
+
+    this.change(touch, this._tapCount);
+    this.trigger(touch, this._tapCount);
+
+  },
+
+  _cancelTap: function(touch){
+    this.statusForTouch(touch).tapFlunked = YES;
+
+    this.cancel(touch, this._tapCount);
+
+    if (this._eventTimer) this._eventTimer.invalidate();
+    this._tapCount = null;
+    this._candidateTouch = null;
+    this._eventTimer = null;
+
+  },
+
+  _triggerTap: function(touch){
+    this.end(touch, this._tapCount);
+
+    this._tapCount = null;
+    this._candidateTouch = null;
+    this._eventTimer = null;
+  },
+
+  _calculateDragDistance: function(touch) {
+    return Math.sqrt(Math.pow(touch.pageX - touch.startX, 2) + Math.pow(touch.pageY - touch.startY, 2));
+  }
+
+});
+

data/lib/frameworks/sproutcore/frameworks/foundation/license.js

@@ -1,30 +1,28 @@
-/*! @license
-
-Portions of this software are copyright Yahoo, Inc, used under the following license:
-
-Software License Agreement (BSD License)
-Copyright (c) 2009, Yahoo! Inc.
-All rights reserved.
-Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the
-following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of Yahoo! Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission of Yahoo! Inc.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Sources of Intellectual Property Included in the YUI Library
-Where not otherwise indicated, all YUI content is authored by Yahoo! engineers and consists of Yahoo!-owned intellectual property. YUI is issued by Yahoo! under the BSD license above. In some specific instances, YUI will incorporate work done by developers outside of Yahoo! with their express permission.
+/** 
+ * @license Portions of this software are copyright Yahoo, Inc, used under the following license:
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2009, Yahoo! Inc.
+ * All rights reserved.
+ * Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ * following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of Yahoo! Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission of Yahoo! Inc.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Sources of Intellectual Property Included in the YUI Library
+ * Where not otherwise indicated, all YUI content is authored by Yahoo! engineers and consists of Yahoo!-owned intellectual property. YUI is issued by Yahoo! under the BSD license above. In some specific instances, YUI will incorporate work done by developers outside of Yahoo! with their express permission.
 
 */
 
-/*! @license
-  jQuery 1.2.6 - New Wave Javascript
-
-  Copyright (c) 2008 John Resig (jquery.com)
-  Dual licensed under the MIT (MIT-LICENSE.txt)
-  and GPL (GPL-LICENSE.txt) licenses.
-  
-  $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
-  $Rev: 5685 $
+/** 
+ * @license jQuery 1.2.6 - New Wave Javascript
+ * 
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *  
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
 */