sproutcore 1.0.1037 → 1.0.1042

data/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -27,7 +27,7 @@ SC.BENCHMARK_OBJECTS = NO;
   number of optimizations that can make init'ing a new object much faster
   including:
   
-  - concating concatenatedProperties
+  - concatenating concatenatedProperties
   - prepping a list of bindings, observers, and dependent keys
   - caching local observers so they don't need to be manually constructed.
 
@@ -278,16 +278,16 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   /**
     Creates a new instance of the class.
 
-    Unlike most frameworks, you do not pass paramters into the init funciton
-    for an object.  Instead, you pass a hash of additonal properties you 
+    Unlike most frameworks, you do not pass parameters to the init function
+    for an object.  Instead, you pass a hash of additional properties you 
     want to have assigned to the object when it is first created.  This is
-    functionally like creating a anonymous subclass of the receiver and then
+    functionally like creating an anonymous subclass of the receiver and then
     instantiating it, but more efficient.
 
     You can use create() like you would a normal constructor in a 
     class-based system, or you can use it to create highly customized 
     singleton objects such as controllers or app-level objects.  This is 
-    often more efficient than creating subclasses and than instantiating 
+    often more efficient than creating subclasses and then instantiating 
     them.
 
     You can pass any hash of properties to this method, including mixins.
@@ -523,7 +523,7 @@ SC.Object.prototype = {
   },
   
   /**
-    Attemps to invoked the named method, passing the included two arguments.  
+    Attemps to invoke the named method, passing the included two arguments.  
     Returns NO if the method is either not implemented or if the handler 
     returns NO (indicating that it did not handle the event).  This method 
     is invoked to deliver actions from menu items and to deliver events.  
@@ -657,7 +657,10 @@ SC.Object.prototype = {
     too expensive to execute more than once, such as methods that update the
     DOM.
     
-    @param {Funciton|String} method method or method name
+    Note that in development mode only, the object and method that call this
+    method will be recorded, for help in debugging scheduled code.
+    
+    @param {Function|String} method method or method name
     @returns {SC.Object} receiver
   */
   invokeOnce: function(method) {
@@ -675,7 +678,7 @@ SC.Object.prototype = {
     A simple example is setting the selection on a collection controller to a 
     newly created object. Because the collection controller won't have its
     content collection updated until later in the run loop, setting the 
-    selection immediately will have no affect. In this situation, you could do
+    selection immediately will have no effect. In this situation, you could do
     this instead:
     
     {{{
@@ -695,6 +698,9 @@ SC.Object.prototype = {
     You can call invokeLast as many times as you like and the method will
     only be invoked once.
     
+    Note that in development mode only, the object and method that call this
+    method will be recorded, for help in debugging scheduled code.
+    
     @param {Funciton|String} method method or method name
     @returns {SC.Object} receiver
   */
@@ -777,7 +783,7 @@ function findClassNames() {
 
   searchObject(null, window, 2) ;
 
-  // Internet Explorer doesn's loop over global variables...
+  // Internet Explorer doesn't loop over global variables...
   /*if ( SC.browser.isIE ) {
     searchObject('SC', SC, 2) ; // get names for the SC classes
 

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

@@ -98,6 +98,9 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     Usually you will not call this method directly but use invokeOnce() 
     defined on SC.Object.
     
+    Note that in development mode only, the object and method that call this
+    method will be recorded, for help in debugging scheduled code.
+    
     @param {Object} target
     @param {Function} method
     @returns {SC.RunLoop} receiver
@@ -125,6 +128,9 @@ SC.RunLoop = SC.Object.extend(/** @scope SC.RunLoop.prototype */ {
     Usually you will not call this method directly but use invokeLast() 
     defined on SC.Object.
     
+    Note that in development mode only, the object and method that call this
+    method will be recorded, for help in debugging scheduled code.
+    
     @param {Object} target
     @param {Function} method
     @returns {SC.RunLoop} receiver

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

@@ -56,6 +56,75 @@ test("should call unknownProperty when value is undefined", function() {
   equals(object.lastUnknownProperty, "unknown") ;
 });
 
+// ..........................................................
+// SC.GET()
+//
+module("SC.get()", {
+  setup: function() {
+    objectA = SC.Object.create({
+
+      normal: 'value',
+      numberVal: 24,
+      toggleVal: true,
+
+      computed: function() { return 'value'; }.property(),
+
+      method: function() { return "value"; },
+
+      nullProperty: null,
+
+      unknownProperty: function(key, value) {
+        this.lastUnknownProperty = key ;
+        return "unknown" ;
+      }
+
+    });
+
+    objectB = {
+      normal: 'value',
+
+      nullProperty: null
+    };
+  }
+});
+
+test("should get normal properties on SC.Observable", function() {
+  equals(SC.get(objectA, 'normal'), 'value') ;
+});
+
+test("should call computed properties on SC.Observable and return their result", function() {
+  equals(SC.get(objectA, "computed"), "value") ;
+});
+
+test("should return the function for a non-computed property on SC.Observable", function() {
+  var value = SC.get(objectA, "method") ;
+  equals(SC.typeOf(value), SC.T_FUNCTION) ;
+});
+
+test("should return null when property value is null on SC.Observable", function() {
+  equals(SC.get(objectA, "nullProperty"), null) ;
+});
+
+test("should call unknownProperty when value is undefined on SC.Observable", function() {
+  equals(SC.get(object, "unknown"), "unknown") ;
+  equals(object.lastUnknownProperty, "unknown") ;
+});
+
+test("should get normal properties on standard objects", function() {
+  equals(SC.get(objectB, 'normal'), 'value');
+});
+
+test("should return null when property is null on standard objects", function() {
+  equals(SC.get(objectB, 'nullProperty'), null);
+});
+
+test("should return undefined if the provided object is null", function() {
+  equals(SC.get(null, 'key'), undefined);
+});
+
+test("should return undefined if the provided object is undefined", function() {
+  equals(SC.get(undefined, 'key'), undefined);
+});
 
 // ..........................................................
 // SET()

data/frameworks/sproutcore/frameworks/runtime/tests/system/logger.js

@@ -13,6 +13,7 @@ function testConsole() {
   return {
     log: function() { return true; },
     alert: function() { return true; },
+    debug: function() { return true; },
     dir: function() { return true; },
     dirxml: function() { return true; },
     error: function() { return true; },
@@ -26,12 +27,13 @@ function testConsole() {
     trace: function() { return true; },
     warn: function() { return true; }
   };
-};
+}
 
 module("SC.Logger", {
   setup: function() {
     SC.Logger.set('reporter', testConsole());
     
+    SC.Logger.debugEnabled = true;
     SC.Logger.format = true;
     SC.Logger.fallBackOnLog = true;
     SC.Logger.fallBackOnAlert = false;
@@ -58,6 +60,16 @@ test("log", function() {
   equals(SC.Logger.log("test"), true, "Function is null -- fallBackOnAlert true");
 });
 
+test("debug", function() {
+  equals(SC.Logger.debug("Debug"), true, "Function is defined");
+
+  SC.Logger.get('reporter').debug = null;
+  equals(SC.Logger.debug("Debug"), true, "Function is null -- fallBackOnLog true");
+
+  SC.Logger.fallBackOnLog = false;
+  equals(SC.Logger.debug("Debug"), false, "Function is null -- fallBackOnLog false");
+});
+
 test("dir", function() {
   equals(SC.Logger.dir({test:"string"}), true, "Function is defined");
   
@@ -162,4 +174,4 @@ test("_argumentsToString", function() {
   
   SC.LOGGER_LOG_DELIMITER = "|";
   equals(SC.Logger._argumentsToString.apply(SC.Logger, ["test", "test2"]), "test|test2", "Formatting using custom delimiter");
-});
+});

data/frameworks/sproutcore/license.js

@@ -1,7 +1,7 @@
 /*! @license
 ==========================================================================
 SproutCore -- JavaScript Application Framework
-copyright 2006-2008, Sprout Systems, Inc. and contributors.
+copyright 2006-2009, Sprout Systems Inc., Apple Inc. and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a 
 copy of this software and associated documentation files (the "Software"), 
@@ -21,6 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 DEALINGS IN THE SOFTWARE.
 
+SproutCore and the SproutCore logo are trademarks of Sprout Systems, Inc.
+
 For more information about SproutCore, visit http://www.sproutcore.com
 
 

data/frameworks/sproutcore/themes/standard_theme/english.lproj/list_item.css

@@ -65,4 +65,18 @@
 }
 
 
-/* @end */
+/* @end */
+
+/* @group Branch */
+
+.sc-list-item-view .branch {
+	background-image: sc_static('icons/mini_454545'); 
+	background-position: -32px 0;
+}
+
+.sc-list-item-view.sel .branch,
+.sc-list-item-view.active .branch {
+	background-image: sc_static('icons/mini_ffffff'); 
+}
+
+/* @end */

data/frameworks/sproutcore/themes/standard_theme/english.lproj/menu_item_view.css

@@ -1,3 +1,12 @@
 .sc-theme .sc-menu-item {  
   display:block !important;
+}
+
+.sc-menu-item div.checkbox {
+  background-image: sc_static('icons/mini_454545'); 
+  background-position: -66px -147px;
+}
+
+.sc-menu-item.focus div.checkbox {
+  background-image: sc_static('icons/mini_ffffff'); 
 }

data/frameworks/sproutcore/themes/standard_theme/english.lproj/panel.css

@@ -0,0 +1,33 @@
+/** SC.Panel Support */
+
+.sc-theme .sc-pane.sc-panel > .top-right-edge {
+  background: static_url('images/panels/sprite-x.png') no-repeat -40px -120px;
+}
+
+.sc-theme .sc-pane.sc-panel > .top-left-edge {
+  background: static_url('images/panels/sprite-x.png') no-repeat 0px -120px;
+}
+
+.sc-theme .sc-pane.sc-panel > .bottom-left-edge {
+  background: static_url('images/panels/sprite-x.png') no-repeat 0px -160px;
+}
+
+.sc-theme .sc-pane.sc-panel > .bottom-right-edge {
+  background: static_url('images/panels/sprite-x.png') no-repeat -40px -160px;
+}
+
+.sc-theme .sc-pane.sc-panel > .top-edge {
+  background: static_url('images/panels/sprite-x.png') repeat-x 0px -230px;
+}
+
+.sc-theme .sc-pane.sc-panel > .bottom-edge {
+  background: static_url('images/panels/sprite-x.png') repeat-x 0px -210px;
+}
+
+.sc-theme .sc-pane.sc-panel > .left-edge {
+  background: static_url('images/panels/sprite-y.png') repeat-y 0px 0px;
+}
+
+.sc-theme .sc-pane.sc-panel > .right-edge {
+  background: static_url('images/panels/sprite-y.png') repeat-y -20px 0px;
+}

data/frameworks/sproutcore/themes/standard_theme/english.lproj/picker.css

@@ -0,0 +1,17 @@
+/** SC.PickerPane Support */
+
+.sc-theme .sc-pane.sc-panel.sc-picker .perfectRight {
+  background: static_url('images/panels/sprite-x.png') no-repeat 0px -30px;
+}
+
+.sc-theme .sc-pane.sc-panel.sc-picker .perfectLeft {
+  background: static_url('images/panels/sprite-x.png') no-repeat -30px -30px;
+}
+
+.sc-theme .sc-pane.sc-panel.sc-picker .perfectTop {
+  background: static_url('images/panels/sprite-x.png') no-repeat 0px -90px;
+}
+
+.sc-theme .sc-pane.sc-panel.sc-picker .perfectBottom {
+  background: static_url('images/panels/sprite-x.png') no-repeat 0px 0px;
+}

data/frameworks/sproutcore/themes/standard_theme/english.lproj/radio.css

@@ -118,32 +118,35 @@
 
 .sc-theme .sc-radio-view .sc-radio-button.disabled span.button,
 .sc-theme .sc-radio-view.disabled .sc-radio-button span.button,
-.sc-theme .sc-radio-view.active .sc-radio-button.disabled:hover span.button {
+.sc-theme .sc-radio-view.disabled .sc-radio-button.active:hover span.button,
+.sc-theme .sc-radio-view .sc-radio-button.disabled.active:hover span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat -16px -226px;
 }
 
 .sc-theme .sc-radio-view.disabled .sc-radio-button.sel span.button,
+.sc-theme .sc-radio-view.disabled .sc-radio-button.sel.active:hover span.button,
 .sc-theme .sc-radio-view .sc-radio-button.sel.disabled span.button,
-.sc-theme .sc-radio-view.active .sc-radio-button.sel.disabled:hover span.button {
+.sc-theme .sc-radio-view .sc-radio-button.sel.disabled.active:hover span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat -16px -280px;
 }
 
 .sc-theme .sc-radio-view.disabled .sc-radio-button.mixed span.button,
 .sc-theme .sc-radio-view .sc-radio-button.mixed.disabled span.button,
-.sc-theme .sc-radio-view.active .sc-radio-button.mixed.disabled:hover span.button {
+.sc-theme .sc-radio-view.disabled .sc-radio-button.mixed.active:hover span.button,
+.sc-theme .sc-radio-view .sc-radio-button.mixed.disabled span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat 0px -308px;
 }
 
 
-.sc-theme .sc-radio-view.active .sc-radio-button:hover span.button {
+.sc-theme .sc-radio-view .sc-radio-button.active:hover span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat -32px -200px;
 }
 
-.sc-theme .sc-radio-view.active .sc-radio-button.sel:hover span.button {
+.sc-theme .sc-radio-view .sc-radio-button.active.sel:hover span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat 0px -226px;
 }
 
-.sc-theme .sc-radio-view.active .sc-radio-button.mixed:hover span.button {
+.sc-theme .sc-radio-view .sc-radio-button.mixed.active:hover span.button {
 	background: static_url('images/sc-theme-repeat-x.png') no-repeat -16px -308px;
 }
 

data/frameworks/sproutcore/themes/standard_theme/english.lproj/tab.css

@@ -13,7 +13,3 @@
 .sc-theme .sc-tab-view .sc-tab-view {
   background-color: transparent;
 }
-
-.sc-theme .sc-tab-view > .sc-segmented-view{
-  z-index: 100;
-}

data/frameworks/sproutcore/themes/standard_theme/english.lproj/well.css

@@ -0,0 +1,36 @@
+.sc-theme .sc-well-view .top-right-edge {
+  background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1646px;
+}
+
+.sc-theme .sc-well-view .top-left-edge {
+  background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1646px;
+}
+
+.sc-theme .sc-well-view .bottom-left-edge {
+  background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1657px;  
+}
+
+.sc-theme .sc-well-view .bottom-right-edge {
+  background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1657px;
+}
+
+.sc-theme .sc-well-view .top-edge {
+  background: static_url('images/sc-theme-repeat-x.png') repeat-x right -1668px;  
+}
+
+.sc-theme .sc-well-view .bottom-edge {
+  background: static_url('images/sc-theme-repeat-x.png') repeat-x right -1680px;
+}
+
+.sc-theme .sc-well-view .left-edge {
+  background: static_url('images/sc-theme-ysprite.png') repeat-y -16px top;  
+}
+
+.sc-theme .sc-well-view .right-edge {
+  background: static_url('images/sc-theme-ysprite.png') repeat-y -28px top;
+}
+
+.sc-theme .sc-well-view .content-background {
+  background: #57647f;  
+  opacity:0.4;
+}

data/gen/controller/templates/controllers/@filename@.js

@@ -10,7 +10,7 @@
 
   @extends <%= base_class_name || 'SC.Object' %>
 */
-<%= namespace_instance_name %> = <%= base_class_name || 'SC.Object' %>.create(
+<%= namespace_instance_name %> = <%= base_class_name || 'SC.ObjectController' %>.create(
 /** @scope <%= namespace_instance_name %>.prototype */ {
 
   // TODO: Add your own code here.

data/lib/sproutcore/builders/minify.rb

@@ -33,22 +33,55 @@ module SC
     end
     
     def build_css(dst_path)
-      yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
-      jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
-      FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-      filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
-      SC.logger.info  'Compressing CSS with YUI .... '+ dst_path
-      SC.logger.debug `#{filecompress}`
+      a = Regexp.new('^'+MANIFEST.build_root)
+      if dst_path =~ a
+        $to_minify= $to_minify+" "+dst_path
+        FileUtils.mkdir_p(File.dirname(dst_path))
+        FileUtils.copy(entry.source_path, dst_path)
+      else
+        yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
+        jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
+        FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
+        filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
+        SC.logger.info  'Compressing CSS with YUI .... '+ dst_path
+        SC.logger.debug `#{filecompress}`
 
-      if $?.exitstatus != 0
-        _report_error(output, entry.filename, entry.source_path)
-        SC.logger.fatal("!!!!YUI compressor failed, please check that your css code is valid.")
-        SC.logger.fatal("!!!!Failed compressing CSS... "+ dst_path)
+        if $?.exitstatus != 0
+          _report_error(output, entry.filename, entry.source_path)
+          SC.logger.fatal("!!!!YUI compressor failed, please check that your css code is valid.")
+          SC.logger.fatal("!!!!Failed compressing CSS... "+ dst_path)
+        end
       end
   	end
     
     # Minify some javascript by invoking the YUI compressor.
     def build_javascript(dst_path)
+      a = Regexp.new('^'+MANIFEST.build_root)
+      if dst_path =~ a
+        $to_minify= $to_minify+" "+dst_path
+        FileUtils.mkdir_p(File.dirname(dst_path))
+        FileUtils.copy(entry.source_path, dst_path)
+      else
+        yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
+        jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
+        FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
+        filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + entry.source_path + " -o \"" + dst_path + "\" 2>&1"
+        SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
+
+        output = `#{filecompress}`      # It'd be nice to just read STDERR, but
+                                      # I can't find a reasonable, commonly-
+                                      # installed, works-on-all-OSes solution.
+        if $?.exitstatus != 0
+          _report_error(output, entry.filename, entry.source_path)
+          SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
+          SC.logger.fatal("!!!!Failed compressing ... "+ dst_path)
+        end
+      end
+    end
+    
+    def build_inline_javascript(dst_path)
+      SC.logger.info  'Compressing inline Javascript with YUI: ' + dst_path + "..."
+      system(yui_command('--line-break 0', dst_path))
       yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
       jar_path = File.join(yui_root, 'yuicompressor-2.4.2.jar')
       FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
@@ -56,14 +89,13 @@ module SC
       SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
 
       output = `#{filecompress}`      # It'd be nice to just read STDERR, but
-                                      # I can't find a reasonable, commonly-
-                                      # installed, works-on-all-OSes solution.
+                                    # I can't find a reasonable, commonly-
+                                    # installed, works-on-all-OSes solution.
       if $?.exitstatus != 0
         _report_error(output, entry.filename, entry.source_path)
         SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
         SC.logger.fatal("!!!!Failed compressing ... "+ dst_path)
       end
-      
     end