sproutcore 1.7.1.beta → 1.8.0

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

@@ -39,8 +39,11 @@ SC.platform = SC.Object.create({
 
   /*
     NOTES
-     - A development version of Chrome 9 incorrectly reported supporting touch
-     - Android is assumed to support touch, but incorrectly reports that it does not
+     - Chrome would incorrectly indicate support for touch events.  This has been fixed:
+       http://code.google.com/p/chromium/issues/detail?id=36415
+     - Android is assumed to support touch, but incorrectly reports that it does not.
+     - See: https://github.com/Modernizr/Modernizr/issues/84 for a discussion on detecting
+       touch capability.
   */
   /**
     YES if the current device supports touch events, NO otherwise.
@@ -50,11 +53,25 @@ SC.platform = SC.Object.create({
 
     @property {Boolean}
   */
-  touch: (('createTouch' in document) && SC.browser.chrome < 9) || SC.browser.android,
-  
-  bounceOnScroll: SC.browser.iOS,
-  pinchToZoom: SC.browser.iOS,
+  touch: 'ontouchstart' in window || SC.browser.name === SC.BROWSER.android,
 
+  /**
+    YES if the current browser supports bounce on scroll.
+
+    @property {Boolean}
+  */
+  bounceOnScroll: SC.browser.os === SC.OS.ios,
+
+  /**
+    YES if the current browser supports pinch to zoom.
+
+    @property {Boolean}
+  */
+  pinchToZoom:  SC.browser.os === SC.OS.ios,
+
+  /**
+    YES if the current browser supports the `placeholder` attribute in `input` elements.
+  */
   input: {
     placeholder: ('placeholder' in document.createElement('input'))
   },
@@ -98,7 +115,7 @@ SC.platform = SC.Object.create({
   cssPrefix: null,
 
   /**
-    Prefix for browsew specific CSS attributes when used in the DOM. Calculated later.
+    Prefix for browser specific CSS attributes when used in the DOM. Calculated later.
   */
   domCSSPrefix: null,
 
@@ -116,7 +133,7 @@ SC.platform = SC.Object.create({
       // @endif
       return;
     }
-    
+
     SC.Logger.log("Simulating touch events");
 
     // Tell the app that we now "speak" touch
@@ -171,7 +188,7 @@ SC.platform = SC.Object.create({
     When simulating touch events, this method is called when mousemove events
     are received.
 
-    If the altKey is depresed and pinch center not yet established, we will capture the mouse position.
+    If the altKey is depressed and pinch center not yet established, we will capture the mouse position.
   */
   _simtouch_mousemove: function(evt) {
     if (!this._mousedown) {
@@ -179,7 +196,7 @@ SC.platform = SC.Object.create({
         we need to capture when was the first spot that the altKey was pressed and use it as
         the center point of a pinch
        */
-      if(evt.altKey && this._pinchCenter == null) {
+      if(evt.altKey && this._pinchCenter === null) {
         this._pinchCenter = {
           pageX: evt.pageX,
           pageY: evt.pageY,
@@ -188,7 +205,7 @@ SC.platform = SC.Object.create({
           clientX: evt.clientX,
           clientY: evt.clientY
         };
-      } else if(!evt.altKey && this._pinchCenter != null){
+      } else if(!evt.altKey && this._pinchCenter !== null){
         this._pinchCenter = null;
       }
       return NO;
@@ -256,7 +273,7 @@ SC.platform = SC.Object.create({
     /*
       simulate pinch gesture
      */
-    if(evt.altKey && this._pinchCenter != null)
+    if(evt.altKey && this._pinchCenter !== null)
     {
       //calculate the mirror position of the virtual touch
       var pageX = this._pinchCenter.pageX + this._pinchCenter.pageX - evt.pageX ,
@@ -316,37 +333,37 @@ SC.platform = SC.Object.create({
   supportsAcceleratedLayers: NO,
 
   /**
-    Wether the browser supports the hashchange event.
+    Whether the browser supports the hashchange event.
   */
   supportsHashChange: function() {
     // Code copied from Modernizr which copied code from YUI (MIT licenses)
     // documentMode logic from YUI to filter out IE8 Compat Mode which false positives
     return ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7);
   }(),
-  
+
   /**
-    Wether the browser supports HTML5 history.
+    Whether the browser supports HTML5 history.
   */
   supportsHistory: function() {
     return !!(window.history && window.history.pushState);
   }(),
-  
+
   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)
+  windowSizeDeterminesOrientation: SC.browser.os === SC.OS.ios || !('onorientationchange' in window)
 
 });
 
@@ -376,26 +393,29 @@ SC.platform = SC.Object.create({
   var el = document.createElement("div");
 
   // the css and javascript to test
-  var css_browsers = ["-moz-", "-moz-", "-o-", "-ms-", "-webkit-"];
-  var test_browsers = ["moz", "Moz", "o", "ms", "webkit"];
+  var css_browsers = ["-moz-", "-moz-", "-o-", "-ms-", "-webkit-"],
+      test_browsers = ["moz", "Moz", "o", "ms", "webkit"];
 
   // prepare css
-  var css = "", i = null;
-  for (i = 0; i < css_browsers.length; i++) {
-    css += css_browsers[i] + "transition:all 1s linear;";
-    css += css_browsers[i] + "transform: translate(1px, 1px);";
-    css += css_browsers[i] + "perspective: 500px;";
+  var css = "", i = null, cssBrowser, iLen;
+  for (i = 0, iLen = css_browsers.length; i < iLen; i++) {
+    cssBrowser = css_browsers[i];
+    css += cssBrowser + "transition:all 1s linear;";
+    css += cssBrowser + "transform: translate(1px, 1px);";
+    css += cssBrowser + "perspective: 500px;";
   }
 
   // set css text
   el.style.cssText = css;
 
   // test
-  for (i = 0; i < test_browsers.length; i++)
+  var testBrowser;
+  for (i = 0, iLen=test_browsers.length; i < iLen; i++)
   {
-    if (el.style[test_browsers[i] + "TransitionProperty"] !== undefined) SC.platform.supportsCSSTransitions = YES;
-    if (el.style[test_browsers[i] + "Transform"] !== undefined) SC.platform.supportsCSSTransforms = YES;
-    if (el.style[test_browsers[i] + "Perspective"] !== undefined || el.style[test_browsers[i] + "PerspectiveProperty"] !== undefined) {
+    testBrowser = test_browsers[i];
+    if (el.style[testBrowser + "TransitionProperty"] !== undefined) SC.platform.supportsCSSTransitions = YES;
+    if (el.style[testBrowser + "Transform"] !== undefined) SC.platform.supportsCSSTransforms = YES;
+    if (el.style[testBrowser + "Perspective"] !== undefined || el.style[testBrowser + "PerspectiveProperty"] !== undefined) {
       SC.platform.understandsCSS3DTransforms = YES;
       SC.platform.supportsCSS3DTransforms = YES;
     }

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

@@ -67,12 +67,16 @@ SC.mixin({
   onReady: {
     done: function() {
       if(SC.isReady) return;
+      
       SC.isReady = true;
       
       SC.RunLoop.begin();
       
       SC.Locale.createCurrentLocale();
-      jQuery("body").addClass(SC.Locale.currentLanguage.toLowerCase());
+      var loc = SC.Locale.currentLanguage.toLowerCase();
+      jQuery("body").addClass(loc);
+      
+      jQuery("html").attr("lang", loc);
       
       jQuery("#loading").remove();
       

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

@@ -152,7 +152,7 @@ SC.RenderContext = SC.Builder.create(
     managed code (such as in CollectionView) can append or prepend content
     instead.
 
-    You probably do not want to change this propery unless you know what you
+    You probably do not want to change this property unless you know what you
     are doing.
 
     @property {String}
@@ -307,10 +307,6 @@ SC.RenderContext = SC.Builder.create(
 
     cq = this.$();
 
-    // console.log('%@#update() called'.fmt(this));
-    // if (this.length>0) console.log(this.join());
-    // else console.log('<no length>');
-
     // replace innerHTML
     if (this.length>0) {
       this._innerHTMLReplaced = YES;
@@ -329,7 +325,7 @@ SC.RenderContext = SC.Builder.create(
       }
     }
 
-    // attributes, styles, and class naems will already have been set.
+    // attributes, styles, and class names will already have been set.
 
     // id="foo"
     if (this._idDidChange && (value = this._id)) {
@@ -347,9 +343,6 @@ SC.RenderContext = SC.Builder.create(
 
   // these are temporary objects are reused by end() to avoid memory allocs.
   _DEFAULT_ATTRS: {},
-  _TAG_ARRAY: [],
-  _JOIN_ARRAY: [],
-  _STYLE_PAIR_ARRAY: [],
 
   /**
     Ends the current tag editing context.  This will generate the tag string
@@ -371,48 +364,41 @@ SC.RenderContext = SC.Builder.create(
     // generate opening tag.
 
     // get attributes first.  Copy in className + styles...
-    var tag = this._TAG_ARRAY, pair, joined, key , value,
+    var tag = '', styleStr='', pair, joined, key , value,
         attrs = this._attrs, className = this._classNames,
-        id = this._id, styles = this._styles;
+        id = this._id, styles = this._styles, strings, selfClosing;
 
     // add tag to tag array
-    tag[0] = '<';  tag[1] = this._tagName ;
+    tag = '<' + this._tagName ;
 
     // add any attributes...
     if (attrs || className || styles || id) {
       if (!attrs) attrs = this._DEFAULT_ATTRS ;
       if (id) attrs.id = id ;
+      // old versions of safari (5.0)!!!! throw an error if we access
+      // attrs.class. meh...
       if (className) attrs['class'] = className.join(' ');
 
       // add in styles.  note how we avoid memory allocs here to keep things
       // fast...
       if (styles) {
-        joined = this._JOIN_ARRAY ;
-        pair = this._STYLE_PAIR_ARRAY;
         for(key in styles) {
           if(!styles.hasOwnProperty(key)) continue ;
           value = styles[key];
           if (value === null) continue; // skip empty styles
           if (typeof value === SC.T_NUMBER && !SC.NON_PIXEL_PROPERTIES.contains(key)) value += "px";
-
-          pair[0] = this._dasherizeStyleName(key);
-          pair[1] = value;
-          joined.push(pair.join(': '));
+          styleStr = styleStr + this._dasherizeStyleName(key)+": "+value + "; ";
         }
-        attrs.style = joined.join('; ') ;
-
-        // reset temporary object.  pair does not need to be reset since it
-        // is always overwritten
-        joined.length = 0;
+        attrs.style = styleStr;
       }
 
       // now convert attrs hash to tag array...
-      tag.push(' '); // add space for joining0
+      tag = tag + ' '; // add space for joining0
       for(key in attrs) {
         if (!attrs.hasOwnProperty(key)) continue ;
         value = attrs[key];
         if (value === null) continue ; // skip empty attrs
-        tag.push(key, '="', value, '" ');
+        tag = tag + key + '="' + value + '" ';
       }
 
       // if we are using the DEFAULT_ATTRS temporary object, make sure we
@@ -425,25 +411,20 @@ SC.RenderContext = SC.Builder.create(
 
     // this is self closing if there is no content in between and selfClosing
     // is not set to false.
-    var strings = this.strings;
-    var selfClosing = (this._selfClosing === NO) ? NO : (this.length === 1) ;
-    tag.push(selfClosing ? ' />' : '>') ;
+    strings = this.strings;
+    selfClosing = (this._selfClosing === NO) ? NO : (this.length === 1) ;
+    tag = tag + (selfClosing ? ' />' : '>') ;
 
     // console.log('selfClosing == %@'.fmt(selfClosing));
-    strings[this.offset] = tag.join('');
-    tag.length = 0 ; // reset temporary object
+    strings[this.offset] = tag;
 
     // now generate closing tag if needed...
     if (!selfClosing) {
-      tag[0] = '</' ;
-      tag[1] = this._tagName;
-      tag[2] = '>';
-      strings.push(tag.join(''));
+      strings.push('</' + this._tagName + '>');
 
       // increase length of receiver and all parents
       var c = this;
       while(c) { c.length++; c = c.prevObject; }
-      tag.length = 0; // reset temporary object again
     }
 
     // if there was a source element, cleanup to avoid memory leaks
@@ -748,7 +729,8 @@ SC.RenderContext = SC.Builder.create(
         attr = this.$().attr('style');
 
         if (attr && (attr = attr.toString()).length>0) {
-          if(SC.browser.msie){
+          // Ensure attributes are lower case for IE
+          if(SC.browser.name === SC.BROWSER.ie) {
             attr = attr.toLowerCase();
           }
           styles = {};
@@ -791,13 +773,14 @@ SC.RenderContext = SC.Builder.create(
 
   _deleteComboStyles: function(styles, key) {
     var comboStyles = SC.COMBO_STYLES[key],
-        didChange = NO;
+        didChange = NO, tmp;
 
     if (comboStyles) {
-      var idx;
-      for (idx=0; idx < comboStyles.length; idx++) {
-        if (styles[comboStyles[idx]]) {
-          delete styles[comboStyles[idx]];
+
+      for (var idx=0, idxLen = comboStyles.length; idx < idxLen; idx++) {
+        tmp = comboStyles[idx];
+        if (styles[tmp]) {
+          delete styles[tmp];
           didChange = YES;
         }
       }
@@ -941,6 +924,22 @@ SC.RenderContext = SC.Builder.create(
     return this ;
   },
 
+  /**
+    Sets the named attribute on the tag.  Note that if you set the 'class'
+    attribute or the 'styles' attribute, it will be ignored.  Use the
+    relevant class name and style methods instead.
+
+    @param {String|Hash} nameOrAttrs the attr name or hash of attrs.
+    @param {String} value attribute value if attribute name was passed
+    @returns {SC.RenderContext} receiver
+  */
+  removeAttr: function(name) {
+    if (this._elem) {
+      this.$().removeAttr(name);
+      return this;
+    }
+  },
+
   //
   // COREQUERY SUPPORT
   //
@@ -985,7 +984,7 @@ SC.RenderContext = SC.Builder.create(
 });
 
 /**
-  html is an alias for push().  Makes thie object more CoreQuery like
+  html is an alias for push().  Makes the object more CoreQuery like
 */
 SC.RenderContext.fn.html = SC.RenderContext.fn.push;
 
@@ -994,38 +993,23 @@ SC.RenderContext.fn.html = SC.RenderContext.fn.push;
 */
 SC.RenderContext.fn.css = SC.RenderContext.fn.addStyle;
 
+(function() {
+  var _escapeHTMLRegex = /[&<>]/g, _escapeHTMLMethod = function(match) {
+    switch(match) {
+      case '&': return '&amp;';
+      case '<': return '&lt;';
+      case '>': return '&gt;';
+    }
+  };
+
 /**
   Helper method escapes the passed string to ensure HTML is displayed as
   plain text.  You should make sure you pass all user-entered data through
   this method to avoid errors.  You can also do this with the text() helper
   method on a render context.
 */
-
-
-if (!SC.browser.isSafari || parseInt(SC.browser.version, 10) < 526) {
-  SC.RenderContext._safari3 = YES;
-}
-
 SC.RenderContext.escapeHTML = function(text) {
-  var elem, node, ret ;
-
-  if (SC.none(text)) { return text; } // ignore empty
-
-  elem = this.escapeHTMLElement;
-  if (!elem) { elem = this.escapeHTMLElement = document.createElement('div'); }
-
-  node = this.escapeTextNode;
-  if (!node) {
-    node = this.escapeTextNode = document.createTextNode('');
-    elem.appendChild(node);
-  }
-
-  node.data = text ;
-  ret = elem.innerHTML ;
-
-  // Safari 3 does not escape the '>' character
-  if (SC.RenderContext._safari3) { ret = ret.replace(/>/g, '&gt;'); }
-
-  node = elem = null;
-  return ret ;
+    if (!text) return '';
+    return text.replace(_escapeHTMLRegex, _escapeHTMLMethod);
 };
+})();

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

@@ -59,7 +59,7 @@ SC.Responder = SC.Object.extend( /** @scope SC.Responder.prototype */ {
   hasFirstResponder: NO,    
   
   /** @property
-    Set to YES if your view is willing to accept first responder status.  This is used when calculcating key responder loop.
+    Set to YES if your view is willing to accept first responder status.  This is used when calculating key responder loop.
   */
   acceptsFirstResponder: YES,
   

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

@@ -52,7 +52,7 @@ SC.RootResponder = SC.Object.extend(
   /** @scope SC.RootResponder.prototype */{
 
   /**
-    Contains a list of all panes currently visible on screen.  Everytime a
+    Contains a list of all panes currently visible on screen.  Every time a
     pane attaches or detaches, it will update itself in this array.
   */
   panes: null,
@@ -224,8 +224,9 @@ SC.RootResponder = SC.Object.extend(
       previousKeyPanes = this.get('previousKeyPanes') ;
 
       newKeyPane = null ;
+      var candidate;
       while (previousKeyPanes.length > 0) {
-        var candidate = previousKeyPanes.pop();
+        candidate = previousKeyPanes.pop();
         if (candidate.get('isPaneAttached')  &&  candidate.get('acceptsKeyPane')) {
           newKeyPane = candidate ;
           break ;
@@ -343,17 +344,19 @@ SC.RootResponder = SC.Object.extend(
     Handle window focus.  Change hasFocus and add sc-focus CSS class
     (removing sc-blur).  Also notify panes.
   */
-  focus: function() {
+  focus: function(evt) {
 
     if (!this.get('hasFocus')) {
       SC.$('body').addClass('sc-focus').removeClass('sc-blur');
 
       // If the app is getting focus again set the first responder to the first
       // valid firstResponder view in the view's tree
-      if(!SC.TABBING_ONLY_INSIDE_DOCUMENT){
-        var mainPane = this.get('mainPane'),
-            nextValidKeyView = mainPane ? mainPane.get('nextValidKeyView') : null;
-        if (nextValidKeyView) mainPane.makeFirstResponder(nextValidKeyView);
+      if(!SC.TABBING_ONLY_INSIDE_DOCUMENT && !SC.browser.isIE8OrLower){
+        var keyPane = SC.RootResponder.responder.get('keyPane');
+        if (keyPane) {
+          var nextValidKeyView = keyPane.get('nextValidKeyView');
+          if (nextValidKeyView) keyPane.makeFirstResponder(nextValidKeyView);
+        }
       }
 
       SC.run(function() {
@@ -365,20 +368,22 @@ SC.RootResponder = SC.Object.extend(
 
   /**
     Handle window focus event for IE. Listening to the focus event is not
-    reliable as per every focus event you receive you inmediately get a blur
+    reliable as per every focus event you receive you immediately get a blur
     event (Only on IE of course ;)
   */
-  focusin: function() {
-    this.focus();
+  focusin: function(evt) {
+    if(this._focusTimeout) clearTimeout(this._focusTimeout);
+    this.focus(evt);
   },
 
   /**
     Handle window blur event for IE. Listening to the focus event is not
-    reliable as per every focus event you receive you inmediately get a blur
+    reliable as per every focus event you receive you immediately get a blur
     event (Only on IE of course ;)
   */
-  focusout: function() {
-    this.blur();
+  focusout: function(evt) {
+    var that = this;
+    this._focusTimeout = setTimeout(function(){that.blur(evt);}, 300);
   },
 
 
@@ -386,7 +391,7 @@ SC.RootResponder = SC.Object.extend(
     Handle window focus.  Change hasFocus and add sc-focus CSS class (removing
     sc-blur).  Also notify panes.
   */
-  blur: function() {
+  blur: function(evt) {
     if (this.get('hasFocus')) {
       SC.$('body').addClass('sc-blur').removeClass('sc-focus');
 
@@ -631,7 +636,7 @@ SC.RootResponder = SC.Object.extend(
     this.listenFor(['keydown', 'keyup', 'beforedeactivate', 'mousedown', 'mouseup', 'click', 'dblclick', 'mousemove', 'selectstart', 'contextmenu'], document)
         .listenFor(['resize'], window);
 
-    if(SC.browser.msie) this.listenFor('focusin focusout'.w(), document);
+    if(SC.browser.isIE8OrLower) this.listenFor(['focusin', 'focusout'], document);
     else this.listenFor(['focus', 'blur'], window);
 
     // handle animation events
@@ -642,26 +647,27 @@ SC.RootResponder = SC.Object.extend(
       this.listenFor(['transitionend', SC.platform.cssPrefix+'TransitionEnd'], document);
     }
 
-    // handle special case for keypress- you can't use normal listener to block the backspace key on Mozilla
+    // handle special case for keypress- you can't use normal listener to block
+    // the backspace key on Mozilla
     if (this.keypress) {
-      if (SC.CAPTURE_BACKSPACE_KEY && SC.browser.mozilla) {
+      if (SC.CAPTURE_BACKSPACE_KEY && SC.browser.isMozilla) {
         var responder = this ;
         document.onkeypress = function(e) {
           e = SC.Event.normalizeEvent(e);
           return responder.keypress.call(responder, e);
         };
 
-        // SC.Event.add(window, 'unload', this, function() { document.onkeypress = null; }); // be sure to cleanup memory leaks
-
       // Otherwise, just add a normal event handler.
-      } else SC.Event.add(document, 'keypress', this, this.keypress);
+      } else {
+        SC.Event.add(document, 'keypress', this, this.keypress);
+      }
     }
 
     // handle these two events specially in IE
     ['drag', 'selectstart'].forEach(function(keyName) {
       var method = this[keyName] ;
       if (method) {
-        if (SC.browser.msie) {
+        if (SC.browser.isIE) {
           var responder = this ;
           document.body['on' + keyName] = function(e) {
             // return method.call(responder, SC.Event.normalizeEvent(e));
@@ -682,9 +688,9 @@ SC.RootResponder = SC.Object.extend(
     var mousewheel = 'mousewheel';
 
     // Firefox emits different mousewheel events than other browsers
-    if (SC.browser.mozilla) {
-      // For Firefox <3.5, subscribe to DOMMouseScroll events
-      if (SC.browser.compareVersion(1,9,1) < 0) {
+    if (SC.browser.isMozilla) {
+      // For Firefox < 3.5, subscribe to DOMMouseScroll events
+      if (SC.browser.compare(SC.browser.engineVersion, '1.9.1') < 0) {
         mousewheel = 'DOMMouseScroll';
 
       // For Firefox 3.5 and greater, we can listen for MozMousePixelScroll,
@@ -699,7 +705,8 @@ SC.RootResponder = SC.Object.extend(
     // do some initial set
     this.set('currentWindowSize', this.computeWindowSize()) ;
 
-    if (SC.browser.mobileSafari) {
+    // TODO: Is this workaround still valid?
+    if (SC.browser.os === SC.OS.ios && SC.browser.name === SC.BROWSER.safari) {
 
       // If the browser is identifying itself as a touch-enabled browser, but
       // touch events are not present, assume this is a desktop browser doing
@@ -757,28 +764,7 @@ SC.RootResponder = SC.Object.extend(
               // move element back into document...
               pen.appendChild(target);
 
-              // // In MobileSafari, our target can sometimes
-              // // be a text node, so make sure we handle that case.
-              // textNode = (target.nodeType === 3);
-              //
-              // if (textNode && target.parentElement) {
-              //   // Hide the text node's parent element if it has one
-              //   target = target.parentElement;
-              //   target.style.display = 'none';
-              // } else if (textNode) {
-              //   // We have a text node with no containing element,
-              //   // so just erase its text content.
-              //   target.nodeValue = '';
-              // } else {
-              //   // Standard Element, just toggle its display off.
-              //   target.style.display = 'none';
-              // }
-              //
-              // // Now move the captured and hidden element back to the DOM.
-              // document.body.appendChild(target);
-
-              // ...and save the element to be garbage collected on
-              // touchEnd.
+              // ...and save the element to be garbage collected on touchEnd.
               touches[touch]._rescuedElement = target;
             }
           }
@@ -788,17 +774,14 @@ SC.RootResponder = SC.Object.extend(
     }
   },
 
-  // ................................................................................
+  // ...........................................................................
   // TOUCH SUPPORT
   //
   /*
-    This touch support is written to meet the following specifications. They are actually
-    simple, but I decided to write out in great detail all of the rules so there would
-    be no confusion.
+    There are three events: touchStart, touchEnd and touchesDragged.
 
-    There are three events: touchStart, touchEnd, touchDragged. touchStart and End are called
-    individually for each touch. touchDragged events are sent to whatever view owns the touch
-    event
+    The touchStart and touchEnd events are called individually for each touch.
+    The touchesDragged events are sent to whichever view owns the touch event.
   */
 
   /**
@@ -1266,6 +1249,11 @@ SC.RootResponder = SC.Object.extend(
     @returns {Boolean}
   */
   touchstart: function(evt) {
+    // Starting iOS5 touch events are handled by textfields.
+    // As a workaround just let the browser to use the default behavior.
+    if(this.ignoreTouchHandle(evt)) return YES;
+
+
     var hidingTouchIntercept = NO;
 
     SC.run(function() {
@@ -1329,6 +1317,10 @@ 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) {
+    // Starting iOS5 touch events are handled by textfields.
+    // As a workaround just let the browser to use the default behavior.
+    if(this.ignoreTouchHandle(evt)) return YES;
+
     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,
@@ -1423,6 +1415,10 @@ SC.RootResponder = SC.Object.extend(
   touchend: function(evt) {
     var hidesTouchIntercept = NO;
 
+    // Starting iOS5 touch events are handled by textfields.
+    // As a workaround just let the browser to use the default behavior.
+    if(this.ignoreTouchHandle(evt)) return YES;
+
     SC.run(function() {
       var touches = evt.changedTouches, touch, touchEntry,
           idx, len = touches.length,
@@ -1485,6 +1481,21 @@ SC.RootResponder = SC.Object.extend(
     this.touchend(evt);
   },
 
+  /** @private
+     Ignore Touch events on textfields and links. starting iOS 5 textfields
+     get touch events. Textfields just need to get the default focus action.
+  */
+  ignoreTouchHandle: function(evt) {
+    if(SC.browser.isMobileSafari){
+      var tag = evt.target.tagName;
+      if(tag==="INPUT" || tag==="A"){
+        evt.allowDefault();
+        return YES;
+      }
+    }
+    return NO;
+  },
+
   // ..........................................................
   // KEYBOARD HANDLING
   //
@@ -1578,11 +1589,16 @@ SC.RootResponder = SC.Object.extend(
 
     All actions that might cause an actual insertion of text are handled in
     the keypress event.
+
+    References:
+        http://www.quirksmode.org/js/keys.html
+        https://developer.mozilla.org/en/DOM/KeyboardEvent
+        http://msdn.microsoft.com/library/ff974342.aspx
   */
   keydown: function(evt) {
     if (SC.none(evt)) return YES;
     var keyCode = evt.keyCode;
-    if(SC.browser.mozilla && evt.keyCode===9){
+    if(SC.browser.isMozilla && evt.keyCode===9){
       this.keydownCounter=1;
     }
     // Fix for IME input (japanese, mandarin).
@@ -1603,7 +1619,7 @@ SC.RootResponder = SC.Object.extend(
     }
 
     // Firefox does NOT handle delete here...
-    if (SC.browser.mozilla && (evt.which === 8)) return true ;
+    if (SC.browser.isMozilla && (evt.which === 8)) return true ;
 
     // modifier keys are handled separately by the 'flagsChanged' event
     // send event for modifier key changes, but only stop processing if this
@@ -1624,7 +1640,7 @@ SC.RootResponder = SC.Object.extend(
       // processing.
 
       // Arrow keys are handled in keypress for firefox
-      if (keyCode>=37 && keyCode<=40 && SC.browser.mozilla) return YES;
+      if (keyCode>=37 && keyCode<=40 && SC.browser.isMozilla) return YES;
 
 
       ret = this.sendEvent('keyDown', evt) ;
@@ -1652,9 +1668,9 @@ SC.RootResponder = SC.Object.extend(
   keypress: function(evt) {
     var ret,
         keyCode   = evt.keyCode,
-        isFirefox = !!SC.browser.mozilla;
+        isFirefox = SC.browser.isMozilla;
 
-    if(SC.browser.mozilla && evt.keyCode===9){
+    if(isFirefox && evt.keyCode===9){
       this.keydownCounter++;
       if(this.keydownCounter==2) return YES;
     }
@@ -1672,7 +1688,10 @@ SC.RootResponder = SC.Object.extend(
           charCode           = evt.charCode;
       if ((charCode !== undefined && charCode === 0 && evt.keyCode!==9) && !isFirefoxArrowKeys) return YES;
       if (isFirefoxArrowKeys) evt.which = keyCode;
-      return this.sendEvent('keyDown', evt) ? evt.hasCustomEventHandling:YES;
+
+      // we only want to rethrow if this is a printable key so that we don't
+      // duplicate the event sent in keydown when a modifier key is pressed
+      if(isFirefoxArrowKeys || !this._isFunctionOrNonPrintableKey(evt)) return this.sendEvent('keyDown', evt) ? evt.hasCustomEventHandling:YES;
     }
   },
 
@@ -1698,7 +1717,7 @@ SC.RootResponder = SC.Object.extend(
     IE's default behavior to blur textfields and other controls can only be
     blocked by returning NO to this event. However we don't want to block
     its default behavior otherwise textfields won't lose focus by clicking on
-    an empty area as it's expected. If you want to block IE from bluring another
+    an empty area as it's expected. If you want to block IE from blurring another
     control set blockIEDeactivate to true on the specific view in which you
     want to avoid this. Think of an autocomplete menu, you want to click on
     the menu but don't loose focus.
@@ -1707,7 +1726,7 @@ SC.RootResponder = SC.Object.extend(
     var toElement = evt.toElement;
     if (toElement && toElement.tagName && toElement.tagName!=="IFRAME") {
       var view = SC.$(toElement).view()[0];
-      //The following line is neccesary to allow/block text selection for IE,
+      //The following line is necessary to allow/block text selection for IE,
       // in combination with the selectstart event.
       if (view && view.get('blocksIEDeactivate')) return NO;
     }
@@ -1719,6 +1738,8 @@ SC.RootResponder = SC.Object.extend(
   //
 
   mousedown: function(evt) {
+    var fr;
+
     if (SC.platform.touch) {
       evt.allowDefault();
       this._lastMouseDownCustomHandling = YES;
@@ -1742,7 +1763,7 @@ SC.RootResponder = SC.Object.extend(
     this._lastMouseDownX = evt.clientX ;
     this._lastMouseDownY = evt.clientY ;
 
-    var fr, view = this.targetViewForEvent(evt) ;
+    var view = this.targetViewForEvent(evt);
 
     // InlineTextField needs to loose firstResponder whenever you click outside
     // the view. This is a special case as textfields are not supposed to loose
@@ -1751,10 +1772,12 @@ SC.RootResponder = SC.Object.extend(
 
     if(view) fr=view.getPath('pane.firstResponder');
 
-    if(fr && fr.kindOf(SC.InlineTextFieldView) && fr!==view){
-      fr.resignFirstResponder();
+    // some fields like SC.InlineTextFieldView need to blur on any click, even
+    // if it's not on a control that can be focused
+    // TODO: remove this when focus behavior is improved
+    if(fr && fr.get('blurOnMouseDown') && fr!==view){
+      fr.resignFirstResponder(evt);
     }
-
     view = this._mouseDownView = this.sendEvent('mouseDown', evt, view) ;
     if (view && view.respondsTo('mouseDragged')) this._mouseCanDrag = YES ;
 
@@ -1775,6 +1798,7 @@ SC.RootResponder = SC.Object.extend(
     sent.
   */
   mouseup: function(evt) {
+    var clickOrDoubleClickDidTrigger=NO;
     if (SC.platform.touch) {
       evt.allowDefault();
       this._lastMouseUpCustomHandling = YES;
@@ -1800,16 +1824,18 @@ SC.RootResponder = SC.Object.extend(
       // try doubleClick
       if (!handler && (this._clickCount === 2)) {
         handler = this.sendEvent('doubleClick', evt, view) ;
+        clickOrDoubleClickDidTrigger = YES;
       }
 
       // try single click
       if (!handler) {
         handler = this.sendEvent('click', evt, view) ;
+        clickOrDoubleClickDidTrigger = YES;
       }
     }
 
     // try whoever's under the mouse if we haven't handle the mouse up yet
-    if (!handler) {
+    if (!handler && !clickOrDoubleClickDidTrigger) {
 
       // try doubleClick
       if (this._clickCount === 2) {
@@ -1859,7 +1885,7 @@ SC.RootResponder = SC.Object.extend(
   },
 
   dblclick: function(evt){
-    if (SC.browser.isIE) {
+    if (SC.browser.isIE8OrLower) {
       this._clickCount = 2;
       // this._onmouseup(evt);
       this.mouseup(evt);
@@ -1890,7 +1916,7 @@ SC.RootResponder = SC.Object.extend(
       return YES;
     }
 
-    if (SC.browser.msie) {
+    if (SC.browser.isIE) {
       if (this._lastMoveX === evt.clientX && this._lastMoveY === evt.clientY) return;
     }
 
@@ -1900,14 +1926,14 @@ SC.RootResponder = SC.Object.extend(
     this._lastMoveY = evt.clientY;
 
     SC.run(function() {
-       // make sure the view gets focus no matter what.  FF is inconsistant
+       // make sure the view gets focus no matter what.  FF is inconsistent
        // 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(SC.browser.isIE){
            if (this._lastMouseDownX !== evt.clientX || this._lastMouseDownY !== evt.clientY) {
              this._drag.tryToPerform('mouseDragged', evt);
            }
@@ -1954,7 +1980,7 @@ SC.RootResponder = SC.Object.extend(
          // also, if a mouseDownView exists, call the mouseDragged action, if
          // it exists.
          if (this._mouseDownView) {
-           if(SC.browser.msie){
+           if(SC.browser.isIE){
              if (this._lastMouseDownX !== evt.clientX && this._lastMouseDownY !== evt.clientY) {
                this._mouseDownView.tryToPerform('mouseDragged', evt);
              }