sproutcore 1.0.1049.pre.2 → 1.4.0.rc

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

@@ -16,14 +16,6 @@ SC.MODE_APPEND = 'append';
 /** set update mode on context to prepend content */
 SC.MODE_PREPEND = 'prepend';
 
-/** list of numeric properties that should not have 'px' appended */
-SC.NON_PIXEL_PROPERTIES = 'zIndex font-weight opacity'.w();
-
-/** a list of styles that get expanded into multiple properties, add more as you discover them */
-SC.COMBO_STYLES = {
-  WebkitTransition: 'WebkitTransitionProperty WebkitTransitionDuration WebkitTransitionDelay WebkitTransitionTimingFunction'.w()
-};
-
 /**
   @namespace
   
@@ -396,8 +388,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
         if (!styles.hasOwnProperty(key)) continue ;
         value = styles[key];
         if (value === null) continue; // skip empty styles
-
-        if (!isNaN(value) && !SC.NON_PIXEL_PROPERTIES.contains(key)) value += "px";
+        if (typeof value === SC.T_NUMBER && key !== "zIndex") value += "px";
         pair[0] = this._dasherizeStyleName(key);
         pair[1] = value;
         joined.push(pair.join(': '));
@@ -460,7 +451,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
           if(!styles.hasOwnProperty(key)) continue ;
           value = styles[key];
           if (value === null) continue; // skip empty styles
-          if (!isNaN(value) && !SC.NON_PIXEL_PROPERTIES.contains(key)) value += "px";
+          if (!isNaN(value) && key !== "zIndex") value += "px";
 
           pair[0] = this._dasherizeStyleName(key);
           pair[1] = value;
@@ -816,23 +807,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
       return this ;
     }
   },
-
-  _deleteComboStyles: function(styles, key) {
-    var comboStyles = SC.COMBO_STYLES[key],
-        didChange = NO;
-
-    if (comboStyles) {
-      var idx;
-      for (idx=0; idx < comboStyles.length; idx++) {
-        if (styles[comboStyles[idx]]) {
-          delete styles[comboStyles[idx]];
-          didChange = YES;
-        }
-      }
-    }
-    return didChange;
-  },
-
+  
   /**
     Apply the passed styles to the tag.  You can pass either a single key
     value pair or a hash of styles.  Note that if you set a style on an 
@@ -848,25 +823,22 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     // clone them if needed.  This will get the actual styles hash so we can
     // edit it directly.
     var key, didChange = NO, styles = this.styles();
-
+    
     // simple form
     if (typeof nameOrStyles === SC.T_STRING) {
       if (value === undefined) { // reader
         return styles[nameOrStyles];
       } else { // writer
-        didChange = this._deleteComboStyles(styles, nameOrStyles);
         if (styles[nameOrStyles] !== value) {
           styles[nameOrStyles] = value ;
-          didChange = YES ;
+          this._stylesDidChange = YES ;
         }
-        if (didChange) this._stylesDidChange = YES;
       }
       
     // bulk form
     } else {
       for(key in nameOrStyles) {
         if (!nameOrStyles.hasOwnProperty(key)) continue ;
-        didChange = didChange || this._deleteComboStyles(styles, key);
         value = nameOrStyles[key];
         if (styles[key] !== value) {
           styles[key] = value;

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

@@ -256,26 +256,24 @@ SC.Response = SC.Object.extend(
       var req = this.get('request');
       var source = req ? req.get('source') : null;
     
-      SC.RunLoop.begin();
-    
-      // invoke the source, giving a chance to fixup the reponse or (more 
-      // likely) cancel the request.
-      if (source && source.willReceive) source.willReceive(req, this);
-    
-      // invoke the callback.  note if the response was cancelled or not
-      callback.call(context, !this.get('isCancelled'));
-    
-      // if we weren't cancelled, then give the source first crack at handling
-      // the response.  if the source doesn't want listeners to be notified,
-      // it will cancel the response.
-      if (!this.get('isCancelled') && source && source.didReceive) {
-        source.didReceive(req, this);
-      }
+      SC.run(function() {
+        // invoke the source, giving a chance to fixup the reponse or (more 
+        // likely) cancel the request.
+        if (source && source.willReceive) source.willReceive(req, this);
 
-      // notify listeners if we weren't cancelled.
-      if (!this.get('isCancelled')) this.notify();
+        // invoke the callback.  note if the response was cancelled or not
+        callback.call(context, !this.get('isCancelled'));
 
-      SC.RunLoop.end();
+        // if we weren't cancelled, then give the source first crack at handling
+        // the response.  if the source doesn't want listeners to be notified,
+        // it will cancel the response.
+        if (!this.get('isCancelled') && source && source.didReceive) {
+          source.didReceive(req, this);
+        }
+
+        // notify listeners if we weren't cancelled.
+        if (!this.get('isCancelled')) this.notify();
+      }, this);
     }
     
     // no matter what, remove from inflight queue
@@ -457,7 +455,7 @@ SC.XHRResponse = SC.Response.extend({
     // configure async callback - differs per browser...
     async = !!this.getPath('request.isAsynchronous') ;
     if (async) {
-      if (!SC.browser.msie) {
+      if (!SC.browser.msie && !SC.browser.opera ) {
         SC.Event.add(rawRequest, 'readystatechange', this, 
                      this.finishRequest, rawRequest) ;
       } else {

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

@@ -258,28 +258,35 @@ SC.RootResponder = SC.Object.extend({
 
     @returns Rect
   */
