sproutcore 1.0.1049.pre.2 → 1.4.0.rc

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

@@ -59,7 +59,7 @@ SC.mixin(/** @scope SC */ {
           try { 
             lazyInfo[i]();
           }catch(e) {
-            console.log("SC.loadBundle(): Failted to lazily instatiate entry for  '%@'".fmt(bundleName));  
+            console.error("SC.loadBundle(): Failted to lazily instatiate entry for  '%@'".fmt(bundleName));  
           }
         }
         delete SC.LAZY_INSTANTIATION[bundleName];
@@ -87,9 +87,13 @@ SC.mixin(/** @scope SC */ {
     args.push(bundleName);
     
     var needsRunLoop = !!SC.RunLoop.currentRunLoop;
-    if (needsRunLoop) SC.RunLoop.begin() ;
-    m.apply(t, args) ;
-    if (needsRunLoop) SC.RunLoop.end() 
+    if (needsRunLoop) {
+      SC.run(function() {
+        m.apply(t, args) ;
+      });
+    } else {
+      m.apply(t, args) ;
+    }    
   },
   
   tryToLoadBundle: function(bundleName, target, method, args) {

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

@@ -1307,9 +1307,10 @@ SC.CoreQuery = (function() {
           // (It would be better if we knew the exact display type that they 
           // had)
           for (stLen = stack.length ; i < stLen; i++ ) {
-            if (styleIsBorked(stack[i])) {
-              swap[i] = stack[i].style.display;
-              stack[i].style.display = "block";
+            var stackTmp =stack[i];
+            if (stackTmp && stackTmp.style && styleIsBorked(stackTmp)) {
+              swap[i] = stackTmp.style.display;
+              stackTmp.style.display = "block";
             }
           }
 

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

@@ -28,13 +28,11 @@ sc_require('system/core_query') ;
   @since SproutCore 1.0
 */
 SC.Event = function(originalEvent) { 
-  var idx, len;
+
   // copy properties from original event, if passed in.
   if (originalEvent) {
     this.originalEvent = originalEvent ;
-    var props = SC.Event._props, key;
-    len = props.length;
-    idx = len;
+    var props = SC.Event._props, len = props.length, idx = len , key;
     while(--idx >= 0) {
       key = props[idx] ;
       this[key] = originalEvent[key] ;
@@ -77,28 +75,48 @@ SC.Event = function(originalEvent) {
     this.which = ((this.button & 1) ? 1 : ((this.button & 2) ? 3 : ( (this.button & 4) ? 2 : 0 ) ));
   }
   
-  // normalize wheelDelta, wheelDeltaX, & wheelDeltaY for Safari
-  if (SC.browser.safari && originalEvent.wheelDelta!==undefined) {
-    this.wheelDelta = 0-(originalEvent.wheelDeltaY || originalEvent.wheelDeltaX);
-    this.wheelDeltaY = 0-(originalEvent.wheelDeltaY||0);
-    this.wheelDeltaX = 0-(originalEvent.wheelDeltaX||0);
-  // normalize wheelDelta for Firefox
-  // note that we multiple the delta on FF to make it's acceleration more 
-  // natural.
-  } else if (!SC.none(originalEvent.detail)) {
-    var detail = Math.floor(originalEvent.detail * 40);
-    if (originalEvent.axis && (originalEvent.axis === originalEvent.HORIZONTAL_AXIS)) {
-      this.wheelDeltaX = detail;
-      this.wheelDeltaY = this.wheelDelta = 0;
+  // Normalize wheel delta values for mousewheel events
+  if (this.type === 'mousewheel' || this.type === 'DOMMouseScroll') {
+    var deltaMultiplier = 1,
+        version = parseFloat(SC.browser.version);
+
+    // normalize wheelDelta, wheelDeltaX, & wheelDeltaY for Safari
+    if (SC.browser.safari && originalEvent.wheelDelta!==undefined) {
+      this.wheelDelta = 0-(originalEvent.wheelDeltaY || originalEvent.wheelDeltaX);
+      this.wheelDeltaY = 0-(originalEvent.wheelDeltaY||0);
+      this.wheelDeltaX = 0-(originalEvent.wheelDeltaX||0);
+
+      // Scrolling in Safari 5.0.1, which is huge for some reason
+      if (version === 533.17) {
+        deltaMultiplier = 0.004;
+
+      // Scrolling in Safari 5.0
+      } else if (version < 533 || version >= 534) {
+        deltaMultiplier = 40;
+      }
+
+    // normalize wheelDelta for Firefox
+    // note that we multiple the delta on FF to make it's acceleration more 
+    // natural.
+    } else if (!SC.none(originalEvent.detail)) {
+      deltaMultiplier = 10;
+      if (originalEvent.axis && (originalEvent.axis === originalEvent.HORIZONTAL_AXIS)) {
+        this.wheelDeltaX = originalEvent.detail;
+        this.wheelDeltaY = this.wheelDelta = 0;
+      } else {
+        this.wheelDeltaY = this.wheelDelta = originalEvent.detail ;
+        this.wheelDeltaX = 0 ;
+      }
+
+    // handle all other legacy browser
     } else {
-      this.wheelDeltaY = this.wheelDelta = detail ;
+      this.wheelDelta = this.wheelDeltaY = SC.browser.msie ? 0-originalEvent.wheelDelta : originalEvent.wheelDelta ;
       this.wheelDeltaX = 0 ;
     }
-    
-  // handle all other legacy browser
-  } else {
-    this.wheelDelta = this.wheelDeltaY = SC.browser.msie ? 0-originalEvent.wheelDelta : originalEvent.wheelDelta ;
-    this.wheelDeltaX = 0 ;
+
+    this.wheelDelta *= deltaMultiplier;
+    this.wheelDeltaX *= deltaMultiplier;
+    this.wheelDeltaY *= deltaMultiplier;
   }
 
   return this; 
@@ -217,7 +235,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     }
     
     // Build the handler array and add to queue
-    handlers[SC.guidFor(method)] = [target, method, context];
+    handlers[SC.hashFor(target, method)] = [target, method, context];
     SC.Event._global[eventType] = YES ; // optimization for global triggers
 
     // Nullify elem to prevent memory leaks in IE
@@ -295,7 +313,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
           method = target[method] ;
         }
         
-        delete handlers[SC.guidFor(method)] ;
+        delete handlers[SC.hashFor(target, method)];
         
         // check to see if there are handlers left on this event/eventType.
         // if not, then cleanup the handlers.
@@ -423,7 +441,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
 
     // Handle triggering native .onfoo handlers
     onfoo = elem["on" + eventType] ;
-    isClick = SC.$.nodeName(elem, 'a') && eventType === 'click';
+    isClick = SC.CoreQuery.nodeName(elem, 'a') && eventType === 'click';
     if ((!fn || isClick) && onfoo && onfoo.apply(elem, args) === NO) ret = NO;
 
     // Trigger the native events (except for clicks on links)
@@ -721,13 +739,6 @@ SC.Event.prototype = {
     if (this.touchContext) return this.touchContext.touchesForView(view);
   },
   
-  /**
-    Same as touchesForView, but sounds better for responders.
-  */
-  touchesForResponder: function(responder) {
-    if (this.touchContext) return this.touchContext.touchesForView(responder);
-  },
-  
   /**
     Returns average data--x, y, and d (distance)--for the touches owned by the supplied view.
   */

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

@@ -0,0 +1,85 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  If an exception is thrown during execution of your SproutCore app, this
+  object will be given the opportunity to handle it.
+
+  By default, a simple error message is displayed prompting the user to
+  reload. You could override the handleException method to, for example, send
+  an XHR to your servers so you can collect information about crashes in your
+  application.
+
+  Since the application is in an unknown state when an exception is thrown, we
+  rely on JavaScript and DOM manipulation to generate the error instead of
+  using SproutCore views.
+
+  @since SproutCore 1.5
+*/
+
+SC.ExceptionHandler = {
+  /**
+    Called when an exception is encountered by code executed using SC.run().
+
+    By default, this will display an error dialog to the user. If you
+    want more sophisticated behavior, override this method.
+
+    @param {Exception} exception the exception thrown during execution
+  */
+  handleException: function(exception) {
+    if (this.isShowingErrorDialog) return;
+
+    this._displayErrorDialog(exception);
+  },
+
+  /** @private
+    Creates the error dialog and appends it to the DOM.
+
+    @param {Exception} exception the exception to display
+  */
+  _displayErrorDialog: function(exception) {
+    var html = this._errorDialogHTMLForException(exception),
+        node = document.createElement('div');
+
+    node.style.cssText = "left: 0px; right: 0px; top: 0px; bottom: 0px; position: absolute; background-color: white; background-color: rgba(255,255,255,0.6); z-index:100;";
+    node.innerHTML = html;
+
+    document.body.appendChild(node);
+
+    this.isShowingErrorDialog = YES;
+  },
+
+  /** @private
+    Given an exception, returns the HTML for the error dialog.
+
+    @param {Exception} exception the exception to display
+    @returns {String}
+  */
+  _errorDialogHTMLForException: function(exception) {
+    var html;
+
+    html = [
+'<div id="sc-error-dialog" style="position: absolute; width: 500px; left: 50%; top: 50%; margin-left: -250px; background-color: white; border: 1px solid black; font-family: Monaco, monospace; font-size: 9px; letter-spacing: 1px; padding: 10px">',
+  'An error has occurred which prevents the application from running:',
+  '<br><br>',
+  exception.message,
+  '<div id="sc-error-dialog-reload-button" onclick="window.location.reload();" style="float: right; font-family: Monaco, monospace; font-size: 9px; letter-spacing: 1px; border: 1px solid black; padding: 3px; clear: both; margin-top: 20px; cursor: pointer;">',
+  'Reload',
+  '</div>',
+'</div>'
+    ];
+
+    return html.join('');
+  },
+
+  /**
+    YES if an exception was thrown and the error dialog is visible.
+
+    @property {Boolean}
+  */
+  isShowingErrorDialog: NO
+};

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

@@ -344,21 +344,21 @@ SC.imageCache = SC.Object.create(/** @scope SC.imageCache.prototype */ {
   
   /** @private invoked by Image().  Note that this is the image instance */
   _imageDidAbort: function() {
-    SC.RunLoop.begin();
-    SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.ABORTED);
-    SC.RunLoop.end();
+    SC.run(function() {
+      SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.ABORTED);
+    }, this);
   },
   
   _imageDidError: function() {
-    SC.RunLoop.begin();
-    SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.ERROR);
-    SC.RunLoop.end();
+    SC.run(function() {
+      SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.ERROR);
+    }, this);
   },
   
   _imageDidLoad: function() {
-    SC.RunLoop.begin();
-    SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.LOADED);
-    SC.RunLoop.end();
+    SC.run(function() {
+      SC.imageCache.imageStatusDidChange(this.entry, SC.imageCache.LOADED);
+    }, this);
   },
 
   /** @private called whenever the image loading status changes.  Notifies

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

@@ -13,10 +13,14 @@
   and events are supported by the browser, allowing you to create much more
   robust apps.
 */
+
 SC.platform = {
   /**
     YES if the current device supports touch events, NO otherwise.
 
+    You can simulate touch events in environments that don't support them by
+    calling SC.platform.simulateTouchEvents() from your browser's console.
+
     @property {Boolean}
   */
   touch: ('createTouch' in document),
@@ -24,10 +28,6 @@ SC.platform = {
   bounceOnScroll: (/iPhone|iPad|iPod/).test(navigator.platform),
   pinchToZoom: (/iPhone|iPad|iPod/).test(navigator.platform),
 
-  input: {
-    placeholder: (function() { return 'placeholder' in document.createElement('input'); })()
-  },
-
   /**
     A hash that contains properties that indicate support for new HTML5
     input attributes.
@@ -70,6 +70,40 @@ SC.platform = {
   */
   domCSSPrefix: null,
 
+  /**
+    Call this method to swap out the default mouse handlers with proxy methods
+    that will translate mouse events to touch events.
+
+    This is useful if you are debugging touch functionality on the desktop.
+  */
+  simulateTouchEvents: function() {
+    // Touch events are supported natively, no need for this.
+    if (this.touch) {
+      //@ if (debug)
+      SC.Logger.info("Can't simulate touch events in an environment that supports them.");
+      //@ endif
+      return;
+    }
+
+    // Tell the app that we now "speak" touch
+    SC.platform.touch = YES;
+
+    // CSS selectors may depend on the touch class name being present
+    document.body.className = document.body.className + ' touch';
+
+    // Initialize a counter, which we will use to generate unique ids for each
+    // fake touch.
+    this._simtouch_counter = 1;
+
+    // Remove events that don't exist in touch environments
+    this.removeEvents('click dblclick mouseout mouseover mousewheel'.w());
+
+    // Replace mouse events with our translation methods
+    this.replaceEvent('mousemove', this._simtouch_mousemove);
+    this.replaceEvent('mousedown', this._simtouch_mousedown);
+    this.replaceEvent('mouseup', this._simtouch_mouseup);
+  },
+
   /** @private
     Removes event listeners from the document.
 
@@ -94,6 +128,69 @@ SC.platform = {
     SC.Event.add(document, evt, this, replacement);
   },
 
+  /** @private
+    When simulating touch events, this method is called when mousemove events
+    are received.
+  */
+  _simtouch_mousemove: function(evt) {
+    if (!this._mousedown) return NO;
+
+    var manufacturedEvt = this.manufactureTouchEvent(evt, 'touchmove');
+    return SC.RootResponder.responder.touchmove(manufacturedEvt);
+  },
+
+  /** @private
+    When simulating touch events, this method is called when mousedown events
+    are received.
+  */
+  _simtouch_mousedown: function(evt) {
+    this._mousedown = YES;
+
+    var manufacturedEvt = this.manufactureTouchEvent(evt, 'touchstart');
+    return SC.RootResponder.responder.touchstart(manufacturedEvt);
+  },
+
+  /** @private
+    When simulating touch events, this method is called when mouseup events
+    are received.
+  */
+  _simtouch_mouseup: function(evt) {
+    var manufacturedEvt = this.manufactureTouchEvent(evt, 'touchend'),
+        ret = SC.RootResponder.responder.touchend(manufacturedEvt);
+
+    this._mousedown = NO;
+    this._simtouch_counter++;
+    return ret;
+  },
+
+  /** @private
+    Converts a mouse-style event to a touch-style event.
+
+    Note that this method edits the passed event in place, and returns
+    that same instance instead of a new, modified version.
+
+    @param {Event} evt the mouse event to modify
+    @param {String} type the type of event (e.g., touchstart)
+    @returns {Event} the mouse event with an added changedTouches array
+  */
+  manufactureTouchEvent: function(evt, type) {
+    var touch, touchIdentifier = this._simtouch_counter;
+
+    touch = {
+      type: type,
+      target: evt.target,
+      identifier: touchIdentifier,
+      pageX: evt.pageX,
+      pageY: evt.pageY,
+      screenX: evt.screenX,
+      screenY: evt.screenY,
+      clientX: evt.clientX,
+      clientY: evt.clientY
+    };
+
+    evt.changedTouches = evt.touches = [ touch ];
+    return evt;
+  },
 
   /**
     Whether the browser supports CSS transitions. Calculated later.
@@ -117,6 +214,13 @@ SC.platform = {
   */
   supportsCSS3DTransforms: NO,
   
+  /**
+    Whether the browser can handle accelerated layers. While supports3DTransforms tells us if they will
+    work in principle, sometimes accelerated layers interfere with things like getBoundingClientRect.
+    Then everything breaks.
+  */
+  supportsAcceleratedLayers: NO,
+  
   /**
     Wether the browser supports the hashchange event.
   */
@@ -125,7 +229,6 @@ SC.platform = {
     // documentMode logic from YUI to filter out IE8 Compat Mode which false positives
     return ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7);
   }()
-
 };
 
 /* Calculate CSS Prefixes */
@@ -185,5 +288,10 @@ SC.platform = {
   } else if(window.styleMedia && window.styleMedia.matchMedium) {
     if (!window.styleMedia.matchMedium('(-webkit-transform-3d)')) SC.platform.supportsCSS3DTransforms = NO;    
   }
-
+  
+  // Unfortunately, this has to be manual, as I can't think of a good way to test it
+  // webkit-only for now.
+  if (SC.platform.supportsCSSTransforms && SC.platform.cssPrefix === "webkit") {
+    SC.platform.supportsAcceleratedLayers = YES;
+  }
 })();

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

@@ -7,6 +7,8 @@
 
 /*global main */
 
+SC.BENCHMARK_LOG_READY = YES;
+
 sc_require('system/event') ;
 
 SC.mixin({
@@ -110,47 +112,44 @@ SC.mixin({
     SC.Benchmark.start('ready') ;
     
     // Begin runloop
-    SC.RunLoop.begin();
-    
-    var handler, ary, idx, len ;
-
-    // correctly handle queueing new SC.ready() calls
-    do {
-      ary = SC._readyQueue ;
-      SC._readyQueue = [] ; // reset
-      for (idx=0, len=ary.length; idx<len; idx++) {
-        handler = ary[idx] ;
-        var target = handler[0] || document ;
-        var method = handler[1] ;
-        if (method) method.call(target) ;
-      }
-    } while (SC._readyQueue.length > 0) ;
+    SC.run(function() {
+      var handler, ary, idx, len ;
 
-    // okay, now we're ready (any SC.ready() calls will now be called immediately)
-    SC.isReady = YES ;
-    
-    // clear the queue
-    SC._readyQueue = null ;
-    
-    // trigger any bound ready events
-    SC.Event.trigger(document, "ready", null, NO);
-    
-    // Remove any loading div
-    if (SC.removeLoading) SC.$('#loading').remove();
-    
-    // Now execute main, if defined and SC.UserDefaults is ready
-    if(SC.userDefaults.get('ready')){
-      if ((SC.mode === SC.APP_MODE) && (typeof main != "undefined") && (main instanceof Function) && !SC.suppressMain) main();
-    } 
-    else {
-      SC.userDefaults.readyCallback(window, main);
-    }
-    
-    // end run loop.  This is probably where a lot of bindings will trigger
-    SC.RunLoop.end() ; 
+      // correctly handle queueing new SC.ready() calls
+      do {
+        ary = SC._readyQueue ;
+        SC._readyQueue = [] ; // reset
+        for (idx=0, len=ary.length; idx<len; idx++) {
+          handler = ary[idx] ;
+          var target = handler[0] || document ;
+          var method = handler[1] ;
+          if (method) method.call(target) ;
+        }
+      } while (SC._readyQueue.length > 0) ;
+
+      // okay, now we're ready (any SC.ready() calls will now be called immediately)
+      SC.isReady = YES ;
+
+      // clear the queue
+      SC._readyQueue = null ;
+
+      // trigger any bound ready events
+      SC.Event.trigger(document, "ready", null, NO);
+
+      // Remove any loading div
+      if (SC.removeLoading) SC.$('#loading').remove();
+
+      // Now execute main, if defined and SC.UserDefaults is ready
+      if(SC.userDefaults.get('ready')){
+        if ((SC.mode === SC.APP_MODE) && (typeof main != "undefined") && (main instanceof Function) && !SC.suppressMain) main();
+      } 
+      else {
+        SC.userDefaults.readyCallback(window, main);
+      }
+    }, this);
     
     SC.Benchmark.end('ready') ;
-    SC.Benchmark.log();
+    if (SC.BENCHMARK_LOG_READY) SC.Benchmark.log();
   },
   
   /**