sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffer.js

@@ -342,7 +342,7 @@ jQuery.Buffer = (function() {
     if (typeof value === "string") value = value.split(' ');
     
     var idx, len = value.length;
-    for (idx = 0; idx < len; idx++) context.classNames[value[idx].trim()] = true;
+    for (idx = 0; idx < len; idx++) context.classNames[jQuery.trim(value[idx])] = true;
   };
 
   Buffer.prototype.removeClass = function(value) {

data/lib/frameworks/sproutcore/frameworks/media/views/audio.js

@@ -433,7 +433,7 @@ SC.AudioView = SC.View.extend({
       media.GetVolume(); 
       // add media.GetTimeScale(); ?
     }catch(e){
-      console.log('loaded fail trying later');
+      SC.Logger.log('loaded fail trying later');
       this.invokeLater(this.didAppendToDocument, 100);
       return;
     }
@@ -560,7 +560,7 @@ SC.AudioView = SC.View.extend({
   */
   startSeek: function(){
     if(!this.get('paused')) {
-      console.log('startseetk');
+      SC.Logger.log('startseetk');
       this.stop();
       this._wasPlaying = true;
     }
@@ -574,7 +574,7 @@ SC.AudioView = SC.View.extend({
   */
   endSeek: function(){
     if(this._wasPlaying) {
-      console.log('startseetk');
+      SC.Logger.log('startseetk');
       this.play();
       this._wasPlaying = false;
     }
@@ -715,7 +715,7 @@ SC.AudioView.updateProperty = function(scid, property, value) {
   Function to log events coming from flash.
 */
 SC.AudioView.logFlash = function(message) {
-  console.log("FLASHLOG: "+message);
+  SC.Logger.log("FLASHLOG: "+message);
 } ;
 
 

data/lib/frameworks/sproutcore/frameworks/media/views/video.js

@@ -476,7 +476,7 @@ SC.VideoView = SC.View.extend({
     try{
       vid.GetVolume();
     }catch(e){
-      console.log('loaded fail trying later');
+      SC.Logger.log('loaded fail trying later');
       this.invokeLater(this.didAppendToDocument, 100);
       return;
     }
@@ -629,7 +629,7 @@ SC.VideoView = SC.View.extend({
   */
   startSeek: function(){
     if(!this.get('paused')) {
-      console.log('startseetk');
+      SC.Logger.log('startseetk');
       this.stop();
       this._wasPlaying = true;
     }
@@ -643,7 +643,7 @@ SC.VideoView = SC.View.extend({
   */
   endSeek: function(){
     if(this._wasPlaying) {
-      console.log('startseetk');
+      SC.Logger.log('startseetk');
       this.play();
       this._wasPlaying = false;
     }
@@ -674,7 +674,7 @@ SC.VideoView = SC.View.extend({
       if(this.loaded==="flash") vid.playVideo();
       this.set('paused', NO);
     }catch(e){
-      console.warn('The video cannot play!!!! It might still be loading the plugging');
+      SC.Logger.warn('The video cannot play!!!! It might still be loading the plugging');
     }
   },
   
@@ -800,7 +800,7 @@ SC.VideoView.updateProperty = function(scid, property, value) {
   Function to log events coming from flash.
 */
 SC.VideoView.logFlash = function(message) {
-  console.log("FLASHLOG: "+message);
+  SC.Logger.log("FLASHLOG: "+message);
 } ;
 
 

data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array.js

@@ -0,0 +1,14 @@
+// Convenience file for requiring all of the ArraySuite
+
+sc_require('debug/test_suites/array/base');
+sc_require('debug/test_suites/array/indexOf');
+sc_require('debug/test_suites/array/insertAt');
+sc_require('debug/test_suites/array/objectAt');
+sc_require('debug/test_suites/array/popObject');
+sc_require('debug/test_suites/array/pushObject');
+sc_require('debug/test_suites/array/rangeObserver');
+sc_require('debug/test_suites/array/removeAt');
+sc_require('debug/test_suites/array/removeObject');
+sc_require('debug/test_suites/array/replace');
+sc_require('debug/test_suites/array/shiftObject');
+sc_require('debug/test_suites/array/unshiftObject');

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js

@@ -978,7 +978,7 @@ SC.Reducers = /** @lends SC.Enumerable */ {
   */
   reducedProperty: function(key, value, generateProperty) {
 
-    if (!key || key.charAt(0) !== '@') return undefined ; // not a reduced property
+    if (!key || typeof key !== SC.T_STRING || key.charAt(0) !== '@') return undefined ; // not a reduced property
 
     // get the reducer key and the reducer
     var matches = key.match(/^@([^(]*)(\(([^)]*)\))?$/) ;

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -11,7 +11,7 @@ sc_require('private/chain_observer');
 /*globals logChange */
 
 /**
-  Set to YES to have all observing activity logged to the console.  This
+  Set to YES to have all observing activity logged to the SC.Logger.  This
   should be used for debugging only.
 
   @property {Boolean}
@@ -471,7 +471,7 @@ SC.Observable = {
       changes.add(key) ;
 
       if (suspended) {
-        if (log) console.log("%@%@: will not notify observers because observing is suspended".fmt(SC.KVO_SPACES,this));
+        if (log) SC.Logger.log("%@%@: will not notify observers because observing is suspended".fmt(SC.KVO_SPACES,this));
         SC.Observers.objectHasPendingChanges(this) ;
       }
 
@@ -932,7 +932,7 @@ SC.Observable = {
 
     if (log) {
       spaces = SC.KVO_SPACES = (SC.KVO_SPACES || '') + '  ';
-      console.log('%@%@: notifying observers after change to key "%@"'.fmt(spaces, this, key));
+      SC.Logger.log('%@%@: notifying observers after change to key "%@"'.fmt(spaces, this, key));
     }
 
     // Get any starObservers -- they will be notified of all changes.
@@ -974,7 +974,7 @@ SC.Observable = {
           // value is a cacheable property, clear the cached value...
           if (keys && (loc = keys.length)) {
             if (log) {
-              console.log("%@...including dependent keys for %@: %@".fmt(spaces, key, keys));
+              SC.Logger.log("%@...including dependent keys for %@: %@".fmt(spaces, key, keys));
             }
             cache = this._kvo_cache;
             if (!cache) cache = this._kvo_cache = {};
@@ -1013,14 +1013,14 @@ SC.Observable = {
 
             if (member[3] === rev) continue ; // skip notified items.
 
-            if(!member[1]) console.log(member);
+            if(!member[1]) SC.Logger.log(member);
 
             target = member[0] || this;
             method = member[1] ;
             context = member[2];
             member[3] = rev;
 
-            if (log) console.log('%@...firing observer on %@ for key "%@"'.fmt(spaces, target, key));
+            if (log) SC.Logger.log('%@...firing observer on %@ for key "%@"'.fmt(spaces, target, key));
             if (context !== undefined) {
               method.call(target, this, key, null, context, rev);
             } else {
@@ -1041,7 +1041,7 @@ SC.Observable = {
             member = members[memberLoc];
             method = this[member] ; // try to find observer function
             if (method) {
-              if (log) console.log('%@...firing local observer %@.%@ for key "%@"'.fmt(spaces, this, member, key));
+              if (log) SC.Logger.log('%@...firing local observer %@.%@ for key "%@"'.fmt(spaces, this, member, key));
               method.call(this, this, key, null, rev);
             }
           }
@@ -1059,7 +1059,7 @@ SC.Observable = {
             method = member[1] ;
             context = member[2] ;
 
-            if (log) console.log('%@...firing * observer on %@ for key "%@"'.fmt(spaces, target, key));
+            if (log) SC.Logger.log('%@...firing * observer on %@ for key "%@"'.fmt(spaces, target, key));
             if (context !== undefined) {
               method.call(target, this, key, null, context, rev);
             } else {
@@ -1070,7 +1070,7 @@ SC.Observable = {
 
         // if there is a default property observer, call that also
         if (this.propertyObserver) {
-          if (log) console.log('%@...firing %@.propertyObserver for key "%@"'.fmt(spaces, this, key));
+          if (log) SC.Logger.log('%@...firing %@.propertyObserver for key "%@"'.fmt(spaces, this, key));
           this.propertyObserver(this, key, null, rev);
         }
       } // while(changes.length>0)
@@ -1227,7 +1227,7 @@ SC.Observable = {
   getPath: function(path) {
     var tuple = SC.tupleForPropertyPath(path, this) ;
     if (tuple === null || tuple[0] === null) return undefined ;
-    return tuple[0].get(tuple[1]) ;
+    return SC.get(tuple[0], tuple[1]) ;
   },
 
   /**
@@ -1366,7 +1366,7 @@ SC.Observable = {
   removeProbe: function(key) { this.removeObserver(key,SC.logChange); },
 
   /**
-    Logs the named properties to the console.
+    Logs the named properties to the SC.Logger.
 
     @param {String...} propertyNames one or more property names
   */
@@ -1375,7 +1375,7 @@ SC.Observable = {
         prop, propsLen, idx;
     for(idx=0, propsLen = props.length; idx<propsLen; idx++) {
       prop = props[idx] ;
-      console.log('%@:%@: '.fmt(SC.guidFor(this), prop), this.get(prop)) ;
+      SC.Logger.log('%@:%@: '.fmt(SC.guidFor(this), prop), this.get(prop)) ;
     }
   },
 
@@ -1385,7 +1385,7 @@ SC.Observable = {
 
 /** @private used by addProbe/removeProbe */
 SC.logChange = function logChange(target, key, value) {
-  console.log("CHANGE: %@[%@] => %@".fmt(target, key, target.get(key)));
+  SC.Logger.log("CHANGE: %@[%@] => %@".fmt(target, key, target.get(key)));
 };
 
 /**

data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js

@@ -562,7 +562,7 @@ SC.Binding = {
 
     // loop through the changed queue...
     while ((queue = this._changeQueue).length > 0) {
-      if (log) console.log("Begin: Trigger changed bindings") ;
+      if (log) SC.Logger.log("Begin: Trigger changed bindings") ;
 
       didFlush = YES ;
 
@@ -579,7 +579,7 @@ SC.Binding = {
       // now loop back and see if there are additional changes pending in the
       // active queue.  Repeat this until all bindings that need to trigger
       // have triggered.
-      if (log) console.log("End: Trigger changed bindings") ;
+      if (log) SC.Logger.log("End: Trigger changed bindings") ;
     }
 
     // clean up
@@ -608,7 +608,7 @@ SC.Binding = {
     // the from property value will always be the binding value, update if
     // needed.
     if (!this._oneWay && this._fromTarget) {
-      if (log) console.log("%@: %@ -> %@".fmt(this, v, tv)) ;
+      if (log) SC.Logger.log("%@: %@ -> %@".fmt(this, v, tv)) ;
       if (bench) SC.Benchmark.start(this.toString() + "->") ;
       this._fromTarget.setPathIfChanged(this._fromPropertyKey, v) ;
       if (bench) SC.Benchmark.end(this.toString() + "->") ;
@@ -616,7 +616,7 @@ SC.Binding = {
 
     // update the to value with the transformed value if needed.
     if (this._toTarget) {
-      if (log) console.log("%@: %@ <- %@".fmt(this, v, tv)) ;
+      if (log) SC.Logger.log("%@: %@ <- %@".fmt(this, v, tv)) ;
       if (bench) SC.Benchmark.start(this.toString() + "<-") ;
       this._toTarget.setPathIfChanged(this._toPropertyKey, tv) ;
       if (bench) SC.Benchmark.start(this.toString() + "<-") ;

data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js

@@ -52,7 +52,7 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
   beginRunLoop: function() {
     this._start = new Date().getTime() ; // can't use Date.now() in runtime
     if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
-      console.log("-- SC.RunLoop.beginRunLoop at %@".fmt(this._start));
+      SC.Logger.log("-- SC.RunLoop.beginRunLoop at %@".fmt(this._start));
     }
     this._runLoopInProgress = YES;
     return this ;
@@ -83,7 +83,7 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     // out completely.
 
     if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
-      console.log("-- SC.RunLoop.endRunLoop ~ flushing application queues");
+      SC.Logger.log("-- SC.RunLoop.endRunLoop ~ flushing application queues");
     } 
     
     this.flushAllPending();
@@ -91,7 +91,7 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     this._start = null ;
 
     if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
-      console.log("-- SC.RunLoop.endRunLoop ~ End");
+      SC.Logger.log("-- SC.RunLoop.endRunLoop ~ End");
     }
 
     SC.RunLoop.lastRunLoopEnd = Date.now();

data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js

@@ -11,7 +11,7 @@
 // BUILT-IN ARRAY
 // 
 
-sc_require('debug/test_suites/array/base');
+sc_require('debug/test_suites/array');
 
 SC.ArraySuite.generate("built-in Array");
 

data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js

@@ -370,6 +370,21 @@ CoreTest.Plan = {
       
     });
   },
+
+  clearHtmlbody: function(){
+    var body = Q$('body')[0];
+
+    // first, find the first element with id 'htmlbody-begin'  if exists,
+    // remove everything after that to reset...
+    var begin = Q$('body #htmlbody-begin')[0];
+    if (!begin) {
+      begin = Q$('<div id="htmlbody-begin"></div>')[0];
+      body.appendChild(begin);
+    } else {
+      while(begin.nextSibling) body.removeChild(begin.nextSibling);
+    }
+    begin = null;
+  },
   
   /**
     Converts the passed string into HTML and then appends it to the main body 
@@ -377,24 +392,13 @@ CoreTest.Plan = {
     main page.
   */
   htmlbody: function htmlbody(string) {
-    this.synchronize(function() {
-      var html = Q$(string) ;
-      var body = Q$('body')[0];
-
-      // first, find the first element with id 'htmlbody-begin'  if exists,
-      // remove everything after that to reset...
-      var begin = Q$('body #htmlbody-begin')[0];
-      if (!begin) {
-        begin = Q$('<div id="htmlbody-begin"></div>')[0];
-        body.appendChild(begin);
-      } else {
-        while(begin.nextSibling) body.removeChild(begin.nextSibling);
-      }
-      begin = null; 
+    var html = Q$(string) ;
+    var body = Q$('body')[0];
+
+    this.clearHtmlbody();
 
-      // now append new content
-      html.each(function() { body.appendChild(this); });
-    }) ;
+    // now append new content
+    html.each(function() { body.appendChild(this); });
   },
   
   /**
@@ -690,6 +694,10 @@ window.test = function(desc, func) {
 }; 
 
 // reset htmlbody for unit testing
+window.clearHtmlbody = function() {
+  CoreTest.defaultPlan().clearHtmlbody(); 
+}; 
+
 window.htmlbody = function(string) {
   CoreTest.defaultPlan().htmlbody(string); 
 }; 

data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/18px/button.css

@@ -1,27 +1,33 @@
 @theme(sc-small-size) {
-  
+
   $theme.button {
-    
+
     .sc-button-label {
       font-size: 11px;
       margin-top:-4px;
       height: 18px;
       padding-top:2px;
     }
-    
+
     @include slices("normal_button.png", $left: 3, $right: 3);
-    
+
     &.active {
-      @include slices("active_button.png", $left: 3, $right: 3);    
+      @include slices("active_button.png", $left: 3, $right: 3);
     }
-  
+
     &.sel, &.def {
-      @include slices("selected_button.png", $left: 3, $right: 3);    
-  
-      &.sel.active, &.def.active {
-        @include slices("selected_active_button.png", $left: 3, $right: 3);    
-      }
+      @include slices("selected_button.png", $left: 3, $right: 3);
+
+    }
+
+    &.sel.active, &.def.active {
+      @include slices("selected_active_button.png", $left: 3, $right: 3);
+    }
+    
+    &.sc-static-layout .sc-button-label {
+      margin-left: 3px;
+      margin-right: 3px;
     }
   }
-  
+
 }

data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/24px/button.css

@@ -1,83 +1,97 @@
 @theme(sc-regular-size) {
-  
+
   $theme.button {
-    
+
     .sc-button-label {
       height: 24px;
       padding-top:2px;
     }
-    
+
     @include slices("normal_button.png", $left: 3, $right: 3);
-    
+
     &.active {
-      @include slices("active_button.png", $left: 3, $right: 3);    
+      @include slices("active_button.png", $left: 3, $right: 3);
     }
-  
+
     &.sel, &.def {
-      @include slices("selected_button.png", $left: 3, $right: 3);    
-  
-      &.sel.active, &.def.active {
-        @include slices("selected_active_button.png", $left: 3, $right: 3);    
-      }
+      @include slices("selected_button.png", $left: 3, $right: 3);
+    }
+
+    &.sel.active, &.def.active {
+      @include slices("selected_active_button.png", $left: 3, $right: 3);
+    }
+    
+    &.sc-static-layout .sc-button-label {
+      margin-left: 12px;
+      margin-right: 12px;
     }
   }
 
   @theme(point-left) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
-      
+
       .middle { left: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
     }
   }
-  
+
   @theme(point-right) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
-      
+
       .middle { right: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
     }
   }
-  
+
   @theme(capsule) {
     $theme.button {
       @include slices("normal_button_capsule.png", $left: 12, $right: 12, skip-middle);
-      
+
       .middle { left: 12px; right: 12px; }
 
       &.active {
         @include slices("active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
     }
   }