-  computeWindowSize: function() {
-    var size ;
-    if (window.innerHeight) {
-      size = {
-        width: window.innerWidth,
-        height: window.innerHeight
-      } ;
-
-    } else if (document.documentElement && document.documentElement.clientHeight) {
-      size = {
-        width: document.documentElement.clientWidth,
-        height: document.documentElement.clientHeight
-      } ;
-
-    } else if (document.body) {
-      size = {
-        width: document.body.clientWidth,
-        height: document.body.clientHeight
-      } ;
-    }
-    return size;
-  },
+    computeWindowSize: function() {
+      var size, bod, docElement;
+      if(!this._bod || !this._docElement){
+        bod = document.body;
+        docElement = document.documentElement;
+        this._bod=bod;
+        this._docElement=docElement;
+      }else{
+        bod = this._bod;
+        docElement = this._docElement;
+      }
+      if (window.innerHeight) {
+        size = {
+          width: window.innerWidth,
+          height: window.innerHeight
+        } ;
+      } else if (docElement && docElement.clientHeight) {
+        size = {
+          width: docElement.clientWidth,
+          height: docElement.clientHeight
+        };
+      } else if (bod) {
+        size = {
+          width: bod.clientWidth,
+          height: bod.clientHeight
+        } ;
+      }
+      return size;
+    },
 
   /**
     On window resize, notifies panes of the change.
@@ -296,12 +303,12 @@ SC.RootResponder = SC.Object.extend({
     // calculate new window size...
     var newSize = this.computeWindowSize(), oldSize = this.get('currentWindowSize');
     this.set('currentWindowSize', newSize); // update size
-
+    
     if (!SC.rectsEqual(newSize, oldSize)) {
       //Notify orientation change. This is faster than waiting for the orientation
       //change event.
       if(SC.platform.touch){
-        var body = SC.$(document.body);
+        var body = SC.$(document.body);    
         if(newSize.height>= newSize.width) {
           SC.device.set('orientation', 'portrait');
         }
@@ -311,9 +318,9 @@ SC.RootResponder = SC.Object.extend({
       }
       // notify panes
       if (this.panes) {
-        SC.RunLoop.begin() ;
-        this.panes.invoke('windowSizeDidChange', oldSize, newSize) ;
-        SC.RunLoop.end() ;
+        SC.run(function() {
+          this.panes.invoke('windowSizeDidChange', oldSize, newSize) ;
+        }, this);
       }
     }
   },
@@ -336,9 +343,9 @@ SC.RootResponder = SC.Object.extend({
     if (!this.get('hasFocus')) {
       SC.$('body').addClass('sc-focus').removeClass('sc-blur');
 
-      SC.RunLoop.begin();
-      this.set('hasFocus', YES);
-      SC.RunLoop.end();
+      SC.run(function() {
+        this.set('hasFocus', YES);
+      }, this);
     }
     return YES ; // allow default
   },
@@ -370,9 +377,9 @@ SC.RootResponder = SC.Object.extend({
     if (this.get('hasFocus')) {
       SC.$('body').addClass('sc-blur').removeClass('sc-focus');
 
-      SC.RunLoop.begin();
-      this.set('hasFocus', NO);
-      SC.RunLoop.end();
+      SC.run(function() {
+        this.set('hasFocus', NO);
+      }, this);
     }
     return YES ; // allow default
   },
@@ -415,20 +422,20 @@ SC.RootResponder = SC.Object.extend({
     @returns {Boolean} YES if action was performed, NO otherwise
     @test in targetForAction
   */
