sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/desktop/views/tab.js

@@ -42,6 +42,7 @@ SC.TabView = SC.View.extend(
   itemIsEnabledKey: null,
   itemIconKey: null,
   itemWidthKey: null,
+  itemToolTipKey: null,
   
   tabLocation: SC.TOP_LOCATION,
   
@@ -184,4 +185,4 @@ SC.TabView = SC.View.extend(
   
 }) ;
 
-SC._TAB_ITEM_KEYS = 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey'.w();
+SC._TAB_ITEM_KEYS = 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemWidthKey itemToolTipKey'.w();

data/frameworks/sproutcore/frameworks/desktop/views/well.js

@@ -50,7 +50,6 @@ SC.WellView = SC.ContainerView.extend(
    */
   
   render: function(context, firstTime) {
-    sc_super();
     if(firstTime){
      context.push("<div class='top-left-edge'></div>",
        "<div class='top-edge'></div>",
@@ -62,6 +61,7 @@ SC.WellView = SC.ContainerView.extend(
        "<div class='left-edge'></div>",
        "<div class='content-background'></div>");
      }    
+     sc_super();
   },
   
   /**

data/frameworks/sproutcore/frameworks/foundation/core.js

@@ -38,6 +38,12 @@ SC.DROP_AFTER = 0x04 ;
 */
 SC.DROP_ANY = 0x07 ;
 
+
+/**
+  This variable is here to make the tab focus behavior work like safari's.
+*/
+SC.SAFARI_FOCUS_BEHAVIOR = YES;
+
 SC.mixin(/** @lends SC */ {
   
   /**

data/frameworks/sproutcore/frameworks/foundation/english.lproj/view.css

@@ -10,7 +10,7 @@
   cursor:             default;
   overflow:           hidden;
   position:           absolute; /* all views are absolutely positioned. */
-  -moz-user-select:   none;
+  -moz-user-select:   -moz-none;
   -khtml-user-select: none;
   user-select:        none;
   margin:             0px;
@@ -40,6 +40,7 @@
 }
 
 /* This className is useful when aligning buttons to the right */
+.sc-view.text-align-right,
 .sc-view.textAlignRight {
   text-align:right;
 }

data/frameworks/sproutcore/frameworks/foundation/mixins/button.js

@@ -160,43 +160,46 @@ SC.Button = {
     @returns {SC.RenderContext} the context
   */
   renderTitle: function(context, firstTime) {
-    var icon = this.get('icon') ;
-    var image = '' ;
-    var title = this.get('displayTitle') ;
-    var needsTitle = (!SC.none(title) && title.length>0);
-    var elem, htmlNode;
+    var icon = this.get('icon'),
+        image = '' ,
+        title = this.get('displayTitle') ,
+        needsTitle = (!SC.none(title) && title.length>0),
+        elem, htmlNode, imgTitle;
     // get the icon.  If there is an icon, then get the image and update it.
     // if there is no image element yet, create it and insert it just before
     // title.
     if (icon) {
       var blank = SC.BLANK_IMAGE_URL;
 
-      image = '<img src="%@1" alt="" class="%@2" />' ;
       if (icon.indexOf('/') >= 0) {
-        image = image.fmt(icon, 'icon');
+        image = '<img src="'+icon+'" alt="" class="icon" />';
       } else {
-        image = image.fmt(blank, icon);
+        image = '<img src="'+blank+'" alt="" class="'+icon+'" />';
       }
       needsTitle = YES ;
     }
-    elem = this.$('label');
+    imgTitle = image + title;
     if(firstTime){
       if(this.get('needsEllipsis')){
-        context.push('<label class="sc-button-label ellipsis">'+image+title+'</label>'); 
+        context.push('<label class="sc-button-label ellipsis">'+imgTitle+'</label>'); 
       }else{
-          context.push('<label class="sc-button-label">'+image+title+'</label>'); 
+          context.push('<label class="sc-button-label">'+imgTitle+'</label>'); 
       }  
-    }else if ( (htmlNode = elem[0])){
-      if(needsTitle) { 
-        if(this.get('needsEllipsis')){
-          elem.addClass('ellipsis');
-          htmlNode.innerHTML = image + title;
-        }else{
-          elem.removeClass('ellipsis');
-          htmlNode.innerHTML = image + title;
-        } 
+      this._ImageTitleCached = imgTitle;
+    }else{
+      elem = this.$('label');  
+      if ( (htmlNode = elem[0])){
+        if(needsTitle) { 
+          if(this.get('needsEllipsis')){
+            elem.addClass('ellipsis');
+            if(this._ImageTitleCached !== imgTitle) htmlNode.innerHTML = imgTitle;
+          }else{
+            elem.removeClass('ellipsis');
+            if(this._ImageTitleCached !== imgTitle) htmlNode.innerHTML = imgTitle;
+          } 
+        }
+        else { htmlNode.innerHTML = ''; } 
       }
-      else { htmlNode.innerHTML = ''; } 
     }  
     return context ;
   },
@@ -210,8 +213,8 @@ SC.Button = {
     @returns {SC.Button} receiver
   */
   contentPropertyDidChange: function(target, key) {
-    var del = this.get('displayDelegate');
-    var content = this.get('content'), value ;
+    var del = this.get('displayDelegate'), 
+        content = this.get('content'), value ;
 
     var valueKey = this.getDelegateProperty('contentValueKey', del) ;
     if (valueKey && (key === valueKey || key === '*')) {
@@ -291,8 +294,7 @@ SC.Button = {
     @returns {Boolean} return state
   */
   computeIsSelectedForValue: function(value) {
-    var targetValue = this.get('toggleOnValue') ;
-    var state, next ;
+    var targetValue = this.get('toggleOnValue'), state, next ;
     
     if (SC.typeOf(value) === SC.T_ARRAY) {
 
@@ -314,7 +316,8 @@ SC.Button = {
       
     // for single values, just compare to the toggleOnValue...use truthiness
     } else {
-      state = (value == targetValue) ;
+      if(value === SC.MIXED_STATE) state = SC.MIXED_STATE;
+      else state = (value == targetValue) ;
     }
     return state ;
   },
@@ -330,8 +333,8 @@ SC.Button = {
     Whenever the button value changes, update the selected state to match.
   */
   _button_valueDidChange: function() {
-    var value = this.get('value');  
-    var state = this.computeIsSelectedForValue(value);
+    var value = this.get('value'),
+        state = this.computeIsSelectedForValue(value);
     this.set('isSelected', state) ; // set new state...
   }.observes('value'),
   
@@ -339,8 +342,8 @@ SC.Button = {
     Whenever the selected state is changed, make sure the button value is also updated.  Note that this may be called because the value has just changed.  In that case this should do nothing.
   */
   _button_isSelectedDidChange: function() {
-    var newState = this.get('isSelected');
-    var curState = this.computeIsSelectedForValue(this.get('value'));
+    var newState = this.get('isSelected'),
+        curState = this.computeIsSelectedForValue(this.get('value'));
     
     // fix up the value, but only if computed state does not match.
     // never fix up value if isSelected is set to MIXED_STATE since this can

data/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js

@@ -389,16 +389,20 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
   insertTab: function(evt) {
     this.resignFirstResponder();
     this.commitEditing() ;
-    var next = this._delegate.nextValidKeyView();
-    if(next) next.beginEditing();
+    if(this._delegate){
+      var next = this._delegate.nextValidKeyView();
+      if(next) next.beginEditing();
+    }
     return YES ;
   },
 
   /** @private */
   insertBacktab: function(evt) {
-    var prev = this._delegate.previousValidKeyView();
     this.commitEditing() ;
-    if(prev) prev.beginEditing();
+    if(this._delegate){
+      var prev = this._delegate.previousValidKeyView();
+      if(prev) prev.beginEditing();
+    }
     return YES ;
   },
   

data/frameworks/sproutcore/frameworks/foundation/mixins/string.js

@@ -11,6 +11,12 @@ sc_require('system/locale');
 // SproutCore.
 /** @private */
 SC.STRING_TITLEIZE_REGEXP = (/([\s|\-|\_|\n])([^\s|\-|\_|\n]?)/g);
+SC.STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
+SC.STRING_DASHERIZE_REGEXP = (/[ _]/g);
+SC.STRING_HUMANIZE_REGEXP = (/[\-_]/g);
+SC.STRING_TRIM_REGEXP = (/^\s+|\s+$/g);
+SC.STRING_TRIM_LEFT_REGEXP = (/^\s+/g);
+SC.STRING_TRIM_RIGHT_REGEXP = (/\s+$/g);
 
 /**
   @namespace
@@ -111,7 +117,7 @@ SC.String = {
     @return {String} titleized string.
   */
   titleize: function() {
-    var ret = this.replace(/([a-z])([A-Z])/g,'$1_$2'); // decamelize
+    var ret = this.replace(SC.STRING_DECAMELIZE_REGEXP,'$1_$2'); // decamelize
     return ret.replace(SC.STRING_TITLEIZE_REGEXP, 
       function(str,separater,character) { 
         return (character) ? (' ' + character.toUpperCase()) : ' ';
@@ -178,7 +184,7 @@ SC.String = {
     @returns {String} the decamelized string.
   */
   decamelize: function() { 
-    return this.replace(/([a-z])([A-Z])/g,'$1_$2').toLowerCase();
+    return this.replace(SC.STRING_DECAMELIZE_REGEXP,'$1_$2').toLowerCase();
   },
 
   /**
@@ -196,7 +202,7 @@ SC.String = {
     @returns {String} the dasherized string.
   */
   dasherize: function() {
-    return this.decamelize().replace(/[ _]/g,'-') ;  
+    return this.decamelize().replace(SC.STRING_DASHERIZE_REGEXP,'-') ;  
   },
   
   /**
@@ -214,7 +220,7 @@ SC.String = {
     @returns {String} the humanized string.
   */
   humanize: function() {
-    return this.decamelize().replace(/[\-_]/g,' ') ;
+    return this.decamelize().replace(SC.STRING_HUMANIZE_REGEXP,' ') ;
   },
   
   /**
@@ -295,9 +301,8 @@ SC.String = {
       diacriticMappingTable = SC.diacriticMappingTable;
     }
     
-    var original, replacement;
-    var ret = "";
-    var length = this.length;
+    var original, replacement, ret = "",
+        length = this.length;
     for (var i = 0; i <= length; ++i) {
       original = this.charAt(i);
       replacement = diacriticMappingTable[original];
@@ -318,7 +323,7 @@ SC.String = {
     @returns {String} the trimmed string
   */
   trim: function () {
-    return this.replace(/^\s+|\s+$/g,"");
+    return this.replace(SC.STRING_TRIM_REGEXP,"");
   },
   
   /**
@@ -327,7 +332,7 @@ SC.String = {
     @returns {String} the trimmed string
   */
   trimLeft: function () {
-    return this.replace(/^\s+/g,"");
+    return this.replace(SC.STRING_TRIM_LEFT_REGEXP,"");
   },
   
   /**
@@ -336,7 +341,7 @@ SC.String = {
     @returns {String} the trimmed string
   */
   trimRight: function () {
-    return this.replace(/\s+$/g,"");
+    return this.replace(SC.STRING_TRIM_RIGHT_REGEXP,"");
   }
     
 };

data/frameworks/sproutcore/frameworks/foundation/panes/pane.js

@@ -117,14 +117,38 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     
     @returns {Rect} current window size 
   */
-  computeParentDimensions: function() {
-    var pframe = this.get('currentWindowSize');
-    return {
-      width: (pframe) ? pframe.width : 1000,
-      height: (pframe) ? pframe.height : 1000
-    } ;
+  computeParentDimensions: function(frame) {
+    var wframe = this.get('currentWindowSize');
+    var wDim = {x: 0, y: 0, width: 1000, height: 1000};
+    if (wframe){
+      wDim.width = wframe.width;
+      wDim.height = wframe.height;
+    }
+    // Call the RootResponder instance...
+    else if (SC.RootResponder.responder) {
+      var wSize = SC.RootResponder.responder.get('currentWindowSize');
+      if (wSize){
+        wDim.width = wSize.width;
+        wDim.height = wSize.height;
+      }
+    }
+    // If all else fails then we need to Calculate it from the window size and DOM
+    else {
+      if (window.innerHeight) {
+        wDim.width = window.innerWidth;
+        wDim.height = window.innerHeight;
+      } else if (document.documentElement && document.documentElement.clientHeight) {
+        wDim.width = document.documentElement.clientWidth;
+        wDim.height = document.documentElement.clientHeight; 
+      } else if (document.body) {
+        wDim.width = document.body.clientWidth;
+        wDim.height = document.body.clientHeight;
+      }
+      this.windowSizeDidChange(null, wDim);
+    }    
+    return wDim;
   },
-  
+    
   /** @private Disable caching due to an known bug in SC. */
   frame: function() {
     return this.computeFrameWithParentFrame(null) ;
@@ -184,6 +208,27 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     return evt.mouseHandler || target ;
   },
 
+  performKeyEquivalent: function(keystring, evt) {
+    var ret = sc_super() ; // try normal view behavior first
+    if (!ret) {
+      var defaultResponder = this.get('defaultResponder') ;
+      if (defaultResponder) {
+        // try default responder's own performKeyEquivalent method,
+        // if it has one...
+        if (defaultResponder.performKeyEquivalent) {
+          ret = defaultResponder.performKeyEquivalent(keystring, evt) ;
+        }
+        
+        // even if it does have one, if it doesn't handle the event, give
+        // methodName-style key equivalent handling a try
+        if (!ret) {
+          ret = defaultResponder.tryToPerform(keystring, evt) ;
+        }
+      }
+    }
+    return ret ;
+  },
+
   // .......................................................
   // HANDLE FIRST RESPONDER AND KEY RESPONDER STATUS
   //
@@ -457,6 +502,7 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     if (!this.get('isPaneAttached')) return this ; // nothing to do
     
     // remove layer...
+    this.set('isVisibleInWindow', NO);
     var dom = this.get('layer') ;
     if (dom.parentNode) dom.parentNode.removeChild(dom) ;
     dom = null ;
@@ -472,7 +518,6 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     
     // clean up some of my own properties
     this.set('isPaneAttached', NO) ;
-    this.parentViewDidChange() ;
     return this ;
   },
   
@@ -596,6 +641,9 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     this.set('isPaneAttached', YES) ;
     this.parentViewDidChange() ;
     
+    //notify that the layers have been appended to the document
+    this._notifyDidAppendToDocument();
+    
     return this ;
   },
   
@@ -616,12 +664,13 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     @returns {SC.Pane} receiver
   */
   recomputeIsVisibleInWindow: function(parentViewIsVisible) {
-    var last = this.get('isVisibleInWindow') ;
-    var cur = this.get('isPaneAttached') && this.get('isVisible') ;
+    var last = this.get('isVisibleInWindow'),
+        cur = this.get('isVisible') ;
 
     // if the state has changed, update it and notify children
-    if (last !== cur) {
+    // if (last !== cur) {
       this.set('isVisibleInWindow', cur) ;
+      this._needsVisibiltyChange = YES ; // update even if we aren't visible      
       
       // if we just became visible, update layer + layout if needed...
       if (cur && this.get('layerNeedsUpdate')) this.updateLayerIfNeeded();
@@ -635,7 +684,7 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
       // if we were firstResponder, resign firstResponder also if no longer
       // visible.
       if (!cur && this.get('isFirstResponder')) this.resignFirstResponder();
-    }
+    // }
     
     // if we just became visible, update layer + layout if needed...
     if (cur) {

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

@@ -38,7 +38,8 @@ SC.mixin(/** @scope SC */ {
     Execute callback function.
   */
   _scb_bundleDidLoad: function(bundleName, target, method, args) {
-    var m, t;
+    var m = method, t = target ;
+
     if(SC.typeOf(target) === SC.T_STRING) {
       t = SC.objectForPropertyPath(target);
     }

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

@@ -4,7 +4,7 @@
 //            Portions ©2008-2009 Apple Inc. All rights reserved.
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
-/*globals CQ*/
+/*globals CQ add*/
 
 require('system/builder') ;
 
@@ -95,8 +95,19 @@ SC.CoreQuery = (function() {
   // (both of which we optimize for)
   var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
   // Is it a simple selector
-  isSimple = /^.[^:#\[\.]*$/,
-  undefined ;
+  isSimple = /^.[^:#\[\.]*$/;
+  
+  // Regular expressions
+  var CQHtmlRegEx =/ CQ\d+="(?:\d+|null)"/g,
+  tagSearchRegEx = /(<(\w+)[^>]*?)\/>/g,
+  xmlTagsRegEx = /^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
+  checkforSpaceRegEx = /\s+/,
+  trimWhiteSpaceRegEx = /^\s+/,
+  bodyHTMLOffsetRegEx = /^body|html$/i,
+  specialAttributesRegEx = /href|src|style/,
+  tagsWithTabIndexRegEx = /(button|input|object|select|textarea)/i,
+  alphaDetectRegEx = /alpha\([^)]*\)/,
+  alphaReplaceRegEx = /opacity=([^)]*)/;
 
   var styleFloat = SC.browser.msie ? "styleFloat" : "cssFloat";
 
@@ -116,7 +127,7 @@ SC.CoreQuery = (function() {
   } ;
 
   var getWH = function getWH(elem, name, which) {
-    var val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+    var val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
     var padding = 0, border = 0, loc=which.length, dim;
     while(--loc>=0) {
       dim = which[loc];
@@ -139,7 +150,7 @@ SC.CoreQuery = (function() {
 
     // defaultView is cached
     var ret = defaultView.getComputedStyle( elem, null );
-    return !ret || ret.getPropertyValue("color") == "";
+    return !ret || ret.getPropertyValue("color") === "";
   } ;
 
   
@@ -147,7 +158,7 @@ SC.CoreQuery = (function() {
   // Helper function used by the dimensions and offset modules
   function num(elem, prop) {
     return elem[0] && parseInt( CQ.curCSS(elem[0], prop, true), 10 ) || 0;
-  } ;
+  }
 
   var CoreQuery, CQ ;
   
@@ -191,9 +202,9 @@ SC.CoreQuery = (function() {
         if ( match && (match[1] || !context) ) {
 
           // HANDLE: $(html) -> $(array)
-          if ( match[1] )
+          if ( match[1] ) {
             selector = CQ.clean( [ match[1] ], context );
-
+          }
           // HANDLE: $("#id")
           else {
             var elem = document.getElementById( match[3] );
@@ -283,10 +294,11 @@ SC.CoreQuery = (function() {
     not: function( selector ) {
       if ( typeof selector === "string" ) {
         // test special case where just one selector is passed in
-        if ( isSimple.test( selector ) )
+        if ( isSimple.test( selector ) ) {
           return this.pushStack( CQ.multiFilter( selector, this, true ) );
-        else
+        }else {
           selector = CQ.multiFilter( selector, this );
+        }
       }
 
       var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
@@ -406,34 +418,32 @@ SC.CoreQuery = (function() {
       var options = name;
 
       // Look for the case where we're accessing a style value
-      if ( typeof name === "string" )
-        if ( value === undefined )
+      if ( typeof name === "string" ) {
+        if ( value === undefined ) {
           return this[0] && CQ[ type || "attr" ]( this[0], name );
-
+        }
         else {
           options = {};
           options[ name ] = value;
         }
-
+      }
       // Check to see if we're setting style values
       return this.each(function(i){
         // Set all the styles
-        for ( name in options )
+        for ( name in options ) {
           CQ.attr(
             (type)?this.style:this,
             name, CQ.prop( this, options[ name ], type, i, name ));
+        }
       });
     },
     
     html: function( value ) {
       return value === undefined ?
       			(this[0] ?
-      				this[0].innerHTML.replace(/ CQ\d+="(?:\d+|null)"/g, "") :
+      				this[0].innerHTML.replace(CQHtmlRegEx, "") :
       				null) :
       			this.empty().append( value );
-      // return value == undefined ?
-      //  (this[0] ? this[0].innerHTML : null) :
-      //  this.empty().append( value );
     },
 
     andSelf: function() { return this.add( this.prevObject ); },
@@ -459,7 +469,7 @@ SC.CoreQuery = (function() {
     */
     hasClass: function( className ) {
       return Array.prototype.every.call(this, function(elem) {
-        return (elem.nodeType!=1) || CQ.className.has(elem, className) ;
+        return (elem.nodeType===1) && CQ.className.has(elem, className) ;
       });
     },
 
@@ -477,15 +487,16 @@ SC.CoreQuery = (function() {
       if ( value === undefined ) {     
         var elem = this[0];
         if (elem) {
-          if(CQ.nodeName(elem, 'option'))
+          if(CQ.nodeName(elem, 'option')) {
             return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-
+          }
           // We need to handle select boxes special
           if ( CQ.nodeName( elem, "select" ) ) {
             var index = elem.selectedIndex,
               values = [],
               options = elem.options,
-              one = elem.type == "select-one";
+              one = elem.type === "select-one",
+              option;
 
             // Nothing was selected
             if ( index < 0 ) return null;
@@ -493,7 +504,7 @@ SC.CoreQuery = (function() {
             // Loop through all the selected options
             var i, max = one ? index+1:options.length;
             for (i = one ? index : 0; i < max; i++ ) {
-              var option = options[ i ];
+              option = options[ i ];
               if ( option.selected ) {
                 value = CQ(option).val(); // get value
                 if (one) return value; // We don't need an array for one
@@ -513,7 +524,7 @@ SC.CoreQuery = (function() {
       } else {
         if( typeof value === "number" ) value += ''; // force to string
         this.each(function(){
-          if ( this.nodeType != 1 ) return;
+          if ( this.nodeType !== 1 ) return;
           
           // handle radio/checkbox.  set the checked value
           if (SC.typeOf(value) === SC.T_ARRAY && (/radio|checkbox/).test(this.type)) {
@@ -566,8 +577,9 @@ SC.CoreQuery = (function() {
       // this is primarily for IE but the data expando shouldn't be copied 
       // over in any browser
       var clone = ret.find("*").andSelf().each(function(){
-        if ( this[ SC.guidKey ] !== undefined )
+        if ( this[ SC.guidKey ] !== undefined ) {
           this[ SC.guidKey ] = null;
+        }
       });
 
       // Return the cloned set
@@ -584,7 +596,7 @@ SC.CoreQuery = (function() {
     */
     css: function( key, value ) {
       // ignore negative width and height values
-      if ((key == 'width' || key == 'height') && parseFloat(value,0) < 0 ) {
+      if ((key === 'width' || key === 'height') && parseFloat(value,0) < 0 ) {
         value = undefined;
       }
       return this.attr( key, value, "curCSS" );
@@ -598,16 +610,17 @@ SC.CoreQuery = (function() {
       @returns {String|CoreQuery}
     */
     text: function( text ) {
-      if ( typeof text !== "object" && text != null )
+      if ( text !== undefined && typeof text !== "object" && text != null ) {
         return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
+      }
       var ret = "";
 
       CQ.each( text || this, function(){
         CQ.each( this.childNodes, function(){
-          if ( this.nodeType != 8 )
-            ret += this.nodeType != 1 ?
+          if ( this.nodeType !== 8 ){
+            ret += this.nodeType !== 1 ?
               this.nodeValue : CQ.fn.text( [ this ] );
+          }
         });
       });
 
@@ -625,7 +638,7 @@ SC.CoreQuery = (function() {
           
           // handle edge case where the CSS style is none so we can't detect
           // the natural display state.
-          if (CQ.css(this,'display') == 'none') {
+          if (CQ.css(this,'display') === 'none') {
             var elem = CQ('<' + this.tagName + '/>');
             CQ('body').append(elem);
             this.style.display = elem.css('display');
@@ -679,15 +692,13 @@ SC.CoreQuery = (function() {
     
     append: function() {
       return this.domManip(arguments, true, false, function(elem){
-        if (this.nodeType == 1)
-          this.appendChild( elem );
+        if (this.nodeType === 1) this.appendChild( elem );
       });
     },
 
     prepend: function() {
       return this.domManip(arguments, true, true, function(elem){
-        if (this.nodeType == 1)
-          this.insertBefore( elem, this.firstChild );
+        if (this.nodeType === 1) this.insertBefore( elem, this.firstChild );
       });
     },
 
@@ -717,7 +728,7 @@ SC.CoreQuery = (function() {
   CoreQuery.mixin(/** @scope SC.CoreQuery */ {
     
     nodeName: function( elem, name ) {
-      return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+      return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
     },
     
     /**
@@ -739,15 +750,14 @@ SC.CoreQuery = (function() {
       @returns {Array} mapped elements
     */
     map: function( elems, callback ) {
-      var ret = [];
+      var ret = [], value, i, length;
 
       // Go through the array, translating each of the items to their
       // new value (or values).
-      for ( var i = 0, length = elems.length; i < length; i++ ) {
-        var value = callback( elems[ i ], i );
+      for ( i = 0, length = elems.length; i < length; i++ ) {
+        value = callback( elems[ i ], i );
 
-        if ( value != null )
-          ret[ ret.length ] = value;
+        if ( value != null ) ret[ ret.length ] = value;
       }
       
       return ret.concat.apply([],ret) ;
@@ -768,23 +778,24 @@ SC.CoreQuery = (function() {
 
       if ( args ) {
         if ( length === undefined ) {
-          for ( name in object )
-            if ( callback.apply( object[ name ], args ) === false )
-              break;
-        } else
-          for ( ; i < length; )
-            if ( callback.apply( object[ i++ ], args ) === false )
-              break;
-
+          for ( name in object ) {
+            if ( callback.apply( object[ name ], args ) === false ) break;
+          }
+        } else {
+          for ( ; i < length; ) {
+            if ( callback.apply( object[ i++ ], args ) === false ) break;
+          }
+        }
       // A special, fast, case for the most common use of each
       } else {
         if ( length === undefined ) {
-          for ( name in object )
-            if ( callback.call( object[ name ], name, object[ name ] ) === false )
-              break;
-        } else
+          for ( name in object ) {
+            if ( callback.call( object[ name ], name, object[ name ] ) === false ) break;
+          }
+        } else {
           for ( var value = object[0];
             i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
+          }
       }
 
       return object;
@@ -810,14 +821,14 @@ SC.CoreQuery = (function() {
         // Convert html string into DOM nodes
         if ( typeof elem === "string" ) {
           // Fix "XHTML"-style tags in all browsers
-          elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-            return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
+          elem = elem.replace(tagSearchRegEx, function(all, front, tag){
+            return tag.match(xmlTagsRegEx) ?
               all :
               front + "></" + tag + ">";
           });
 
           // Trim whitespace, otherwise indexOf won't work as expected
-          var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase(), 
+          var tags = elem.replace(trimWhiteSpaceRegEx, "").substring(0, 10).toLowerCase(), 
               div = context.createElement("div");
 
           var wrap =
@@ -861,18 +872,19 @@ SC.CoreQuery = (function() {
               div.firstChild && div.firstChild.childNodes :
 
               // String was a bare <thead> or <tfoot>
-              wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
+              wrap[1] === "<table>" && tags.indexOf("<tbody") < 0 ?
                 div.childNodes :
                 [];
 
-            for ( var j = tbody.length - 1; j >= 0 ; --j )
-              if ( CQ.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+            for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+              if ( CQ.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
                 tbody[ j ].parentNode.removeChild( tbody[ j ] );
-
+              }
+            }
             // IE completely kills leading whitespace when innerHTML is used
-            if ( /^\s/.test( elem ) )
+            if ( /^\s/.test( elem ) ) {
               div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
+            }
           }
 
           elem = CQ.makeArray( div.childNodes );
@@ -926,14 +938,15 @@ SC.CoreQuery = (function() {
       @returns {Array} matched elements
     */
     find: function( t, context ) {
+      var ret;
       
       // Quickly handle non-string expressions
-      if ( typeof t != "string" ) return [ t ];
+      if ( typeof t !== "string" ) return [ t ];
 
       // if the selector contains commas, then we actually want to search
       // multiple selectors.
       if (t.indexOf(',')>=0) {
-        var ret = t.split(',').map(function(sel) {
+        ret = t.split(',').map(function(sel) {
           return CQ.find(sel,context);
         });
 
@@ -942,7 +955,7 @@ SC.CoreQuery = (function() {
       }
       
       // check to make sure context is a DOM element or a document
-      if ( context && context.nodeType != 1 && context.nodeType != 9) {
+      if ( context && context.nodeType !== 1 && context.nodeType !== 9) {
         return [];
       }
 
@@ -950,8 +963,9 @@ SC.CoreQuery = (function() {
       context = context || document;
 
       // Initialize the search.  split the selector into pieces
-      var ret = [context], nodeName, inFindMode = YES;
-      var parts = t.match(quickSplit), len = parts.length, m ;
+      ret = [context];
+      var nodeName, inFindMode = YES,
+          parts = t.match(quickSplit), len = parts.length, m ;
       
       // loop through each part and either find or filter as needed
       for(var idx=0;idx<len;idx++) {
@@ -983,7 +997,7 @@ SC.CoreQuery = (function() {
             case '': // tag
               if (!val) val = '*';
               // Handle IE7 being really dumb about <object>s
-              if ( val == "*" && cur.nodeName.toLowerCase() == "object" ) {
+              if ( val === "*" && cur.nodeName.toLowerCase() === "object" ) {
                 val = "param";
               }
               
@@ -1028,7 +1042,8 @@ SC.CoreQuery = (function() {
               // do nothing
             }
           }
-          delete ret; ret = next ; // swap array
+          delete ret; 
+          ret = next ; // swap array
           inFindMode = NO;
           
         // if we are not in findMode then simply filter the results.
@@ -1042,11 +1057,12 @@ SC.CoreQuery = (function() {
 
     classFilter: function(r,m,not){
       m = " " + m + " ";
-      var tmp = [];
+      var tmp = [], pass;
       for ( var i = 0; r[i]; i++ ) {
-        var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
-        if ( !not && pass || not && !pass )
+        pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+        if ( !not && pass || not && !pass ) {
           tmp.push( r[i] );
+        }
       }
       return tmp;
     },
@@ -1090,7 +1106,7 @@ SC.CoreQuery = (function() {
 
     /** @private Accepts filters separated by commas. */
     multiFilter: function( expr, elems, not ) {
-      expr = (expr.indexOf(',')) ? expr.split(',') : [expr];
+      expr = expr.indexOf(',') ? expr.split(',') : [expr];
       var loc=expr.length,cur,ret=[];
       while(--loc >= 0) { // unit tests expect reverse iteration
         cur = CQ.filter(expr[loc].trim(), elems, not) ;
@@ -1111,7 +1127,7 @@ SC.CoreQuery = (function() {
       // returned (IE returns comment nodes in a '*' query)
       if ( SC.browser.msie ) {
         while ( elem = second[ i++ ] ) {
-          if ( elem.nodeType != 8 ) first[ pos++ ] = elem;
+          if ( elem.nodeType !== 8 ) first[ pos++ ] = elem;
         }
 
       } else {
@@ -1125,25 +1141,26 @@ SC.CoreQuery = (function() {
     makeArray: function(array) {
       var ret = [];
 
-      if( array != null ){
+      if( array !== undefined || array != null ){
         var i = array.length;
         // The window, strings (and functions) also have 'length'
-        if( i == null || typeof array === 'string' || array.setInterval )
+        if( i == null || typeof array === 'string' || array.setInterval ) {
           ret[0] = array;
-        else
-          while( i )
-            ret[--i] = array[i];
+        }
+        else {
+          while( i ) ret[--i] = array[i];
+        }
       }
 
       return ret;
     },
 
     inArray: function(elem,array) {
-      return (array.indexOf) ? array.indexOf(elem) : Array.prototype.indexOf.call(array, elem);
+      return array.indexOf ? array.indexOf(elem) : Array.prototype.indexOf.call(array, elem);
     },
     
     // Check to see if the W3C box model is being used
-    boxModel: !SC.browser.msie || document.compatMode == "CSS1Compat",
+    boxModel: !SC.browser.msie || document.compatMode === "CSS1Compat",
 
     props: {
       "for": "htmlFor",
@@ -1163,7 +1180,7 @@ SC.CoreQuery = (function() {
       if (SC.typeOf(value) === SC.T_FUNCTION) value = value.call(elem, i);
 
       // Handle passing in a number to a CSS property
-      return value && (typeof value === "number") && type == "curCSS" && !exclude.test( name ) ? value + "px" : value;
+      return value && (typeof value === "number") && type === "curCSS" && !exclude.test( name ) ? value + "px" : value;
     },
     
     
@@ -1184,17 +1201,18 @@ SC.CoreQuery = (function() {
       // internal only, use addClass("class")
       add: function( elem, classNames ) {
         var has = CQ.className.has ;
-        CQ.each((classNames || "").split(/\s+/), function(i, className){
-          if ( elem.nodeType == 1 && !has( elem.className, className ) )
+        CQ.each((classNames || "").split(checkforSpaceRegEx), function(i, className){
+          if ( elem.nodeType === 1 && !has( elem.className, className ) ) {
             elem.className += (elem.className ? " " : "") + className;
+          }
         });
       },
 
       // internal only, use removeClass("class")
       remove: function( elem, classNames ) {
-        if (elem.nodeType == 1) {
+        if (elem.nodeType === 1) {
           elem.className = classNames !== undefined ?
-            CQ.grep(elem.className.split(/\s+/), function(className){
+            CQ.grep(elem.className.split(checkforSpaceRegEx), function(className){
               return !CQ.className.has( classNames, className );
             }).join(" ") : "";
         }
@@ -1202,16 +1220,16 @@ SC.CoreQuery = (function() {
 
       // internal only, use hasClass("class")
       has: function( elem, className ) {
-        return elem && CQ.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+        return elem && CQ.inArray( className, (elem.className || elem).toString().split(checkforSpaceRegEx) ) > -1;
       }
     },
     
     /** @private A method for quickly swapping in/out CSS properties to get 
       correct calculations */
     swap: function( elem, options, callback, direction, arg ) {
-      var old = {};
+      var old = {}, name;
       // Remember the old values, and insert the new ones
-      for ( var name in options ) {
+      for ( name in options ) {
         old[ name ] = elem.style[ name ];
         elem.style[ name ] = options[ name ];
       }
@@ -1219,15 +1237,15 @@ SC.CoreQuery = (function() {
       var ret = callback(elem, direction, arg );
 
       // Revert the old values
-      for ( var name in options ) elem.style[ name ] = old[ name ];
+      for ( name in options ) elem.style[ name ] = old[ name ];
       return ret ;
     },
     
     /** returns a normalized value for the specified style name. */
     css: function( elem, name, force ) {
       // handle special case for width/height
-      if ( name == "width" || name == "height" ) {
-        var val, which = (name == "width") ? LEFT_RIGHT : TOP_BOTTOM,
+      if ( name === "width" || name === "height" ) {
+        var val, which = (name === "width") ? LEFT_RIGHT : TOP_BOTTOM,
         props = CSS_DISPLAY_PROPS;
 
         val = SC.$.isVisible(elem) ? getWH(elem,name,which) : CQ.swap(elem,props,getWH,name,which) ;
@@ -1243,9 +1261,9 @@ SC.CoreQuery = (function() {
       var ret, style = elem.style;
 
       // We need to handle opacity special in IE
-      if ( name == "opacity" && SC.browser.msie ) {
+      if ( name === "opacity" && SC.browser.msie ) {
         ret = CQ.attr( style, "opacity" );
-        return ret == "" ? "1" : ret;
+        return ret === "" ? "1" : ret;
       }
       
       // Opera sometimes will give the wrong display answer, this fixes it, 
@@ -1297,17 +1315,17 @@ SC.CoreQuery = (function() {
 
           // Since we flip the display style, we have to handle that
           // one special, otherwise get the value
-          ret = (name == "display" && swap[stack.length-1]!=null) ? "none" :
+          ret = (name === "display" && swap[stack.length-1]!==null) ? "none" :
             (computedStyle && computedStyle.getPropertyValue(name)) || "";
 
           // Finally, revert the display styles back
           for ( i = 0, swLen = swap.length; i < swLen; i++ ) {
-            if (swap[i]!=null) stack[i].style.display = swap[i];
+            if (swap[i]!==null) stack[i].style.display = swap[i];
           }
         }
 
         // We should always get a number back from opacity
-        if (name == "opacity" && ret == "") ret = "1";
+        if (name === "opacity" && ret === "") ret = "1";
 
       } else if (elem.currentStyle) {
         // var camelCase = name.camelize();
@@ -1344,7 +1362,7 @@ SC.CoreQuery = (function() {
     dir: function( elem, dir ){
       var matched = [], cur = elem[dir];
       while ( cur && cur != document ) {
-        if ( cur.nodeType == 1 ) matched.push( cur );
+        if ( cur.nodeType === 1 ) matched.push( cur );
         cur = cur[dir];
       }
       return matched;
@@ -1358,7 +1376,7 @@ SC.CoreQuery = (function() {
       result = result || 1;
       var num = 0;
       for ( ; cur; cur = cur[dir] ) {
-        if ( cur.nodeType == 1 && ++num == result ) break;
+        if ( cur.nodeType === 1 && ++num == result ) break;
       }
       return cur;
     },
@@ -1367,7 +1385,7 @@ SC.CoreQuery = (function() {
     sibling: function( n, elem ) {
       var r = [];
       for ( ; n; n = n.nextSibling ) {
-        if ( n.nodeType == 1 && n != elem ) r.push( n );
+        if ( n.nodeType === 1 && n != elem ) r.push( n );
       }
       return r;
     },
@@ -1375,7 +1393,7 @@ SC.CoreQuery = (function() {
     /** Primitive helper can read or update an attribute on an element. */
     attr: function( elem, name, value ) {
       // don't set attributes on text and comment nodes
-      if (!elem || elem.nodeType == 3 || elem.nodeType == 8) return undefined;
+      if (!elem || elem.nodeType === 3 || elem.nodeType === 8) return undefined;
 
       var notxml = !CQ.isXMLDoc( elem ),
         set = value !== undefined,
@@ -1389,11 +1407,11 @@ SC.CoreQuery = (function() {
       if ( elem.tagName ) {
 
         // These attributes require special treatment
-        var special = /href|src|style/.test( name );
+        var special = specialAttributesRegEx.test( name );
 
         // Safari mis-reports the default selected property of a hidden option
         // Accessing the parent's selectedIndex property fixes it
-        if ( name == "selected" && elem.parentNode ) {
+        if ( name === "selected" && elem.parentNode ) {
           elem.parentNode.selectedIndex;
         }
 
@@ -1402,7 +1420,7 @@ SC.CoreQuery = (function() {
           if ( set ){
             // We can't allow the type property to be changed (since it causes 
             // problems in IE)
-            if ( name == "type" && CQ.nodeName( elem, "input" ) && elem.parentNode ) {
+            if ( name === "type" && CQ.nodeName( elem, "input" ) && elem.parentNode ) {
               throw "type property can't be changed";
             }
 
@@ -1417,11 +1435,11 @@ SC.CoreQuery = (function() {
           
           // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
           // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-          if ( name == "tabIndex" ) {
+          if ( name === "tabIndex" ) {
           	var attributeNode = elem.getAttributeNode( "tabIndex" );
           	return attributeNode && attributeNode.specified
           				? attributeNode.value
-          				: elem.nodeName.match(/(button|input|object|select|textarea)/i)
+          				: elem.nodeName.match(tagsWithTabIndexRegEx)
           					? 0
           					: elem.nodeName.match(/^(a|area)$/i) && elem.href
           						? 0
@@ -1431,9 +1449,9 @@ SC.CoreQuery = (function() {
           return elem[ name ];
         }
 
-        if ( msie && notxml &&  name === "style" )
+        if ( msie && notxml &&  name === "style" ) {
           return CQ.attr( elem.style, "cssText", value );
-
+        }
         // convert the value to a string (all browsers do this but IE) see 
         // #1070 (jQuery)
         if ( set ) elem.setAttribute( name, "" + value );
@@ -1450,19 +1468,19 @@ SC.CoreQuery = (function() {
       // elem is actually elem.style ... set the style
 
       // IE uses filters for opacity
-      if ( msie && name == "opacity" ) {
+      if ( msie && name === "opacity" ) {
         if ( set ) {
           // IE has trouble with opacity if it does not have layout
           // Force it by setting the zoom level
           elem.zoom = 1;
 
           // Set the alpha filter to set the opacity
-          elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+          elem.filter = (elem.filter || "").replace( alphaDetectRegEx, "" ) +
             (parseInt(value,0) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
         }
 
         return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
-          (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+          (parseFloat( elem.filter.match(alphaReplaceRegEx)[1] ) / 100) + '':
           "";
       }
 
@@ -1510,9 +1528,9 @@ SC.CoreQuery = (function() {
     CQ.fn[ name ] = function( selector ) {
       var ret = CQ.map( this, fn );
 
-      if ( selector && typeof selector == "string" )
+      if ( selector && typeof selector === "string" ) {
         ret = CQ.multiFilter( selector, ret );
-
+      }
       return this.pushStack(ret.uniq());
     };
   });
@@ -1528,8 +1546,9 @@ SC.CoreQuery = (function() {
       var args = arguments;
 
       return this.each(function(){
-        for ( var i = 0, length = args.length; i < length; i++ )
+        for ( var i = 0, length = args.length; i < length; i++ ) {
           CQ( args[ i ] )[ original ]( this );
+        }
       });
     };
   });
@@ -1537,7 +1556,7 @@ SC.CoreQuery = (function() {
   CQ.each({
     removeAttr: function( name ) {
       CQ.attr( this, name, "" );
-      if (this.nodeType == 1) this.removeAttribute( name );
+      if (this.nodeType === 1) this.removeAttribute( name );
     },
 
     addClass: function( classNames ) {
@@ -1578,7 +1597,7 @@ SC.CoreQuery = (function() {
   
   // Setup width and height functions
   CQ.each([ "Height", "Width" ], function(i, name){
-    var type = name.toLowerCase();
+    var type = name.toLowerCase(), ret;
 
     CQ.fn[ type ] = function( size ) {
       
@@ -1611,7 +1630,7 @@ SC.CoreQuery = (function() {
           
       // get/set element width/or height
       } else {
-        if (size == undefined) {
+        if (size === undefined) {
           return this.length ? CQ.css(this[0], type) : null ;
 
           // Set the width or height on the element (default to pixels if value is unitless)
@@ -1666,7 +1685,7 @@ SC.CoreQuery = (function() {
         doc          = elem.ownerDocument,
         safari2      = br.safari && parseInt(br.version,0) < 522 && !(/adobeair/i).test(br.userAgent),
         css          = CQ.curCSS,
-        fixed        = CQ.css(elem, "position") == "fixed";
+        fixed        = CQ.css(elem, "position") === "fixed";
 
     // Use getBoundingClientRect if available
     if (!(br.mozilla && elem==document.body) && elem.getBoundingClientRect){
@@ -1703,7 +1722,7 @@ SC.CoreQuery = (function() {
 
         // Add the document scroll offsets if position is fixed on any 
         // offsetParent
-        if (!fixed && css(offsetParent, "position") == "fixed") fixed = true;
+        if (!fixed && css(offsetParent, "position") === "fixed") fixed = true;
 
         // Set offsetChild to previous offsetParent unless it is the body 
         // element
@@ -1713,7 +1732,7 @@ SC.CoreQuery = (function() {
       }
 
       // Get parent scroll offsets
-      while ( parent && parent.tagName && !(/^body|html$/i).test(parent.tagName)) {
+      while ( parent && parent.tagName && !(bodyHTMLOffsetRegEx).test(parent.tagName)) {
         
         // Remove parent scroll UNLESS that parent is inline or a table to 
         // work around Opera inline/table scrollLeft/Top bug
@@ -1724,7 +1743,7 @@ SC.CoreQuery = (function() {
 
         // Mozilla does not add the border for a parent that has overflow != 
         // visible
-        if ( br.mozilla && css(parent, "overflow") != "visible" ) border(parent);
+        if ( br.mozilla && css(parent, "overflow") !== "visible" ) border(parent);
 
         // Get next parent
         parent = parent.parentNode;
@@ -1734,8 +1753,8 @@ SC.CoreQuery = (function() {
       // element/offsetParent or absolutely positioned offsetChild
       // Mozilla doubles body offsets with a non-absolutely positioned 
       // offsetChild
-      if ((safari2 && (fixed || css(offsetChild, "position") == "absolute"))||
-        (br.mozilla && css(offsetChild, "position") != "absolute") ) {
+      if ((safari2 && (fixed || css(offsetChild, "position") === "absolute"))||
+        (br.mozilla && css(offsetChild, "position") !== "absolute") ) {
           add( -doc.body.offsetLeft, -doc.body.offsetTop );
         }
 
@@ -1762,7 +1781,7 @@ SC.CoreQuery = (function() {
 
         // Get correct offsets
         offset       = this.offset(),
-        parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+        parentOffset = bodyHTMLOffsetRegEx.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
 
         // Subtract element margins
         // note: when an element has margin: auto the offsetLeft and marginLeft 
@@ -1786,7 +1805,7 @@ SC.CoreQuery = (function() {
 
     offsetParent: function() {
       var offsetParent = this[0].offsetParent || document.body;
-      while ( offsetParent && (!(/^body|html$/i).test(offsetParent.tagName) && CQ.css(offsetParent, 'position') == 'static') ) {
+      while ( offsetParent && (!(bodyHTMLOffsetRegEx).test(offsetParent.tagName) && CQ.css(offsetParent, 'position') === 'static') ) {
         offsetParent = offsetParent.offsetParent;
       }
       return CQ(offsetParent);
@@ -1801,7 +1820,7 @@ SC.CoreQuery = (function() {
     CQ.fn[ method ] = function(val) {
       if (!this[0]) return;
 
-      return val != undefined ?
+      return val !== undefined ?
 
         // Set the scroll offset
         this.each(function() {
@@ -1839,7 +1858,7 @@ SC.mixin(SC.$.fn, /** @scope SC.CoreQuery.prototype */ {
     var values = [];
     var len = this.length, idx=0;
     for(idx=0;idx<len;idx++) {
-      values[idx] = '%@: %@'.fmt(idx,(this[idx]) ? this[idx].toString() : '(null)');
+      values[idx] = '%@: %@'.fmt(idx, this[idx] ? this[idx].toString() : '(null)');
     }
     return "<$:%@>(%@)".fmt(SC.guidFor(this),values.join(' , '));  
   },
@@ -2002,11 +2021,12 @@ SC.mixin(SC.$.fn, /** @scope SC.CoreQuery.prototype */ {
   // loop through an update some enumerable methods.  If this is CoreQuery,
   // we just need to patch up the wrapped methods.  If this is jQuery, we
   // need to go through the entire set of SC.Enumerable.
-  var isCoreQuery = SC.$.jquery === 'SC.CoreQuery';
-  var fn = SC.$.fn, enumerable = isCoreQuery ? wrappers : SC.Enumerable ;
+  var isCoreQuery = SC.$.jquery === 'SC.CoreQuery',
+      fn = SC.$.fn, enumerable = isCoreQuery ? wrappers : SC.Enumerable ,
+      value;
   for(var key in enumerable) {
     if (!enumerable.hasOwnProperty(key)) continue ;
-    var value = enumerable[key];
+    value = enumerable[key];
     if (key in wrappers) {
       original[key] = fn[key]; value = wrappers[key];
     }