sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/template.js

@@ -0,0 +1,24 @@
+/**
+  SC.TemplatePane is a helper that will create a new pane based on
+  a single root TemplateView.
+
+  function main() {
+    MyApp.mainPane = SC.TemplatePane.append({
+      layerId: 'my-root-id',
+      templateName: 'app'
+    })
+  }
+*/
+SC.TemplatePane = SC.Object.extend({});
+
+SC.mixin(SC.TemplatePane, {
+  append: function(attrs) {
+    var pane = SC.MainPane.extend({
+      childViews: ['contentView'],
+
+      contentView: SC.TemplateView.design(attrs)
+    });
+
+    return pane.create().append();
+  }
+});

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js

@@ -0,0 +1,11 @@
+sc_require("panes/pane");
+
+SC.Pane.reopen(
+  /** @scope SC.Pane.prototype */ {
+
+  recomputeDependentProperties: function(original) {
+    this.recomputeIsVisibleInWindow();
+    original();
+  }.enhance()
+
+});

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/system/browser.js

@@ -22,6 +22,7 @@ SC.mixin(SC.browser, (function() {
     isMozilla: !!browser.mozilla,
     isWindows: !!browser.windows,
     isMac: !!browser.mac,
+    isAndroid: !!browser.android,
     isiPhone: ((!!browser.mobileSafari || !!browser.standalone) && (viewport == 320 || viewport == 480)),
 
     /**

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/system/core_query.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-require('system/builder') ;
+sc_require('system/builder') ;
 
 // Alias jQuery as SC.$ and SC.CoreQuery for compatibility
 SC.$ = SC.CoreQuery = jQuery ;

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/device.js

@@ -0,0 +1,210 @@
+// ==========================================================================
+// 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/core_query');
+sc_require('system/ready');
+sc_require('system/root_responder');
+sc_require('system/platform');
+
+SC.PORTRAIT_ORIENTATION = 'portrait';
+SC.LANDSCAPE_ORIENTATION = 'landscape';
+SC.NO_ORIENTATION = 'desktop'; // value 'desktop' for backwards compatibility
+
+/**
+  The device object allows you to check device specific properties such as 
+  orientation and if the device is offline, as well as observe when they change 
+  state.
+  
+  h1. Orientation
+  When a touch device changes orientation, the orientation property will be
+  set accordingly which you can observe
+  
+  h1. Offline support
+  In order to build a good offline-capable web application, you need to know 
+  when your app has gone offline so you can for instance queue your server 
+  requests for a later time or provide a specific UI/message.
+  
+  Similarly, you also need to know when your application has returned to an 
+  'online' state again, so that you can re-synchronize with the server or do 
+  anything else that might be needed.
+  
+  By observing the 'isOffline' property you can be notified when this state
+  changes. Note that this property is only connected to the navigator.onLine
+  property, which is available on most modern browsers.
+  
+*/
+SC.device = SC.Object.create({
+  
+  /**
+    Sets the orientation for touch devices, either SC.LANDSCAPE_ORIENTATION
+    or SC.PORTRAIT_ORIENTATION. Will be SC.NO_ORIENTATION in the case of
+    non-touch devices that are also not simulating touch events.
+  
+    @property {String}
+    @default SC.NO_ORIENTATION
+  */
+  orientation: SC.NO_ORIENTATION,
+  
+  /**
+    Indicates whether the device is currently online or offline. For browsers
+    that do not support this feature, the default value is NO.
+    
+    Is currently inverse of the navigator.onLine property. Most modern browsers
+    will update this property when switching to or from the browser's Offline 
+    mode, and when losing/regaining network connectivity.
+    
+    @property {Boolean}
+    @default NO
+  */
+  isOffline: NO,
+
+  /**
+    Returns a Point containing the last known X and Y coordinates of the
+    mouse, if present.
+
+    @property {Point}
+  */
+  mouseLocation: function() {
+    var responder = SC.RootResponder.responder,
+        lastX = responder._lastMoveX,
+        lastY = responder._lastMoveY;
+
+    if (SC.empty(lastX) || SC.empty(lastY)) {
+      return null;
+    }
+
+    return { x: lastX, y: lastY };
+  }.property(),
+
+  /**
+    Initialize the object with some properties up front
+  */
+  init: function() {
+    sc_super();
+    
+    if (navigator && navigator.onLine === false) {
+      this.set('isOffline', YES);
+    }
+  },
+  
+  /**
+    As soon as the DOM is up and running, make sure we attach necessary
+    event handlers
+  */
+  setup: function() {
+    var responder = SC.RootResponder.responder;
+    responder.listenFor('online offline'.w(), document, this);
+    
+    this.orientationHandlingShouldChange();
+  },
+  
+  // ..........................................................
+  // ORIENTATION HANDLING
+  //
+  
+  /**
+    Determines which method to use for orientation changes.
+    Either detects orientation changes via the current size
+    of the window, or by the window.onorientationchange event.
+  */
+  orientationHandlingShouldChange: function() {
+    if (SC.platform.windowSizeDeterminesOrientation) {
+      SC.Event.remove(window, 'orientationchange', this, this.orientationchange);
+      this.windowSizeDidChange(SC.RootResponder.responder.get('currentWindowSize'));
+    } else if (SC.platform.supportsOrientationChange) {
+      SC.Event.add(window, 'orientationchange', this, this.orientationchange);
+      this.orientationchange();
+    }
+  },
+  
+  /**
+    @param {Hash} newSize The new size of the window
+    @returns YES if the method altered the orientation, NO otherwise
+  */
+  windowSizeDidChange: function(newSize) {
+    if (SC.platform.windowSizeDeterminesOrientation) {
+      if (!SC.browser.iOS) {
+        // in any browser other than iOS, use height vs. width test
+        SC.run(function() {
+          if (SC.platform.touch) {
+            if (newSize.height >= newSize.width) {
+              SC.device.set('orientation', SC.PORTRAIT_ORIENTATION);
+            } else {
+              SC.device.set('orientation', SC.LANDSCAPE_ORIENTATION);
+            }
+          } else {
+            SC.device.set('orientation', SC.NO_ORIENTATION);
+          }
+        });
+      } else {
+        // in mobile safari, because some of its chrome can make the
+        // above match landscape falsely, we compare to screen.width
+        SC.run(function() {
+          if (newSize.width === window.screen.width) {
+            SC.device.set('orientation', SC.PORTRAIT_ORIENTATION);
+          } else {
+            SC.device.set('orientation', SC.LANDSCAPE_ORIENTATION);
+          }
+        });
+      }
+      return YES;
+    }
+    return NO;
+  },
+  
+  /**
+    Called when the window.onorientationchange event is fired.
+  */
+  orientationchange: function(evt) {
+    SC.run(function() {
+      if (window.orientation === 0 || window.orientation === 180) {
+        SC.device.set('orientation', SC.PORTRAIT_ORIENTATION);
+      } else {
+        SC.device.set('orientation', SC.LANDSCAPE_ORIENTATION);
+      }
+    });
+  },
+  
+  orientationObserver: function(){
+    var body = SC.$(document.body),
+        orientation = this.get('orientation');
+    
+    if (orientation === SC.PORTRAIT_ORIENTATION) {
+      body.addClass('portrait');
+    } else {
+      body.removeClass('portrait');
+    }
+    
+    if (orientation === SC.LANDSCAPE_ORIENTATION) {
+      body.addClass('landscape');
+    } else {
+      body.removeClass('landscape');
+    }
+  }.observes('orientation'),
+  
+  
+  // ..........................................................
+  // CONNECTION HANDLING
+  // 
+  
+  online: function(evt) {
+    this.set('isOffline', NO);
+  },
+  
+  offline: function(evt) {
+    this.set('isOffline', YES);
+  }
+
+});
+
+/*
+  Invoked when the document is ready, but before main is called.  Creates
+  an instance and sets up event listeners as needed.
+*/
+SC.ready(function() {
+  SC.device.setup() ;
+});

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/system/event.js

@@ -83,7 +83,7 @@ SC.Event = function(originalEvent) {
         version = parseFloat(SC.browser.version);
 
     // normalize wheelDelta, wheelDeltaX, & wheelDeltaY for Safari
-    if (SC.browser.safari && originalEvent.wheelDelta!==undefined) {
+    if (SC.browser.webkit && originalEvent.wheelDelta!==undefined) {
       this.wheelDelta = 0-(originalEvent.wheelDeltaY || originalEvent.wheelDeltaX);
       this.wheelDeltaY = 0-(originalEvent.wheelDeltaY||0);
       this.wheelDeltaX = 0-(originalEvent.wheelDeltaX||0);
@@ -214,8 +214,8 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     if (!elem) return this; // nothing to do
 
 		if (!useCapture) {
-			var useCapture = NO;
-		};
+			useCapture = NO;
+		}
     
     // cannot register events on text nodes, etc.
     if ( elem.nodeType === 3 || elem.nodeType === 8 ) return SC.Event;
@@ -653,8 +653,8 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     var listener, special = this.special[eventType] ;
 
 		if (!useCapture) {
-			var useCapture = NO;
-		};
+			useCapture = NO;
+		}
 
     // Check for a special event handler
     // Only use addEventListener/attachEvent if the special

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/system/platform.js

@@ -14,6 +14,12 @@
   robust apps.
 */
 SC.platform = {
+  
+  /*
+    NOTES
+      - A development version of Chrome 9 incorrectly reported supporting touch
+      - Android is assumed to support touch, but incorrectly reports that it does not
+  */
   /**
     YES if the current device supports touch events, NO otherwise.
 
@@ -22,10 +28,10 @@ SC.platform = {
 
     @property {Boolean}
   */
-  touch: ('createTouch' in document) && SC.browser.chrome < 9, // Ugly hack for Chrome 9 issue
-
-  bounceOnScroll: (/iPhone|iPad|iPod/).test(navigator.platform),
-  pinchToZoom: (/iPhone|iPad|iPod/).test(navigator.platform),
+  touch: (('createTouch' in document) && SC.browser.chrome < 9) || SC.browser.android,
+  
+  bounceOnScroll: SC.browser.iOS,
+  pinchToZoom: SC.browser.iOS,
 
   input: {
     placeholder: ('placeholder' in document.createElement('input'))
@@ -88,6 +94,8 @@ SC.platform = {
       //@ endif
       return;
     }
+    
+    SC.Logger.log("Simulating touch events");
 
     // Tell the app that we now "speak" touch
     SC.platform.touch = YES;
@@ -107,6 +115,10 @@ SC.platform = {
     this.replaceEvent('mousemove', this._simtouch_mousemove);
     this.replaceEvent('mousedown', this._simtouch_mousedown);
     this.replaceEvent('mouseup', this._simtouch_mouseup);
+
+    // fix orientation handling
+    SC.platform.windowSizeDeterminesOrientation = YES;
+    SC.device.orientationHandlingShouldChange();
   },
 
   /** @private
@@ -244,7 +256,21 @@ SC.platform = {
   
   supportsCanvas: function() {
     return !!document.createElement('canvas').getContext;
-  }()
+  }(),
+  
+  supportsOrientationChange: ('onorientationchange' in window),
+  
+  /**
+    Because iOS is slow to dispatch the window.onorientationchange event,
+    we use the window size to determine the orientation on iOS devices
+    and desktop environments when SC.platform.touch is YES (ie. when
+    SC.platform.simulateTouchEvents has been called)
+    
+    @property {Boolean}
+    @default NO
+  */
+  windowSizeDeterminesOrientation: SC.browser.iOS || !('onorientationchange' in window)
+
 };
 
 /* Calculate CSS Prefixes */

data/lib/frameworks/sproutcore/frameworks/{amber → core_foundation}/system/ready.js

@@ -56,7 +56,7 @@ SC.mixin({
     },
     done: function() {
       SC.isReady = true;
-      if(window.main) { main(); }
+      if(window.main && !SC.suppressMain) { main(); }
       SC.RunLoop.end();
     }
   }