sproutcore 1.0.1049.pre.2 → 1.4.0.rc

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

@@ -268,71 +268,75 @@ SC.AudioView = SC.View.extend({
     audioElem = this.$('audio')[0];
     this.set('audioObject', audioElem);
     SC.Event.add(audioElem, 'durationchange', this, function () {
-      SC.RunLoop.begin();
-      console.log('durationchange');
-      view.set('duration', audioElem.duration);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('duration', audioElem.duration);
+      });
     }) ;
+
     SC.Event.add(audioElem, 'timeupdate', this, function () {
-      SC.RunLoop.begin();
-      console.log('currenttime');
-      view.set('currentTime', audioElem.currentTime);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('currentTime', audioElem.currentTime);
+      });
     }) ;
+
     SC.Event.add(audioElem, 'loadstart', this, function () {
-      SC.RunLoop.begin();
-      console.log('volume');
-      view.set('volume', audioElem.volume);
-      SC.RunLoop.end();
-    });     
+      SC.run(function() {
+        view.set('volume', audioElem.volume);        
+      });
+    });
+
     SC.Event.add(audioElem, 'play', this, function () {
-      SC.RunLoop.begin();
-      view.set('paused', NO);
-      SC.RunLoop.end();
-    });     
+      SC.run(function() {
+        view.set('paused', NO);        
+      });
+    });
+
     SC.Event.add(audioElem, 'pause', this, function () {
-      SC.RunLoop.begin();
-      view.set('paused', YES);
-      SC.RunLoop.end();
-    });     
+      SC.run(function() {
+        view.set('paused', YES);        
+      });
+    });
+ 
     SC.Event.add(audioElem, 'loadedmetadata', this, function () {
-      SC.RunLoop.begin();
-      // view.set('audioWidth', audioElem.audioWidth);
-      //       view.set('audioHeight', audioElem.audioHeight);
-      SC.RunLoop.end();
-    });     
+      SC.run(function() {
+        // view.set('audioWidth', audioElem.audioWidth);
+        // view.set('audioHeight', audioElem.audioHeight);
+      });
+    });    
        
     SC.Event.add(audioElem, 'canplay', this, function () {
-      SC.RunLoop.begin();
-      console.log('canplay');
-      view.set('canPlay', YES);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('canPlay', YES);        
+      });
     });     
-         
+
     SC.Event.add(audioElem, 'ended', this, function () {
-      SC.RunLoop.begin();
-      view.set('ended', YES);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('ended', YES);        
+      });
     });
+
     SC.Event.add(audioElem, 'progress', this, function (e) {
-      SC.RunLoop.begin();
-      this.loadedTimeRanges=[];
-      for (var j=0, jLen = audioElem.seekable.length; j<jLen; j++){
-        this.loadedTimeRanges.push(audioElem.seekable.start(j));
-        this.loadedTimeRanges.push(audioElem.seekable.end(j));
-      }
-       try{
+      SC.run(function() {
+        this.loadedTimeRanges=[];
+        for (var j=0, jLen = audioElem.seekable.length; j<jLen; j++){
+          this.loadedTimeRanges.push(audioElem.seekable.start(j));
+          this.loadedTimeRanges.push(audioElem.seekable.end(j));
+        }
+
+        try {
           var trackCount=view.GetTrackCount(),i;
-          for(i=1; i<=trackCount;i++){
-            if("Closed Caption"===this.GetTrackType(i)){
+          for (i=1; i<=trackCount;i++){
+            if ("Closed Caption"===this.GetTrackType(i)){
               view._closedCaptionTrackIndex=i;
             }
           }
-        }catch(f){}
+        } catch (f) {}
+      }, this);
+
       //view.set('loadedData', ev.loaded);
       //console.log('progress '+ev.loaded+","+ev.total );
-      SC.RunLoop.end();
-    });     
+    });
          
     // SC.Event.add(audioElem, 'suspend', this, function () {
     //       SC.RunLoop.begin();
