sproutcore 1.4.5 → 1.5.0.pre.3

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

@@ -0,0 +1,53 @@
+SC.StaticQueue = SC.mixin({},
+{
+  _content: null,
+  
+  create: function(max) {
+    var ret = SC.beget(this);
+    ret._content = [];
+    ret._content.length = max;
+    
+    return ret;
+  },
+  
+  enqueue: function(item) {
+    if(this.length >= this._content.length) {
+      return;
+    }
+    
+    this._content[this._tail++] = item;
+    
+    if(this._tail >= this._content.length) this._tail = 0;
+    
+    this.length++;
+    
+    return this;
+  },
+  
+  dequeue: function() {
+    var ret;
+    
+    if(this.length > 0) {
+      ret = this._content[this._head++];
+    } else {
+      return null;
+    }
+    
+    if(this._head >= this._content.length) this._head = 0;
+    
+    this.length--;
+    
+    return ret;
+  },
+  
+  peek: function(index) {
+    index = index || 0;
+    return this._content[(this._head + index) % this.length];
+  },
+  
+  length: 0,
+  
+  _head: 0,
+  
+  _tail: 0
+});

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

@@ -13,6 +13,16 @@ sc_require("tasks/task");
   bundles while not blocking user interaction.
 */
 SC.TaskQueue = SC.Task.extend({
+  
+  init: function() {
+    var self = this;
+    this._doIdleEntry = function() {
+      self._idleEntry();
+    };
+    
+    this._tasks = [];
+  },
+  
   /**
     If YES, the queue will automatically run in the background when the browser idles.
   */
@@ -40,7 +50,7 @@ SC.TaskQueue = SC.Task.extend({
   */
   minimumIdleDuration: 500,
   
-  _tasks: [],
+  _tasks: null,
   
   /**
     Returns YES if there are tasks in the queue.
@@ -91,11 +101,7 @@ SC.TaskQueue = SC.Task.extend({
   */
   _setupIdle: function() {
     if (this.get('runWhenIdle') && !this._idleIsScheduled && this.get('taskCount') > 0) {
-      var self = this;
-      setTimeout(
-        function(){
-          self._idleEntry();
-        }, 
+      setTimeout(this._doIdleEntry, 
         this.get('interval')
       );
       this._idleIsScheduled = YES;
@@ -109,15 +115,15 @@ SC.TaskQueue = SC.Task.extend({
   _idleEntry: function() {
     this._idleIsScheduled = NO;
     var last = SC.RunLoop.lastRunLoopEnd;
+    
+    // if no recent events (within < 1s)
     if (Date.now() - last > this.get('minimumIdleDuration')) {
-      // if no recent events (within < 1s)
-      this.run();
-    } else {
-      SC.run(function() {
-        this._setupIdle();        
-      }, this);
+      SC.run(this.run, this);
       SC.RunLoop.lastRunLoopEnd = last; // we were never here
     }
+    
+    // set up idle timer if needed
+    this._setupIdle();
   },
   
   /**
@@ -136,9 +142,6 @@ SC.TaskQueue = SC.Task.extend({
       if (Date.now() - start > limit) break;
     }
     
-    // set up idle timer if needed
-    this._setupIdle();
-    
     this.set("isRunning", NO);
   }
   

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

@@ -7,49 +7,49 @@
 /*globals ie7userdata openDatabase*/
 /**
   @class
-  
+
   The UserDefaults object provides an easy way to store user preferences in
   your application on the local machine.  You use this by providing built-in
   defaults using the SC.userDefaults.defaults() method.  You can also
   implement the UserDefaultsDelegate interface to be notified whenever a
-  default is required.  
-  
+  default is required.
+
   You should also set the userDomain property on the defaults on page load.
-  This will allow the UserDefaults application to store/fetch keys from 
+  This will allow the UserDefaults application to store/fetch keys from
   localStorage for the correct user.
-  
-  You can also set an appDomain property if you want.  This will be 
+
+  You can also set an appDomain property if you want.  This will be
   automatically prepended to key names with no slashes in them.
-  
+
   SC.userDefaults.getPath("global:contactInfo.userName");
-  
+
   @extends SC.Object
   @since SproutCore 1.0
 */
 SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
-  
+
   ready: NO,
-  
-  /** 
+
+  /**
     the default domain for the user.  This will be used to store keys in
     local storage.  If you do not set this property, the wrong values may be
     returned.
   */
   userDomain: null,
-  
+
   /**
-    The default app domain for the user.  Any keys that do not include a 
+    The default app domain for the user.  Any keys that do not include a
     slash will be prefixed with this app domain key when getting/setting.
   */
   appDomain: null,
-  
+
   /** @private
     Defaults.  These will be used if not defined on localStorage.
   */
   _defaults: null,
-  
+
   _safari3DB: null,
-  
+
   /**
     Invoke this method to set the builtin defaults.  This will cause all
     properties to change.
@@ -58,26 +58,27 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
     this._defaults = newDefaults ;
     this.allPropertiesDidChange();
   },
-  
+
   /**
-    Attempts to read a user default from local storage.  If not found on 
+    Attempts to read a user default from local storage.  If not found on
     localStorage, use the the local defaults, if defined.  If the key passed
     does not include a slash, then add the appDomain or use "app/".
-    
+
     @param {String} keyName
     @returns {Object} read value
   */
   readDefault: function(keyName) {
-    var ret= undefined, userKeyName, localStorage, key, del, storageSafari3;
+    var ret, userKeyName, localStorage, key, del, storageSafari3;
+
     // namespace keyname
     keyName = this._normalizeKeyName(keyName);
     userKeyName = this._userKeyName(keyName);
 
     // look into recently written values
-    if (this._written) ret = this._written[userKeyName];
-    
+    if (this._written) { ret = this._written[userKeyName]; }
+
     // attempt to read from localStorage
-    
+
     if(SC.browser.msie=="7.0"){
       localStorage=document.body;
       try{
@@ -95,59 +96,54 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
     }
     if (localStorage || storageSafari3) {
       key=["SC.UserDefaults",userKeyName].join('-at-');
-      if(SC.browser.msie=="7.0"){
-        ret=localStorage.getAttribute(key.replace(/\W/gi, ''));        
-      }else if(storageSafari3){
+      if(SC.browser.msie == "7.0") {
+        ret=localStorage.getAttribute(key.replace(/\W/gi, ''));
+      } else if(storageSafari3) {
         ret = this.dataHash[key];
-        
-      }else{
+      } else {
         ret = localStorage[key];
       }
       if (!SC.none(ret)) {
-        try {
-          ret = SC.json.decode(ret);
-        } 
-        catch(ex) {
-          ret = undefined;
-        }
-      } else ret = undefined;
+        try { ret = SC.json.decode(ret); }
+        catch(ex) {}
+      }
     }
-    
+
     // if not found in localStorage, try to notify delegate
-    del =this.delegate ;
+    del = this.delegate ;
     if (del && del.userDefaultsNeedsDefault) {
       ret = del.userDefaultsNeedsDefault(this, keyName, userKeyName);
     }
-    
+
     // if not found in localStorage or delegate, try to find in defaults
     if ((ret===undefined) && this._defaults) {
       ret = this._defaults[userKeyName] || this._defaults[keyName];
     }
-    
+
     return ret ;
   },
-  
+
   /**
     Attempts to write the user default to local storage or at least saves them
     for now.  Also notifies that the value has changed.
-    
+
     @param {String} keyName
     @param {Object} value
     @returns {SC.UserDefault} receiver
   */
   writeDefault: function(keyName, value) {
     var userKeyName, written, localStorage, key, del, storageSafari3;
-    
+
     keyName = this._normalizeKeyName(keyName);
     userKeyName = this._userKeyName(keyName);
-    
+
     // save to local hash
     written = this._written ;
-    if (!written) written = this._written = {};
+    if (!written) { written = this._written = {}; }
     written[userKeyName] = value ;
-    
+
     // save to local storage
-    
+
     if(SC.browser.msie=="7.0"){
       localStorage=document.body;
     }else if(this.HTML5DB_noLocalStorage){
@@ -168,10 +164,10 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
         var obj = this;
         storageSafari3.transaction(
           function (t) {
-            t.executeSql("delete from SCLocalStorage where key = ?", [key], 
+            t.executeSql("delete from SCLocalStorage where key = ?", [key],
               function (){
                 t.executeSql("insert into SCLocalStorage(key, value)"+
-                            " VALUES ('"+key+"', '"+encodedValue+"');", 
+                            " VALUES ('"+key+"', '"+encodedValue+"');",
                             [], obj._nullDataHandler, obj.killTransaction
                 );
               }
@@ -187,33 +183,33 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
         }
       }
     }
-    
+
     // also notify delegate
     del = this.delegate;
     if (del && del.userDefaultsDidChange) {
       del.userDefaultsDidChange(this, keyName, value, userKeyName);
     }
-    
+
     return this ;
   },
-  
+
   /**
     Removed the passed keyName from the written hash and local storage.
-    
+
     @param {String} keyName
     @returns {SC.UserDefaults} receiver
   */
-  resetDefault: function(keyName) {  
+  resetDefault: function(keyName) {
     var fullKeyName, userKeyName, written, localStorage, key, storageSafari3;
     fullKeyName = this._normalizeKeyName(keyName);
     userKeyName = this._userKeyName(fullKeyName);
-    
+
     this.propertyWillChange(keyName);
     this.propertyWillChange(fullKeyName);
-    
+
     written = this._written;
     if (written) delete written[userKeyName];
-    
+
     if(SC.browser.msie=="7.0"){
        localStorage=document.body;
     }else if(this.HTML5DB_noLocalStorage){
@@ -240,19 +236,25 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
         );
         delete this.dataHash[key];
       }else{
-        delete localStorage[key];
+        // In case error occurs while deleting local storage in any browser,
+        // do not allow it to propagate further
+        try{
+          delete localStorage[key];
+        } catch(e) {
+          console.warn('Deleting local storage encountered a problem. '+e);
+        }
       }
     }
-    
+
 
     this.propertyDidChange(keyName);
     this.propertyDidChange(fullKeyName);
     return this ;
   },
-  
+
   /**
     Is called whenever you .get() or .set() values on this object
-    
+
     @param {Object} key
     @param {Object} value
     @returns {Object}
@@ -265,42 +267,42 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
       return value ;
     }
   },
-  
+
   /**
-    Normalize the passed key name.  Used by all accessors to automatically 
+    Normalize the passed key name.  Used by all accessors to automatically
     insert an appName if needed.
   */
   _normalizeKeyName: function(keyName) {
     if (keyName.indexOf(':')<0) {
       var domain = this.get('appDomain') || 'app';
       keyName = [domain, keyName].join(':');
-    } 
+    }
     return keyName;
   },
-  
-  /** 
+
+  /**
     Builds a user key name from the passed key name
   */
   _userKeyName: function(keyName) {
     var user = this.get('userDomain') || '(anonymous)' ;
     return [user,keyName].join('-at-');
   },
-  
+
   _domainDidChange: function() {
     var didChange = NO;
     if (this.get("userDomain") !== this._scud_userDomain) {
       this._scud_userDomain = this.get('userDomain');
       didChange = YES;
     }
-    
+
     if (this.get('appDomain') !== this._scud_appDomain) {
       this._scud_appDomain = this.get('appDomain');
       didChange = YES;
     }
-    
+
     if (didChange) this.allPropertiesDidChange();
   }.observes('userDomain', 'appDomain'),
-  
+
   init: function() {
     sc_super();
     if(SC.userDefaults && SC.userDefaults.get('dataHash')){
@@ -329,9 +331,9 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
               displayName = 'SproutCore database',
               maxSize = 65536; // in bytes,
           myDB = openDatabase(shortName, version, displayName, maxSize);
-    
+
           // You should have a database instance in myDB.
-    
+
         }
       } catch(e) {
         console.error("Trying to load a database with safari version 3.1 "+
@@ -339,21 +341,21 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
                 " previous version or there is a problem with your browser.");
         return;
       }
-    
+
       if(myDB){
         var obj = this;
         myDB.transaction(
           function (transaction) {
             transaction.executeSql('CREATE TABLE IF NOT EXISTS SCLocalStorage'+
-              '(key TEXT NOT NULL PRIMARY KEY, value TEXT NOT NULL);', 
+              '(key TEXT NOT NULL PRIMARY KEY, value TEXT NOT NULL);',
               [], obj._nullDataHandler, obj.killTransaction);
           }
         );
         myDB.transaction(
           function (transaction) {
-            
+
             transaction.parent = obj;
-            transaction.executeSql('SELECT * from SCLocalStorage;', 
+            transaction.executeSql('SELECT * from SCLocalStorage;',
                 [], function(transaction, results){
                   var hash={}, row;
                   for(var i=0, iLen=results.rows.length; i<iLen; i++){
@@ -361,14 +363,14 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
                     hash[row['key']]=row['value'];
                   }
                   transaction.parent.dataHash = hash;
-                  SC.run(function() { SC.userDefaults.set('ready', YES); });
+                  SC.run(function() { jQuery.ready(true); });
                 }, obj.killTransaction);
           }
         );
         this._safari3DB=myDB;
       }
     }else{
-      this.set('ready', YES);
+      jQuery.ready(true);
     }
   },
 
@@ -378,20 +380,10 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
     return true; // fatal transaction error
   },
 
-  _nullDataHandler: function(transaction, results){},
-        
-  readyCallback: function(ob, func){
-    this.func = func;
-    this.ob = ob;
-  },
-  
-  readyChanged: function(){
-    if(this.ready===YES){
-      var f = this.func;
-      if(f) f.apply(this.ob);
-    }
-  }.observes('ready')  
+  _nullDataHandler: function(transaction, results){}
 });
 
+jQuery.readyWait++;
+
 /** global user defaults. */
 SC.userDefaults = SC.UserDefaults.create();