-  sendAction: function( action, target, sender, pane, context, firstResponder) {
-    target = this.targetForAction(action, target, sender, pane, firstResponder) ;
+  sendAction: function( action, target, sender, pane, context) {
+    target = this.targetForAction(action, target, sender, pane) ;
 
     // HACK: If the target is a ResponderContext, forward the action.
     if (target && target.isResponderContext) {
-      return !!target.sendAction(action, sender, context, firstResponder);
+      return !!target.sendAction(action, sender, context);
     } else return target && target.tryToPerform(action, sender);
   },
 
-  _responderFor: function(target, methodName, firstResponder) {
+  _responderFor: function(target, methodName) {
     var defaultResponder = target ? target.get('defaultResponder') : null;
 
     if (target) {
-      target = firstResponder || target.get('firstResponder') || target;
+      target = target.get('firstResponder') || target;
       do {
         if (target.respondsTo(methodName)) return target ;
       } while ((target = target.get('nextResponder'))) ;
@@ -465,10 +472,9 @@ SC.RootResponder = SC.Object.extend({
     @param {String} method name for target
     @param {Object} sender optional sender
     @param {SC.Pane} optional pane
-    @param {firstResponder} a first responder to use
     @returns {Object} target object or null if none found
   */
-  targetForAction: function(methodName, target, sender, pane, firstResponder) {
+  targetForAction: function(methodName, target, sender, pane) {
 
     // 1. no action, no target...
     if (!methodName || (SC.typeOf(methodName) !== SC.T_STRING)) {
@@ -482,7 +488,7 @@ SC.RootResponder = SC.Object.extend({
                   SC.objectForPropertyPath(target, sender);
       }
 
-      if (target) {
+      if (target && !target.isResponderContext) {
         if (target.respondsTo && !target.respondsTo(methodName)) {
           target = null ;
         } else if (SC.typeOf(target[methodName]) !== SC.T_FUNCTION) {
@@ -495,7 +501,7 @@ SC.RootResponder = SC.Object.extend({
 
     // 3. an explicit pane was passed...
     if (pane) {
-      return this._responderFor(pane, methodName, firstResponder) ;
+      return this._responderFor(pane, methodName) ;
     }
 
     // 4. no target or pane passed... try to find target in the active panes
@@ -556,16 +562,14 @@ SC.RootResponder = SC.Object.extend({
   sendEvent: function(action, evt, target) {
     var pane, ret ;
 
-    SC.RunLoop.begin() ;
-
-    // get the target pane
-    if (target) pane = target.get('pane') ;
-    else pane = this.get('menuPane') || this.get('keyPane') || this.get('mainPane') ;
-
-    // if we found a valid pane, send the event to it
-    ret = (pane) ? pane.sendEvent(action, evt, target) : null ;
+    SC.run(function() {
+      // get the target pane
+      if (target) pane = target.get('pane') ;
+      else pane = this.get('menuPane') || this.get('keyPane') || this.get('mainPane') ;
 
-    SC.RunLoop.end() ;
+      // if we found a valid pane, send the event to it
+      ret = (pane) ? pane.sendEvent(action, evt, target) : null ;
+    }, this);
 
     return ret ;
   },
@@ -658,6 +662,15 @@ SC.RootResponder = SC.Object.extend({
     var mousewheel = SC.browser.mozilla ? 'DOMMouseScroll' : 'mousewheel';
     SC.Event.add(document, mousewheel, this, this.mousewheel);
 
+
+
+    // If the browser is identifying itself as a touch-enabled browser, but
+    // touch events are not present, assume this is a desktop browser doing
+    // user agent spoofing and simulate touch events automatically.
+    if (SC.browser && SC.platform && SC.browser.mobileSafari && !SC.platform.touch) {
+      SC.platform.simulateTouchEvents();
+    }
+
     // do some initial set
     this.set('currentWindowSize', this.computeWindowSize()) ;
     this.focus(); // assume the window is focused when you load.
@@ -741,8 +754,24 @@ SC.RootResponder = SC.Object.extend({
       };
       SC.RunLoop.prototype.endRunLoop = patch;
     }
+    
+    // Orientation changes are not being reliably reported with iPhone 0S 3
+    // We do this initialization to double check the right orientation.
+    // This happens if the orientation has changed from the moment the app 
+    // started loading until the app is set until isReady
+    if(SC.platform.touch){
+      var newSize = this.computeWindowSize(),
+          body = SC.$(document.body);
+    
+      if(newSize.height>= newSize.width) {
+        SC.device.set('orientation', 'portrait');
+      }
+      else {
+        SC.device.set('orientation', 'landscape');
+      }
+    }
   },
-  
+
   // ................................................................................
   // TOUCH SUPPORT
   //
@@ -773,7 +802,7 @@ SC.RootResponder = SC.Object.extend({
   _touches: {},
 
   /**
-    Returns the touches that are registered to the specified view or responder; undefined if none.
+    Returns the touches that are registered to the specified view; undefined if none.
 
     When views receive a touch event, they have the option to subscribe to it.
     They are then mapped to touch events and vice-versa. This returns touches mapped to the view.
@@ -842,7 +871,7 @@ SC.RootResponder = SC.Object.extend({
 
   assignTouch: function(touch, view) {
     // sanity-check
-    if (touch.hasEnded) throw "This touch is done for! Yet something tried to assign it.";
+    if (touch.hasEnded) throw "Attemt to assign a touch that is already finished.";
     
     // unassign from old view if necessary
     if (touch.view === view) return;
@@ -894,10 +923,9 @@ SC.RootResponder = SC.Object.extend({
     The touch responder for any given touch is the view which will receive touch events
     for that touch. Quite simple.
 
-    By default, makeTouchResponder takes the supplied responder and just uses it. However, if upViewChain
-    is supplied and is YES, makeTouchResponder takes a potential responder as an argument, and, by calling 
-    touchStart on each nextResponder, finds the actual responder. As a side-effect of how it does this, touchStart 
-    is called on the new responder before touchCancelled is called on the old one (touchStart has to accept the touch
+    makeTouchResponder takes a potential responder as an argument, and, by calling touchStart on each
+    nextResponder, finds the actual responder. As a side-effect of how it does this, touchStart is called
+    on the new responder before touchCancelled is called on the old one (touchStart has to accept the touch
     before it can be considered cancelled).
 
     You usually don't have to think about this at all. However, if you don't want your view to,
@@ -1065,8 +1093,6 @@ SC.RootResponder = SC.Object.extend({
     this.makeTouchResponder(touch, target, shouldStack, YES);
   },
   
-  
-  
   /** @private
     Artificially calls endTouch for any touch which is no longer present. This is necessary because
     _sometimes_, WebKit ends up not sending endtouch.
@@ -1115,7 +1141,11 @@ SC.RootResponder = SC.Object.extend({
       responder = responders[responderIdx];
       while (responder) {
         // tell it
-        if (responder[action]) responder[action](touchEntry, evt);
+        try { // keep in mind that it might only _be_ here because it crashed...
+          if (responder[action]) responder[action](touchEntry, evt);
+        } catch(e) {
+          console.error('crashed on endTouch');
+        }
         
         // check to see if the responder changed, and stop immediately if so.
         if (touchEntry.touchResponder !== originalResponder) break;
@@ -1133,9 +1163,26 @@ SC.RootResponder = SC.Object.extend({
     "Finishes" a touch. That is, it eradicates it from our touch entries and removes all responder, etc. properties.
   */
   finishTouch: function(touch) {
+    var elem;
+    
     // ensure the touch is indeed unassigned.
     this.unassignTouch(touch);
     
+    // If we rescued this touch's initial element, we should remove it 
+    // from the DOM and garbage collect now. See setup() for an 
+    // explanation of this bug/workaround.
+    if (elem = touch._rescuedElement) {
+      if (elem.swapNode && elem.swapNode.parentNode) {
+        elem.swapNode.parentNode.replaceChild(elem, elem.swapNode);
+      } else if (elem.parentNode === SC.touchHoldingPen) {
+        SC.touchHoldingPen.removeChild(elem);
+      }
+      delete touch._rescuedElement;
+      elem.swapNode = null;
+      elem = null;
+    }
+    
+    
     // clear responders (just to be thorough)
     touch.touchResponders = null;
     touch.touchResponder = null;
@@ -1158,16 +1205,16 @@ SC.RootResponder = SC.Object.extend({
     @returns {Boolean}
   */
   touchstart: function(evt) {
-    SC.RunLoop.begin();
-    
-    // sometimes WebKit is a bit... iffy:
-    this.endMissingTouches(evt.touches);
+    var hidingTouchIntercept = NO;
 
-    // as you were...    
-    try {
+    SC.run(function() {
+      // sometimes WebKit is a bit... iffy:
+      this.endMissingTouches(evt.touches);
+
+      // as you were...    
       // loop through changed touches, calling touchStart, etc.
-      var idx, touches = evt.changedTouches, len = touches.length, target, view, touch, touchEntry,
-          hidingTouchIntercept = NO;
+      var idx, touches = evt.changedTouches, len = touches.length,
+          target, view, touch, touchEntry;
 
       // prepare event for touch mapping.
       evt.touchContext = this;
@@ -1178,10 +1225,13 @@ SC.RootResponder = SC.Object.extend({
 
         // Create an SC.Touch instance for every touch.
         touchEntry = SC.Touch.create(touch, this);
-        
+
+        // skip the touch if there was no target
+        if (!touchEntry.targetView) continue;
+
         // account for hidden touch intercept (passing through touches, etc.)
         if (touchEntry.hidesTouchIntercept) hidingTouchIntercept = YES;
-        
+
         // set timestamp
         touchEntry.timeStamp = evt.timeStamp;
 
@@ -1191,7 +1241,7 @@ SC.RootResponder = SC.Object.extend({
         this._touches[touch.identifier] = touchEntry;
 
         // set the event (so default action, etc. can be stopped)
-        touch.event = evt; // will be unset momentarily
+        touchEntry.event = evt; // will be unset momentarily
 
         // send out event thing: creates a chain, goes up it, then down it,
         // with startTouch and cancelTouch. in this case, only startTouch, as
@@ -1200,21 +1250,17 @@ SC.RootResponder = SC.Object.extend({
         this.captureTouch(touchEntry, this);
 
         // Unset the reference to the original event so we can garbage collect.
-        touch.event = null;
+        touchEntry.event = null;
       }
-    } catch (e) {
-      SC.Logger.warn('Exception during touchStart: %@'.fmt(e)) ;
-      SC.RunLoop.end();
-      return NO ;
-    }
+    }, this);
 
-    SC.RunLoop.end();
     
+    // hack for text fields
     if (hidingTouchIntercept) {
-      evt.allowDefault();
       return YES;
     }
-    return NO;
+    
+    return evt.hasCustomEventHandling;
   },
 
   /**
@@ -1222,9 +1268,7 @@ SC.RootResponder = SC.Object.extend({
     used to keep track of when a specific type of touch event was last handled, to see if it needs to be re-handled
   */
   touchmove: function(evt) {
-    SC.RunLoop.begin();
-    
-    try {
+    SC.run(function() {
       // pretty much all we gotta do is update touches, and figure out which views need updating.
       var touches = evt.changedTouches, touch, touchEntry,
           idx, len = touches.length, view, changedTouches, viewTouches, firstTouch,
@@ -1241,14 +1285,14 @@ SC.RootResponder = SC.Object.extend({
 
         // get our touch
         touchEntry = this._touches[touch.identifier];
-        if (touchEntry.hidesTouchIntercept) hidingTouchIntercept = YES;
 
-        // sanity-check
+        // we may have no touch entry; this can happen if somehow the touch came to a non-SC area.
         if (!touchEntry) {
-          SC.Logger.log("Received a touchmove for a touch we don't know about. This is bad.");
           continue;
         }
 
+        if (touchEntry.hidesTouchIntercept) hidingTouchIntercept = YES;
+
         // update touch
         touchEntry.pageX = touch.pageX;
         touchEntry.pageY = touch.pageY;
@@ -1258,7 +1302,7 @@ SC.RootResponder = SC.Object.extend({
         // if the touch entry has a view
         if (touchEntry.touchResponder) {
           view = touchEntry.touchResponder;
-          
+
           guid = SC.guidFor(view);
           // create a view entry
           if (!changedViews[guid]) changedViews[guid] = { "view": view, "touches": [] };
@@ -1291,9 +1335,9 @@ SC.RootResponder = SC.Object.extend({
         evt.touchContext = this; // so it can call touchesForView
 
         // and go
-        if (view.touchesDragged) view.touchesDragged(evt, viewTouches);
+        view.tryToPerform("touchesDragged", evt, viewTouches);
       }
-      
+
       // clear references to event
       touches = evt.changedTouches;
       len = touches.length;
@@ -1302,59 +1346,61 @@ SC.RootResponder = SC.Object.extend({
         touchEntry = this._touches[touch.identifier];
         touchEntry.event = null;
       }
-    } catch (e) {
-      SC.Logger.warn('Exception during touchMove: %@'.fmt(e)) ;
-    }
-    SC.RunLoop.end();
-    
-    return NO;
+    }, this);
+
+    return evt.hasCustomEventHandling;
   },
-  
+
   touchend: function(evt) {
-    SC.RunLoop.begin();
-    try {
+    var hidesTouchIntercept = NO;
+
+    SC.run(function() {
       var touches = evt.changedTouches, touch, touchEntry,
           idx, len = touches.length,
           view, elem,
           action = evt.isCancel ? "touchCancelled" : "touchEnd", a,
-          responderIdx, responders, responder, hidesTouchIntercept = NO;
+          responderIdx, responders, responder;
 
       for (idx = 0; idx < len; idx++) {
         //get touch+entry
         touch = touches[idx];
         touch.type = 'touchend';
         touchEntry = this._touches[touch.identifier];
+
+        // check if there is an entry
+        if (!touchEntry) continue;
+
+        // continue work
         touchEntry.timeStamp = evt.timeStamp;
         touchEntry.pageX = touch.pageX;
         touchEntry.pageY = touch.pageY;
         touchEntry.type = 'touchend';
-        
+        touchEntry.event = evt;
+
+        if (SC.LOG_TOUCH_EVENTS) SC.Logger.info('-- Received touch end');
         if (touchEntry.hidesTouchIntercept) {
           touchEntry.unhideTouchIntercept();
           hidesTouchIntercept = YES;
         }
-        
+
         if (this._drag) {
           this._drag.tryToPerform('mouseUp', touch) ;
           this._drag = null ;
         }
 
+        // unassign
         this.endTouch(touchEntry, action, evt);
         this.finishTouch(touchEntry);
       }
-    } catch (e) {
-      SC.Logger.warn('Exception during touchEnd: %@'.fmt(e)) ;
-      SC.RunLoop.end();
-      return NO ;
-    }
+    }, this);
 
-    SC.RunLoop.end();
     
+    // for text fields
     if (hidesTouchIntercept) {
-      evt.allowDefault();
       return YES;
     }
-    return NO;
+    
+    return evt.hasCustomEventHandling;
   },
 
   /** @private
@@ -1463,14 +1509,25 @@ SC.RootResponder = SC.Object.extend({
   keydown: function(evt) {
     if (SC.none(evt)) return YES;
 
+    var keyCode = evt.keyCode;
+
     // Fix for IME input (japanese, mandarin).
     // If the KeyCode is 229 wait for the keyup and
     // trigger a keyDown if it is is enter onKeyup.
-    if (evt.keyCode===229){
+    if (keyCode===229){
       this._IMEInputON = YES;
       return this.sendEvent('keyDown', evt);
     }
 
+    // If user presses the escape key while we are in the middle of a
+    // drag operation, cancel the drag operation and handle the event.
+    if (keyCode === 27 && this._drag) {
+      this._drag.cancelDrag();
+      this._drag = null;
+      this._mouseDownView = null;
+      return YES;
+    }
+
     // Firefox does NOT handle delete here...
     if (SC.browser.mozilla && (evt.which === 8)) return true ;
 
@@ -1493,7 +1550,7 @@ SC.RootResponder = SC.Object.extend({
       // processing.
 
       // Arrow keys are handled in keypress for firefox
-      if (evt.keyCode>=37 && evt.keyCode<=40 && SC.browser.mozilla) return YES;
+      if (keyCode>=37 && keyCode<=40 && SC.browser.mozilla) return YES;
 
 
       ret = this.sendEvent('keyDown', evt) ;
@@ -1584,49 +1641,47 @@ SC.RootResponder = SC.Object.extend({
   //
 
   mousedown: function(evt) {
-    try {
-      if(!SC.browser.msie) window.focus();
-      
-      // First, save the click count. The click count resets if the mouse down
-      // event occurs more than 200 ms later than the mouse up event or more
-      // than 8 pixels away from the mouse down event.
-      this._clickCount += 1 ;
-      if (!this._lastMouseUpAt || ((Date.now()-this._lastMouseUpAt) > 200)) {
-        this._clickCount = 1 ;
-      } else {
-        var deltaX = this._lastMouseDownX - evt.clientX,
-            deltaY = this._lastMouseDownY - evt.clientY,
-            distance = Math.sqrt(deltaX*deltaX + deltaY*deltaY) ;
-        if (distance > 8.0) this._clickCount = 1 ;
-      }
-      evt.clickCount = this._clickCount ;
-
-      this._lastMouseDownX = evt.clientX ;
-      this._lastMouseDownY = evt.clientY ;
-
-      var fr, view = this.targetViewForEvent(evt) ;
+    if (SC.platform.touch) {
+      evt.allowDefault();
+      return YES;
+    }
+    
+    if(!SC.browser.msie) window.focus();
+    
+    // First, save the click count. The click count resets if the mouse down
+    // event occurs more than 200 ms later than the mouse up event or more
+    // than 8 pixels away from the mouse down event.
+    this._clickCount += 1 ;
+    if (!this._lastMouseUpAt || ((Date.now()-this._lastMouseUpAt) > 200)) {
+      this._clickCount = 1 ;
+    } else {
+      var deltaX = this._lastMouseDownX - evt.clientX,
+          deltaY = this._lastMouseDownY - evt.clientY,
+          distance = Math.sqrt(deltaX*deltaX + deltaY*deltaY) ;
+      if (distance > 8.0) this._clickCount = 1 ;
+    }
+    evt.clickCount = this._clickCount ;
 
-      // InlineTextField needs to loose firstResponder whenever you click outside
-      // the view. This is a special case as textfields are not supposed to loose
-      // focus unless you click on a list, another textfield or an special
-      // view/control.
+    this._lastMouseDownX = evt.clientX ;
+    this._lastMouseDownY = evt.clientY ;
 
-      if(view) fr=view.getPath('pane.firstResponder');
+    var fr, view = this.targetViewForEvent(evt) ;
 
-      if(fr && fr.kindOf(SC.InlineTextFieldView) && fr!==view){
-        fr.resignFirstResponder();
-      }
+    // InlineTextField needs to loose firstResponder whenever you click outside
+    // the view. This is a special case as textfields are not supposed to loose
+    // focus unless you click on a list, another textfield or an special
+    // view/control.
 
-      view = this._mouseDownView = this.sendEvent('mouseDown', evt, view) ;
-      if (view && view.respondsTo('mouseDragged')) this._mouseCanDrag = YES ;
-    } catch (e) {
+    if(view) fr=view.getPath('pane.firstResponder');
 
-      SC.Logger.warn('Exception during mousedown: %@'.fmt(e)) ;
-      this._mouseDownView = null ;
-      this._mouseCanDrag = NO ;
-      throw e;
+    if(fr && fr.kindOf(SC.InlineTextFieldView) && fr!==view){
+      fr.resignFirstResponder();
     }
 
+    view = this._mouseDownView = this.sendEvent('mouseDown', evt, view) ;
+    if (view && view.respondsTo('mouseDragged')) this._mouseCanDrag = YES ;
+  
+
     return view ? evt.hasCustomEventHandling : YES;
   },
 
@@ -1638,56 +1693,58 @@ SC.RootResponder = SC.Object.extend({
     sent.
   */
   mouseup: function(evt) {
+    if (SC.platform.touch) {
+      evt.allowDefault();
+      return YES;
+    }
+    
     this.targetViewForEvent(evt);
-    try {
-      if (this._drag) {
-        this._drag.tryToPerform('mouseUp', evt) ;
-        this._drag = null ;
-      }
-
-      var handler = null, view = this._mouseDownView,
-          targetView = this.targetViewForEvent(evt);
-      this._lastMouseUpAt = Date.now() ;
+    
+    if (this._drag) {
+      this._drag.tryToPerform('mouseUp', evt) ;
+      this._drag = null ;
+    }
 
-      // record click count.
-      evt.clickCount = this._clickCount ;
+    var handler = null, view = this._mouseDownView,
+        targetView = this.targetViewForEvent(evt);
+    this._lastMouseUpAt = Date.now() ;
 
-      // attempt the mouseup call only if there's a target.
-      // don't want a mouseup going to anyone unless they handled the mousedown...
-      if (view) {
-        handler = this.sendEvent('mouseUp', evt, view) ;
+    // record click count.
+    evt.clickCount = this._clickCount ;
 
-        // try doubleClick
-        if (!handler && (this._clickCount === 2)) {
-          handler = this.sendEvent('doubleClick', evt, view) ;
-        }
+    // attempt the mouseup call only if there's a target.
+    // don't want a mouseup going to anyone unless they handled the mousedown...
+    if (view) {
+      handler = this.sendEvent('mouseUp', evt, view) ;
 
-        // try single click
-        if (!handler) {
-          handler = this.sendEvent('click', evt, view) ;
-        }
+      // try doubleClick
+      if (!handler && (this._clickCount === 2)) {
+        handler = this.sendEvent('doubleClick', evt, view) ;
       }
 
-      // try whoever's under the mouse if we haven't handle the mouse up yet
+      // try single click
       if (!handler) {
+        handler = this.sendEvent('click', evt, view) ;
+      }
+    }
 
-        // try doubleClick
-        if (this._clickCount === 2) {
-          handler = this.sendEvent('doubleClick', evt, targetView);
-        }
+    // try whoever's under the mouse if we haven't handle the mouse up yet
+    if (!handler) {
 
-        // try singleClick
-        if (!handler) {
-          handler = this.sendEvent('click', evt, targetView) ;
-        }
+      // try doubleClick
+      if (this._clickCount === 2) {
+        handler = this.sendEvent('doubleClick', evt, targetView);
       }
 
-      // cleanup
-      this._mouseCanDrag = NO; this._mouseDownView = null ;
-    } catch (e) {
-      this._drag = null; this._mouseCanDrag = NO; this._mouseDownView = null ;
-      throw e;
+      // try singleClick
+      if (!handler) {
+        handler = this.sendEvent('click', evt, targetView) ;
+      }
     }
+
+    // cleanup
+    this._mouseCanDrag = NO; this._mouseDownView = null ;
+  
     return (handler) ? evt.hasCustomEventHandling : YES ;
   },
 
@@ -1700,12 +1757,9 @@ SC.RootResponder = SC.Object.extend({
   },
 
   mousewheel: function(evt) {
-    try {
-      var view = this.targetViewForEvent(evt) ,
-          handler = this.sendEvent('mouseWheel', evt, view) ;
-    } catch (e) {
-      throw e;
-    }
+    var view = this.targetViewForEvent(evt) ,
+        handler = this.sendEvent('mouseWheel', evt, view) ;
+  
     return (handler) ? evt.hasCustomEventHandling : YES ;
   },
 
@@ -1721,6 +1775,11 @@ SC.RootResponder = SC.Object.extend({
    trigger calls to mouseDragged.
   */
   mousemove: function(evt) {
+    if (SC.platform.touch) {
+      evt.allowDefault();
+      return YES;
+    }
+    
     if (SC.browser.msie) {
       if (this._lastMoveX === evt.clientX && this._lastMoveY === evt.clientY) return;
     }
@@ -1730,68 +1789,64 @@ SC.RootResponder = SC.Object.extend({
     this._lastMoveX = evt.clientX;
     this._lastMoveY = evt.clientY;
 
-    SC.RunLoop.begin();
-    try {
-      // make sure the view gets focus no matter what.  FF is inconsistant
-      // about this.
-     // this.focus();
-      // only do mouse[Moved|Entered|Exited|Dragged] if not in a drag session
-      // drags send their own events, e.g. drag[Moved|Entered|Exited]
-      if (this._drag) {
-        //IE triggers mousemove at the same time as mousedown
-        if(SC.browser.msie){
-          if (this._lastMouseDownX !== evt.clientX || this._lastMouseDownY !== evt.clientY) {
-            this._drag.tryToPerform('mouseDragged', evt);
-          }
-        }
-        else {
-          this._drag.tryToPerform('mouseDragged', evt);
-        }
-      } else {
-        var lh = this._lastHovered || [] , nh = [] , exited, loc, len,
-            view = this.targetViewForEvent(evt) ;
-
-        // work up the view chain.  Notify of mouse entered and
-        // mouseMoved if implemented.
-        while(view && (view !== this)) {
-          if (lh.indexOf(view) !== -1) {
-            view.tryToPerform('mouseMoved', evt);
-            nh.push(view) ;
-          } else {
-            view.tryToPerform('mouseEntered', evt);
-            nh.push(view) ;
-          }
-
-          view = view.get('nextResponder');
-        }
-        // now find those views last hovered over that were no longer found
-        // in this chain and notify of mouseExited.
-        for(loc=0, len=lh.length; loc < len; loc++) {
-          view = lh[loc] ;
-          exited = view.respondsTo('mouseExited') ;
-          if (exited && !(nh.indexOf(view) !== -1)) {
-            view.tryToPerform('mouseExited',evt);
-          }
-        }
-        this._lastHovered = nh;
-
-        // also, if a mouseDownView exists, call the mouseDragged action, if
-        // it exists.
-        if (this._mouseDownView) {
-          if(SC.browser.msie){
-            if (this._lastMouseDownX !== evt.clientX && this._lastMouseDownY !== evt.clientY) {
-              this._mouseDownView.tryToPerform('mouseDragged', evt);
-            }
-          }
-          else {
-            this._mouseDownView.tryToPerform('mouseDragged', evt);
-          }
-        }
-      }
-    } catch (e) {
-      throw e;
-    }
-    SC.RunLoop.end();
+    SC.run(function() {
+       // make sure the view gets focus no matter what.  FF is inconsistant
+       // about this.
+      // this.focus();
+       // only do mouse[Moved|Entered|Exited|Dragged] if not in a drag session
+       // drags send their own events, e.g. drag[Moved|Entered|Exited]
+       if (this._drag) {
+         //IE triggers mousemove at the same time as mousedown
+         if(SC.browser.msie){
+           if (this._lastMouseDownX !== evt.clientX || this._lastMouseDownY !== evt.clientY) {
+             this._drag.tryToPerform('mouseDragged', evt);
+           }
+         }
+         else {
+           this._drag.tryToPerform('mouseDragged', evt);
+         }
+       } else {
+         var lh = this._lastHovered || [] , nh = [] , exited, loc, len,
+             view = this.targetViewForEvent(evt) ;
+
+         // work up the view chain.  Notify of mouse entered and
+         // mouseMoved if implemented.
+         while(view && (view !== this)) {
+           if (lh.indexOf(view) !== -1) {
+             view.tryToPerform('mouseMoved', evt);
+             nh.push(view) ;
+           } else {
+             view.tryToPerform('mouseEntered', evt);
+             nh.push(view) ;
+           }
+
+           view = view.get('nextResponder');
+         }
+         // now find those views last hovered over that were no longer found
+         // in this chain and notify of mouseExited.
+         for(loc=0, len=lh.length; loc < len; loc++) {
+           view = lh[loc] ;
+           exited = view.respondsTo('mouseExited') ;
+           if (exited && !(nh.indexOf(view) !== -1)) {
+             view.tryToPerform('mouseExited',evt);
+           }
+         }
+         this._lastHovered = nh;
+
+         // also, if a mouseDownView exists, call the mouseDragged action, if
+         // it exists.
+         if (this._mouseDownView) {
+           if(SC.browser.msie){
+             if (this._lastMouseDownX !== evt.clientX && this._lastMouseDownY !== evt.clientY) {
+               this._mouseDownView.tryToPerform('mouseDragged', evt);
+             }
+           }
+           else {
+             this._mouseDownView.tryToPerform('mouseDragged', evt);
+           }
+         }
+       }
+    }, this);
   },
 
   // these methods are used to prevent unnecessary text-selection in IE,
@@ -1918,7 +1973,7 @@ SC.Touch.prototype = {
     the hasCustomEventHandling property to YES but does not cancel the event.
   */
   allowDefault: function() {
-    this.hasCustomEventHandling = YES ;
+    this.event.hasCustomEventHandling = YES ;
   },
 
   /**
@@ -1935,7 +1990,7 @@ SC.Touch.prototype = {
   stop: function() {
     if (this.event) this.event.stop();
   },
-  
+
   /**
     Removes from and calls touchEnd on the touch responder.
   */
@@ -1952,6 +2007,7 @@ SC.Touch.prototype = {
     this.touchContext.makeTouchResponder(this, responder, shouldStack, upViewChain);
   },
 
+
   /**
     Captures, or recaptures, the touch. This works from the touch's raw target view
     up to the startingPoint, and finds either a view that returns YES to captureTouch() or