@@ -434,43 +438,47 @@ SC.AudioView = SC.View.extend({
     view.set('volume', media.GetVolume()/256);
     
     SC.Event.add(audioElem, 'qt_durationchange', this, function () {
-      SC.RunLoop.begin();
-      console.log('qtdurationchange');
-      view.set('duration', media.GetDuration()/media.GetTimeScale());
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('duration', media.GetDuration()/media.GetTimeScale());
+      });
     });
+    
     SC.Event.add(audioElem, 'qt_begin', this, function () {
-      SC.RunLoop.begin();
-      console.log('qtbegin');
-      view.set('volume', media.GetVolume()/256);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('volume', media.GetVolume()/256);        
+      });
     });
+    
     SC.Event.add(audioElem, 'qt_loadedmetadata', this, function () {
-      SC.RunLoop.begin();
-      console.log('qtloadedmetadata');
-      view.set('duration', media.GetDuration()/media.GetTimeScale());
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('duration', media.GetDuration()/media.GetTimeScale());        
+      });
     });
+    
     SC.Event.add(audioElem, 'qt_canplay', this, function () {
-      SC.RunLoop.begin();
-      console.log('qtcanplay');
-      view.set('canPlay', YES);
-      SC.RunLoop.end();
+      SC.run(function() {
+        view.set('canPlay', YES);        
+      });
     });
     
     SC.Event.add(audioElem, 'qt_ended', this, function () {
-      console.log('qtended');
-      view.set('ended', YES);
+      SC.run(function() {
+        view.set('ended', YES);        
+      });
     });
+
     SC.Event.add(audioElem, 'qt_pause', this, function () {
-      SC.RunLoop.begin();
-      view.set('currentTime', media.GetTime()/media.GetTimeScale());
-      view.set('paused', YES);
+      SC.run(function() {
+        view.set('currentTime', media.GetTime()/media.GetTimeScale());
+        view.set('paused', YES);
+      });
     });
+
     SC.Event.add(audioElem, 'qt_play', this, function () {
-      SC.RunLoop.begin();
-      view.set('currentTime', media.GetTime()/media.GetTimeScale());
-      view.set('paused', NO);
+      SC.run(function() {
+        view.set('currentTime', media.GetTime()/media.GetTimeScale());
+        view.set('paused', NO);
+      });
     });
     // SC.Event.add(audioElem, 'qt_loadedfirstframe', this, function () {
     //       console.log('qt_loadedfirstframe');
