sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/foundation/resources/button_view.css

@@ -4,8 +4,6 @@
   vertical-align: middle;
   text-decoration: none ;
   border: 1px #555 solid;
-  border-radius: 3px;
-  -moz-border-radius: 3px;
   
   &.sc-static-layout {
     margin: 0 4px;

data/lib/frameworks/sproutcore/frameworks/foundation/resources/label.css

@@ -1,8 +1,8 @@
 /* SC.LabelView */
 
 .sc-label-view {
-  font-weight: normal;
   text-align: left;
+  white-space: pre-line;      /* Allow strings to include '\n' characters, etc., like many other UI frameworks */
   
   &.icon {
   	position: relative;
@@ -27,21 +27,17 @@
   
   &.sc-large-size {
   	font-size: 18px;
-  	line-height: 24px;
   }
   
   &.sc-regular-size {
   	font-size: 12px;
-  	line-height: 19px;
   }
   
   &.sc-small-size {
   	font-size: 11px;
-  	line-height: 14px;
   }
   
   &.sc-tiny-size {
   	font-size: 9px;
-  	line-height: 12px;
   }
 }

data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css

@@ -2,7 +2,6 @@
 
 .sc-text-field-view {
   border:none;
-  z-index:100;
   overflow: visible;
   background :white;
   .border {
@@ -54,9 +53,11 @@
     -webkit-appearance:none;
   }
   
-  
   .sc-hint {
-  	z-index: 1;
+    z-index: 1;
+  }  
+  
+  .sc-hint, .hint {
   	position: absolute;
   	top: 3px;
   	left: 1px;
@@ -67,7 +68,8 @@
   	font-size: 12px;
   }
 
-  &.text-area .sc-hint {
+  &.text-area .sc-hint,
+  &.text-area .hint {
   	top: 2px;
   	left: 3px;
   	right: 3px;
@@ -83,7 +85,7 @@
     color: #B3B3B3 !important;
   }
 
-  .safari &{
+  .webkit &{
     &.focus {
       outline: auto 7px -webkit-focus-ring-color; 
       outline-offset: -2px;
@@ -115,11 +117,8 @@
     .border {
       border:1px inset;
     }
-    input.field {
-      padding-bottom: 1px;
-    }
     textarea.field {
     	height: 100%;
     }
-  } 
+  }
 }

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

@@ -12,12 +12,12 @@ sc_require('core') ;
 
   This bit of meta-programming magic can install a benchmark handler on any
   object method.  When a benchmark is installed, the time required to execute
-  the method will be printed to the console log everytime the method is
+  the method will be printed to the console log every time the method is
   called.
 
   This class can be used to implement benchmarking.  To use this object, just
   call start() with a key name and end() with a keyname.  The benchmark will
-  be logged.  If you set verbose = true, then benchmark will log everytime it
+  be logged.  If you set verbose = true, then benchmark will log every time it
   saves a bench.  Otherwise, it just keeps stats.  You can get the stats by
   calling report().
 

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 /*jslint evil:true */
-
+sc_require('tasks/task');
 SC.LOG_MODULE_LOADING = YES;
 
 /**
@@ -50,10 +50,10 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     @returns {Boolean} YES if already loaded, NO otherwise
   */
   loadModule: function(moduleName, target, method) {
-    var module = SC.MODULE_INFO[moduleName], callbacks, targets;
-    var args   = SC.A(arguments).slice(3);
-    var log    = SC.LOG_MODULE_LOADING;
-    var idx, len;
+    var module = SC.MODULE_INFO[moduleName], callbacks, targets,
+        args   = SC.A(arguments).slice(3),
+        log    = SC.LOG_MODULE_LOADING,
+        idx, len;
 
     // Treat the first parameter as the callback if the target is a function and there is
     // no method supplied.
@@ -62,9 +62,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       target = null;
     }
 
-    if (log) {
-      SC.Logger.log("SC.Module: Attempting to load '%@'".fmt(moduleName));
-    }
+    if (log) SC.debug("SC.Module: Attempting to load '%@'", moduleName);
 
     // If we couldn't find anything in the SC.MODULE_INFO hash, we don't have any record of the
     // requested module.
@@ -78,14 +76,36 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
     // If the module is already loaded, execute the callback immediately if SproutCore is loaded,
     // or else as soon as SC has finished loading.
-    if (module.isLoaded) {
-      if (log) SC.Logger.log("SC.Module: Module '%@' already loaded.".fmt(moduleName));
+    if (module.isLoaded && !module.isWaitingForRunLoop) {
+      if (log) SC.debug("SC.Module: Module '%@' already loaded.", moduleName);
+
+      // we can't just eval it if its dependencies have not been met...
+      if (!this._dependenciesMetForModule(moduleName)) {
+        // we can't let it return normally here, because we need the module to wait until the end of the run loop.
+        // This is because the module may set up bindings.
+        this._addCallbackForModule(moduleName, target, method, args);
+
+        this._loadDependenciesForModule(moduleName);
+
+        return NO;
+      }
 
       // If the module has finished loading and we have the string
       // representation, try to evaluate it now.
       if (module.source) {
-        if (log) SC.Logger.log("SC.Module: Evaluating JavaScript for module '%@'.".fmt(moduleName));
+        if (log) SC.debug("SC.Module: Evaluating JavaScript for module '%@'.", moduleName);
         this._evaluateStringLoadedModule(module);
+
+        // we can't let it return normally here, because we need the module to wait until the end of the run loop.
+        // This is because the module may set up bindings.
+        this._addCallbackForModule(moduleName, target, method, args);
+
+        this.invokeLast(function() {
+          module.isReady = YES;
+          this._moduleDidBecomeReady(moduleName);
+        });
+
+        return NO;
       }
 
       if (method) {
@@ -101,24 +121,20 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
       return YES;
     }
+
+    // The module has loaded, but is waiting for the end of the run loop before it is "ready";
+    // we just need to add the callback.
+    else if (module.isWaitingForRunLoop) {
+      this._addCallbackForModule(moduleName, target, method, args);
+    }
     // The module is not yet loaded, so register the callback and, if necessary, begin loading
     // the code.
     else {
-      if (log) SC.Logger.log("SC.Module: Module '%@' is not loaded, loading now.".fmt(moduleName));
+      if (log) SC.debug("SC.Module: Module '%@' is not loaded, loading now.", moduleName);
 
       // If this method is called more than once for the same module before it is finished
       // loading, we might have multiple callbacks that need to be executed once it loads.
-
-      // Retrieve array of callbacks from MODULE_INFO hash.
-      callbacks = module.callbacks || [] ;
-
-      if (method) {
-        callbacks.push(function() {
-          SC.Module._invokeCallback(moduleName, target, method, args);
-        });
-      }
-
-      module.callbacks = callbacks;
+      this._addCallbackForModule(moduleName, target, method, args);
 
       // If this is the first time the module has been requested, determine its dependencies
       // and begin loading them as well as the JavaScript for this module.
@@ -133,6 +149,21 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     }
   },
 
+  _addCallbackForModule: function(moduleName, target, method, args) {
+    var module = SC.MODULE_INFO[moduleName];
+
+    // Retrieve array of callbacks from MODULE_INFO hash.
+    var callbacks = module.callbacks || [] ;
+
+    if (method) {
+      callbacks.push(function() {
+        SC.Module._invokeCallback(moduleName, target, method, args);
+      });
+    }
+
+    module.callbacks = callbacks;
+  },
+
   /**
     @private
 
@@ -151,7 +182,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
     if (module.isLoading || module.isLoaded) return;
 
-    if (SC.LOG_MODULE_LOADING) SC.Logger.log("SC.Module: Prefetching module '%@'.".fmt(moduleName));
+    if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Prefetching module '%@'.", moduleName);
     this._loadDependenciesForModule(moduleName);
     this._loadCSSForModule(moduleName);
     this._loadJavaScriptForModule(moduleName);
@@ -174,7 +205,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     var idx, len;
 
     if (SC.LOG_MODULE_LOADING) {
-      SC.Logger.log("SC.Module: Module '%@' is marked for lazy instantiation, instantiating it now…".fmt(moduleName));
+      SC.debug("SC.Module: Module '%@' is marked for lazy instantiation, instantiating it now…", moduleName);
     }
 
     len = lazyInfo.length;
@@ -208,7 +239,9 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
   _evaluateStringLoadedModule: function(module) {
     var moduleSource = module.source;
 
+    // so, force a run loop.
     jQuery.globalEval(moduleSource);
+
     delete module.source;
 
     if (module.cssSource) {
@@ -250,7 +283,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       url = styles[idx] ;
 
       if (url.length > 0) {
-        if (SC.LOG_MODULE_LOADING) SC.Logger.log("SC.Module: Loading CSS file in '%@' -> '%@'".fmt(moduleName, url));
+        if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Loading CSS file in '%@' -> '%@'", moduleName, url);
         el = document.createElement('link') ;
         el.setAttribute('href', url) ;
         el.setAttribute('rel', "stylesheet") ;
@@ -291,7 +324,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     }
 
     if (url.length > 0) {
-      if (SC.LOG_MODULE_LOADING) SC.Logger.log("SC.Module: Loading JavaScript file in '%@' -> '%@'".fmt(moduleName, url));
+      if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Loading JavaScript file in '%@' -> '%@'", moduleName, url);
 
       el = document.createElement('script') ;
       el.setAttribute('type', "text/javascript") ;
@@ -300,12 +333,16 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       if (SC.browser.isIE) {
         el.onreadystatechange = function() {
           if (this.readyState == 'complete' || this.readyState == 'loaded') {
-            SC.Module._moduleDidLoad(moduleName);
+            SC.run(function() {
+              SC.Module._moduleDidLoad(moduleName);
+            });
           }
         };
       } else {
         el.onload = function() {
-          SC.Module._moduleDidLoad(moduleName);
+          SC.run(function(){
+            SC.Module._moduleDidLoad(moduleName);
+          });
         };
       }
 
@@ -389,7 +426,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
 
             dependents.push(moduleName) ;
 
-            if (log) SC.Logger.log("SC.Module: '%@' depends on '%@', loading dependency…".fmt(moduleName, requiredModuleName));
+            if (log) SC.debug("SC.Module: '%@' depends on '%@', loading dependency…", moduleName, requiredModuleName);
 
             // Load dependencies
             SC.Module.loadModule(requiredModuleName) ;
@@ -448,7 +485,7 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       var moduleInfo = SC.MODULE_INFO[moduleName], callbacks ;
       if (!moduleInfo) return ; // shouldn't happen, but recover anyway
 
-      if (SC.LOG_MODULE_LOADING) SC.Logger.log("SC.Module: Module '%@' has completed loading, invoking callbacks.".fmt(moduleName));
+      if (SC.LOG_MODULE_LOADING) SC.debug("SC.Module: Module '%@' has completed loading, invoking callbacks.", moduleName);
 
       callbacks = moduleInfo.callbacks || [] ;
 
@@ -462,12 +499,29 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       var module = moduleInfo[moduleName];
       var log = SC.LOG_MODULE_LOADING;
 
-      if (log) SC.Logger.log("SC.Module: Evaluating and invoking callbacks for '%@'.".fmt(moduleName));
+      if (log) SC.debug("SC.Module: Evaluating and invoking callbacks for '%@'.", moduleName);
 
       if (module.source) {
         this._evaluateStringLoadedModule(module);
       }
-      module.isReady = YES;
+
+      // this is ugly, but a module evaluated late like this won't be done instantiating
+      // until the end of a run loop. Also, the code here is not structured in a way that makes
+      // it easy to "add a step" before saying a module is ready. And finally, invokeLater doesn't
+      // accept arguments; hence, the closure.
+      module.isWaitingForRunLoop = YES;
+      this.invokeLast(function() {
+        module.isReady = YES;
+        this._moduleDidBecomeReady(moduleName);
+      });
+    },
+
+    _moduleDidBecomeReady: function(moduleName) {
+      var moduleInfo = SC.MODULE_INFO;
+      var module = moduleInfo[moduleName];
+      var log = SC.LOG_MODULE_LOADING;
+
+      module.isWaitingForRunLoop = NO;
 
       if (SC.isReady) {
         SC.Module._invokeCallbacksForModule(moduleName) ;
@@ -487,10 +541,11 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
         dependentName = dependents[idx];
         dependent = moduleInfo[dependentName];
         if (dependent.isLoaded && this._dependenciesMetForModule(dependentName)) {
-          if (log) SC.Logger.log("SC.Module: Now that %@ has loaded, all dependencies for a dependent %@ are met.".fmt(moduleName, dependentName));
+          if (log) SC.debug("SC.Module: Now that %@ has loaded, all dependencies for a dependent %@ are met.", moduleName, dependentName);
           this._evaluateAndInvokeCallbacks(dependentName);
         }
       }
+
     },
 
   /** @private
@@ -508,16 +563,16 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     var dependenciesMet;
     var callbacks, targets;
 
-    if (log) SC.Logger.log("SC.Module: Module '%@' finished loading.".fmt(moduleName));
+    if (log) SC.debug("SC.Module: Module '%@' finished loading.", moduleName);
 
     if (!module) {
-      if (log) SC.Logger.log("SC._moduleDidLoad() called for unknown module '@'.".fmt(moduleName));
+      if (log) SC.debug("SC._moduleDidLoad() called for unknown module '@'.", moduleName);
       module = SC.MODULE_INFO[moduleName] = { isLoaded: YES, isReady: YES } ;
       return;
     }
 
     if (module.isLoaded) {
-      if (log) SC.Logger.log("SC._moduleDidLoad() called more than once for module '%@'. Skipping.".fmt(moduleName));
+      if (log) SC.debug("SC._moduleDidLoad() called more than once for module '%@'. Skipping.", moduleName);
       return ;
     }
 
@@ -530,11 +585,11 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
       if (dependenciesMet) {
         this._evaluateAndInvokeCallbacks(moduleName);
       } else {
-        if (log) SC.Logger.log("SC.Module: Dependencies for '%@' not met yet, waiting to evaluate.".fmt(moduleName));
+        if (log) SC.debug("SC.Module: Dependencies for '%@' not met yet, waiting to evaluate.", moduleName);
       }
     } else {
       delete module.isPrefetching;
-      if (log) SC.Logger.log("SC.Module: Module '%@' was prefetched, not evaluating until needed.".fmt(moduleName));
+      if (log) SC.debug("SC.Module: Module '%@' was prefetched, not evaluating until needed.", moduleName);
     }
   },
 
@@ -569,6 +624,83 @@ SC.Module = SC.Object.create(/** @scope SC.Module */ {
     }
 
     return methodName;
+  },
+
+  /**
+    A list of the methods to temporarily disable (and buffer calls for) when we are suspended.
+  */
+  methodsForSuspend: "loadModule _moduleDidLoad prefetchModule _moduleDidBecomeReady".w(),
+
+  /**
+    Call this in order to prevent expensive tasks from occurring at inopportune times.
+  */
+  suspend: function() {
+
+    //Increment the suspension count, to support nested suspend()/resume() pairs.
+    //We only do anything if the suspend count ends up at 1, as that implies it's
+    //the first suspend() call.
+    this._suspendCount = (this._suspendCount||0)+1;
+    if(this._suspendCount!==1) return;
+
+    //Yummy variables.
+    var methods = this.get('methodsForSuspend'),
+        replaceKey, saveKey, key, i;
+
+    //Now we go through the list of methods to suspend, and overwrite them with
+    //versions that will buffer their calls in a _bufferedCalls array.
+    for(i=0; key=methods[i]; i++) {
+
+      //Ensure the replacement function exists at a key where it'll be cached.
+      if(!this[replaceKey="__replacement_"+key+"__"]) {
+        (this[replaceKey] = function() {
+          (this._bufferedCalls||(this._bufferedCalls=[])).push({
+            method: arguments.callee.methodName,
+            arguments: arguments
+          });
+        }).methodName = key;
+      }
+
+      //Ensure the original function exists at a key where it'll be cached.
+      if(!this[saveKey="__saved_"+key+"__"]) this[saveKey] = this[key];
+
+      //Ensure that the replacement function exists where the rest of the
+      //code expects the original.
+      this[key] = this[replaceKey];
+    }
+  },
+
+  /**
+    Call this in order to resume normal behavior of the methods here, and to
+    finally perform any calls that may have occurred during suspension. Calls
+    will run in the order they were received.
+  */
+  resume: function() {
+
+    //First, we need to decrement the suspension count, and warn if the suspension
+    //count implied that we weren't already suspended. Furthermore, if the suspend
+    //count is not zero, then we haven't tackled the last suspend() call with a resume(),
+    //and should therefore not resume.
+    this._suspendCount = (this._suspendCount||0)-1;
+    if(this._suspendCount<0) {
+      SC.warn("SC.Module.resume() was called without SC.Module having been in a suspended state. Call aborted.");
+      this._suspendCount = 0;
+      return;
+    }
+    if(this._suspendCount>0) return;
+
+    //Yummy variables.
+    var methods = this.get('methodsForSuspend'),
+        calls = this._bufferedCalls,
+        key, i, method, call;
+
+    //Restore the original methods to where they belong for normal functionality.
+    for(i=0; (key=methods[i]); i++) this[key] = this["__saved_"+key+"__"];
+
+    //Perform any buffered calls that built up during the suspended period.
+    for(i=0; call=calls&&calls[i]; i++) this[call.method].apply(this,call.arguments);
+
+    //Clear the list of calls, so subsequent resume() calls won't flush them again.
+    if(calls) calls.length = 0;
   }
 });
 
@@ -588,17 +720,17 @@ SC.ready(function() {
     module = moduleInfo[moduleName];
 
     if (module.isPrefetched) {
-      var prefetchedModuleName = moduleName;
-
       // Create a task that will load the module, and then register it with
       // the global background task queue.
-      task = SC.Task.create({
-        run: function() {
-          SC.Module.prefetchModule(prefetchedModuleName);
-        }
-      });
-
+      task = SC.Module.PrefetchModuleTask.create({ prefetchedModuleName: moduleName });
       SC.backgroundTaskQueue.push(task);
     }
   }
 });
+
+SC.Module.PrefetchModuleTask = SC.Task.extend({
+  prefetchedModuleName: null,
+  run: function() {
+    SC.Module.prefetchModule(this.prefetchedModuleName);
+  }
+});