@@ -692,10 +700,9 @@ SC.AudioView.addToAudioFlashViews = function(view) {
 SC.AudioView.updateProperty = function(scid, property, value) {
   var view = SC.AudioView.flashViews[scid];
   if(view){
-    SC.RunLoop.begin();
-    //console.log("setting property from flash"+property+","+value);
-    view.set(property, value);
-    SC.RunLoop.end();
+    SC.run(function() {
+      view.set(property, value);
+    });
   }
 } ;
 

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

@@ -41,7 +41,7 @@ SC.MediaControlsView = SC.View.extend({
     action: "playPause",
     targetBinding: "*owner.target",
     renderStyle: 'renderImage',
-    controlStyle: ''
+    theme: ''
   }),
   progressView: SC.mediaSlider.design({
     layout: { top: 0, left: 20, right: 220, height:20},
@@ -63,7 +63,7 @@ SC.MediaControlsView = SC.View.extend({
     title: '',
     icon: 'theater',
     renderStyle: 'renderImage',
-    controlStyle: '',
+    theme: '',
     titleMinWidth: 35,
     layout: { top: 0, right: 140, width: 20, height:20},
     action: "fullScreen",

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

@@ -38,7 +38,7 @@ SC.MiniMediaControlsView = SC.View.extend({
     action: "playPause",
     targetBinding: "*owner.target",
     renderStyle: 'renderImage',
-    controlStyle: ''
+    theme: ''
   }),
   
   timeView: SC.LabelView.design({

data/lib/frameworks/sproutcore/frameworks/mobile/tests/views/button/ui.js

@@ -5,12 +5,5 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/** @class
-  @extends SC.Theme
-  @since SproutCore 1.1
-*/
-SC.EmptyTheme = SC.Theme.extend({
-  classNames: ["sc-empty"]
-});
+/*global module test htmlbody ok equals same stop start */
 
-SC.Theme.register("sc-empty", SC.EmptyTheme);

data/lib/frameworks/sproutcore/frameworks/mobile/views/button.js

@@ -30,7 +30,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button,
     
     The default SproutCore theme supports "regular", "checkbox", and "radio"
   */
-  controlStyle: 'square',
+  theme: 'square',
   
   /**
     The button href value.  This can be used to create localized button href values.  Setting an empty or null href will set it to javascript:;

data/lib/frameworks/sproutcore/frameworks/runtime/core.js

@@ -6,13 +6,11 @@
 // ==========================================================================
 
 /*global NodeList */
-
 // These commands are used by the build tools to control load order.  On the
 // client side these are a no-op.
 var require = require || function require() { } ;
 var sc_require = sc_require || require;
 var sc_resource = sc_resource || function sc_resource() {};
-
 sc_require('license') ;
 
 // ........................................
@@ -249,9 +247,9 @@ SC.mixin(/** @scope SC */ {
   */
   isArray: function(obj) {
     if (obj && obj.objectAt) return YES ; // fast path
-
-    var len = (obj ? obj.length : null), type = SC.typeOf(obj);
-    return !(SC.none(len) || (type === SC.T_FUNCTION) || (type === SC.T_STRING) || obj.setInterval) ;
+    
+    var len = (obj ? obj.length : null), type = typeof obj;
+    return !((len === undefined) || (len === null) || (obj instanceof Function) || (type === "string") || obj.setInterval);
   },
 
   /**
@@ -276,7 +274,7 @@ SC.mixin(/** @scope SC */ {
   */
   A: function(obj) {
     // null or undefined -- fast path
-    if (SC.none(obj)) return [] ;
+    if (obj === null || obj === undefined) return [] ;
     
     // primitive -- fast path
     if (obj.slice instanceof Function) {
@@ -319,19 +317,38 @@ SC.mixin(/** @scope SC */ {
   guidFor: function(obj) {
     
     // special cases where we don't want to add a key to object
-    if (obj === undefined) return "(undefined)" ;
-    if (obj === null) return '(null)' ;
+    if (obj === undefined) return "(undefined)";
+    if (obj === null) return '(null)';
+
+    var guidKey = this.guidKey;
+    if (obj[guidKey]) return obj[guidKey];
+
+    // More special cases; not as common, so we check for them after the cache
+    // lookup
     if (obj === Object) return '(Object)';
     if (obj === Array) return '(Array)';
-    
-    var guidKey = this.guidKey ;
-    if (obj[guidKey]) return obj[guidKey] ;
+
+    var cache, ret;
 
     switch(typeof obj) {
       case SC.T_NUMBER:
-        return (this._numberGuids[obj] = this._numberGuids[obj] || ("nu" + obj));
+        cache = this._numberGuids;
+        ret   = cache[obj];
+        if (!ret) {
+          ret = "nu" + obj;
+          cache[obj] = ret;
+        }
+        return ret;
+
       case SC.T_STRING:
-        return (this._stringGuids[obj] = this._stringGuids[obj] || ("st" + obj));
+        cache = this._stringGuids;
+        ret   = cache[obj];
+        if (!ret) {
+          ret = "st" + obj;
+          cache[obj] = ret;
+        }
+        return ret;
+
       case SC.T_BOOL:
         return (obj) ? "(true)" : "(false)" ;
       default:
@@ -371,25 +388,37 @@ SC.mixin(/** @scope SC */ {
   },
 
   /**
-    Returns a unique hash code for the object.  If the object implements
-    a hash() method, the value of that method will be returned.  Otherwise,
-    this will return the same value as guidFor().  
+    Returns a unique hash code for the object. If the object implements
+    a hash() method, the value of that method will be returned. Otherwise,
+    this will return the same value as guidFor().
+    
+    If you pass multiple arguments, hashFor returns a string obtained by 
+    concatenating the hash code of each argument.
 
     Unlike guidFor(), this method allows you to implement logic in your 
     code to cause two separate instances of the same object to be treated as
     if they were equal for comparisons and other functions.
 
-    IMPORTANT:  If you implement a hash() method, it MUST NOT return a 
-    number or a string that contains only a number.  Typically hash codes 
+    IMPORTANT: If you implement a hash() method, it MUST NOT return a 
+    number or a string that contains only a number. Typically hash codes 
     are strings that begin with a "%".
 
-    @param obj {Object} the object
+    @param obj {Object} the object(s)
     @returns {String} the hash code for this instance.
   */
-  hashFor: function(obj) {
-    return (obj && obj.hash && (typeof obj.hash === SC.T_FUNCTION)) ? obj.hash() : this.guidFor(obj) ;
-  },
+  hashFor: function() {
+    var len = arguments.length,
+        h = '',
+        obj, f, i;
     
+    for (i = 0; i < len; ++i) {
+      obj = arguments[i];
+      h += (obj && (f = obj.hash) && (typeof f === SC.T_FUNCTION)) ? f.call(obj) : this.guidFor(obj);
+    }
+    
+    return h === '' ? null : h;
+  },
+  
   /**
     This will compare the two object values using their hash codes.
 
@@ -551,11 +580,11 @@ SC.mixin(/** @scope SC */ {
     @returns {Object} the new object.
   */
   beget: function(obj) {
-    if (SC.none(obj)) return null ;
+    if (obj === null || obj === undefined) return null ;
     var K = SC.K; K.prototype = obj ;
     var ret = new K();
     K.prototype = null ; // avoid leaks
-    if (SC.typeOf(obj.didBeget) === SC.T_FUNCTION) ret = obj.didBeget(ret); 
+    if (typeof obj.didBeget === "function") ret = obj.didBeget(ret); 
     return ret ;
   },
 
@@ -651,7 +680,7 @@ SC.mixin(/** @scope SC */ {
   tupleForPropertyPath: function(path, root) {
 
     // if the passed path is itself a tuple, return it
-    if (SC.typeOf(path) === SC.T_ARRAY) return path ;
+    if (typeof path === "object" && (path instanceof Array)) return path ;
 
     // find the key.  It is the last . or first *
     var key ;

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

@@ -347,17 +347,7 @@ SC.Array = {
   },
   
   rangeObserverClass: SC.RangeObserver,
-
-  /**
-    Returns YES if object is in the array
-
-    @param {Object} object to look for
-    @returns {Boolean}
-  */
-  contains: function(obj){
-    return this.indexOf(obj) >= 0;
-  },
-
+  
   /**
     Creates a new range observer on the receiver.  The target/method callback
     you provide will be invoked anytime any property on the objects in the 

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

@@ -496,7 +496,7 @@ SC.Observable = {
         keys, idx, lim, dep, queue;
 
     // normalize input.
-    if (SC.typeOf(dependentKeys) === SC.T_ARRAY) {
+    if (typeof dependentKeys === "object" && (dependentKeys instanceof Array)) {
       keys = dependentKeys;
       lim  = 0;
     } else {
@@ -670,7 +670,8 @@ SC.Observable = {
       method = target; target = this ;
     }
     if (!target) target = this ;
-    if (SC.typeOf(method) === SC.T_STRING) method = target[method] ;
+    
+    if (typeof method === "string") method = target[method] ;
     if (!method) throw "You must pass a method to addObserver()" ;
 
     // Normalize key...
@@ -722,7 +723,8 @@ SC.Observable = {
       method = target; target = this ;
     }
     if (!target) target = this ;
-    if (SC.typeOf(method) === SC.T_STRING) method = target[method] ;
+    
+    if (typeof method === "string") method = target[method] ;
     if (!method) throw "You must pass a method to removeObserver()" ;
 
     // if the key contains a '.', this is a chained observer.
@@ -1079,8 +1081,9 @@ SC.Observable = {
 
     // if a string or array (i.e. tuple) is passed, convert this into a
     // binding.  If a binding default was provided, use that.
-    pathType = SC.typeOf(target) ;
-    if (pathType === SC.T_STRING || pathType === SC.T_ARRAY) {
+    pathType = typeof target;
+    
+    if (pathType === "string" || (pathType === "object" && (target instanceof Array))) {
       binding = this[toKey + 'BindingDefault'] || SC.Binding;
       binding = binding.beget().from(target) ;
     } else binding = target ;