sproutcore 1.0.1042 → 1.0.1043

data/frameworks/sproutcore/frameworks/mobile/system/root_responder.js

@@ -9,101 +9,4 @@ SC.RootResponder = SC.RootResponder.extend({
 
   platform: 'mobile',
   
-  /**
-    Setup event listeners for touch events.
-  */
-  setup: function() {
-    sc_super();
-    this.listenFor('touchstart touchmove touchend touchcancel'.w(), document);    
-  },
-  
-  touchstart: function(evt) {
-    try {
-      var view = this.targetViewForEvent(evt) ;
-      view = this._touchView = this.sendEvent('touchStart', evt, view) ;
-      if (view && view.respondsTo('touchDragged')) this._touchCanDrag = YES ;
-    } catch (e) {
-      console.log('Exception during touchStart: %@'.fmt(e)) ;
-      this._touchView = null ;
-      this._touchCanDrag = NO ;
-      return NO ;
-    }
-    return view ? evt.hasCustomEventHandling : YES;
-  },
-
-  touchmove: function(evt) {
-    SC.RunLoop.begin();
-    try {
-      var lh = this._lastHovered || [] ;
-      var nh = [] ;
-      var view = this.targetViewForEvent(evt) ;
-        
-      // work up the view chain.  Notify of touchEntered and
-      // touchMoved if implemented.
-      while(view && (view !== this)) {
-        if (lh.indexOf(view) !== -1) {
-          view.tryToPerform('touchMoved', evt);
-          nh.push(view) ;
-        } else {
-          view.tryToPerform('touchEntered', evt);
-          nh.push(view) ;
-        }
-        
-        view = view.get('nextResponder');
-      }
-      
-      // now find those views last hovered over that were no longer found 
-      // in this chain and notify of mouseExited.
-      for(var loc=0; loc < lh.length; loc++) {
-        view = lh[loc] ;
-        var exited = view.respondsTo('touchExited') ;
-        if (exited && !(nh.indexOf(view) !== -1)) {
-          view.tryToPerform('touchExited',evt);
-        }
-      }
-      
-      this._lastHovered = nh; 
-      
-      // also, if a touchView exists, call the touchDragged action, if 
-      // it exists.
-      if (this._touchView) this._touchView.tryToPerform('touchDragged', evt);
-    } catch (e) {
-      console.log('Exception during touchMove: %@'.fmt(e)) ;
-    }
-    SC.RunLoop.end();
-    return YES ;
-  },
-  
-  touchend: function(evt) {
-    try {
-      evt.cancel = NO ;
-      var handler = null, view = this._touchView ;
-      
-      // attempt the call only if there's a target.
-      // don't want a touch end going to anyone unless they handled the 
-      // touch start...
-      if (view) handler = this.sendEvent('touchEnd', evt, view) ;
-      
-      // try whoever's under the mouse if we haven't handle the mouse up yet
-      if (!handler) view = this.targetViewForEvent(evt) ;
-      
-      // cleanup
-      this._touchCanDrag = NO; this._touchView = null ;
-    } catch (e) {
-      console.log('Exception during touchEnd: %@'.fmt(e)) ;
-      this._touchCanDrag = NO; this._touchView = null ;
-      return NO ;
-    }
-    return (handler) ? evt.hasCustomEventHandling : YES ;
-  },
-  
-  /** @private
-    Handle touch cancel event.  Works just like touch end except evt.cancel
-    is set to YES.
-  */
-  touchcancel: function(evt) {
-    evt.cancel = YES ;
-    return this.touchend(evt);
-  }  
-  
 }) ;

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

@@ -1328,6 +1328,7 @@ SC.logChange = function logChange(target, key, value) {
 SC.mixin(SC, {
   get: function(object, key) {
     if (!object) return undefined;
+    if (key === undefined) return this[object];
     if (object.get) return object.get(key);
     return object[key];
   }

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

@@ -126,6 +126,12 @@ test("should return undefined if the provided object is undefined", function() {
   equals(SC.get(undefined, 'key'), undefined);
 });
 
+test("should work when object is SC (used in SC.objectForPropertyPath)", function() {
+  equals(SC.objectForPropertyPath('SC.RunLoop'), SC.RunLoop);
+  equals(SC.get('RunLoop'), SC.RunLoop);
+  equals(SC.get(SC, 'RunLoop'), SC.RunLoop);
+});
+
 // ..........................................................
 // SET()
 // 

data/lib/sproutcore/builders/minify.rb

@@ -35,7 +35,7 @@ module SC
     def build_css(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
-        $to_minify= $to_minify+" "+dst_path
+        $to_minify << dst_path
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
@@ -45,7 +45,7 @@ module SC
         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.")
@@ -58,7 +58,7 @@ module SC
     def build_javascript(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
-        $to_minify= $to_minify+" "+dst_path
+        $to_minify << dst_path
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
@@ -67,7 +67,7 @@ module SC
         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.
@@ -81,7 +81,6 @@ module SC
     
     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...
@@ -89,8 +88,8 @@ 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")

data/lib/sproutcore/models/target.rb

@@ -332,15 +332,15 @@ module SC
     def file_attr(attr_name, path, &block)
       
       # read cache from disk if needed
-      if @file_attr_cache.nil?
-        if File.exists?(file_attr_cache_path)
-          require 'yaml'
-          @file_attr_cache = YAML.load File.read(file_attr_cache_path)
-        else
-          @file_attr_cache = {}
-        end
+      if @file_attr_cache.nil? && File.exists?(file_attr_cache_path)
+        require 'yaml'
+        @file_attr_cache = YAML.load_file file_attr_cache_path
+          
+        # Sometimes the file is corrupted, in this case, clear the cache
+        File.delete file_attr_cache_path unless @file_attr_cache
       end
-
+      @file_attr_cache ||= {}
+      
       path_root = (@file_attr_cache[path] ||= {})
       attr_info = (path_root[attr_name.to_s] ||= {})
       attr_mtime = attr_info['mtime'].to_i

data/lib/sproutcore/rack/builder.rb

@@ -322,7 +322,16 @@ module SC
       # a few bug fixes.
       def mime_type(build_path)
         ext = File.extname(build_path)
-        (ext == '.js') ? 'text/javascript' : ::Rack::Mime.mime_type(ext, 'text/plain')
+        
+        case ext
+        when '.js'
+          'text/javascript'
+        when '.ttf'
+          'font/ttf'
+        else
+          ::Rack::Mime.mime_type(ext, 'text/plain')
+        end
+        
       end
       
     end

data/lib/sproutcore/tools/build.rb

@@ -6,8 +6,9 @@
 # ===========================================================================
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'manifest'))
+require 'pathname'
 
-$to_minify=''
+$to_minify = []
 
 module SC
   class Tools
@@ -69,27 +70,31 @@ module SC
         if entries.size > 0
           info "Building entries for #{manifest.target.target_name}:#{manifest.language}..."
           
+          target_build_root = Pathname.new(manifest.target.project.project_root)
           entries.each do |entry|
-            info "  #{entry.filename} -> #{entry.build_path}"
+            dst = Pathname.new(entry.build_path).relative_path_from(target_build_root)
+            info "  #{entry.filename} -> #{dst}"
             entry.build!
           end
         end
       end
-      yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
-      jar_path = File.join(yui_root, 'SCyuicompressor-2.4.2.jar')
-      filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + $to_minify + " 2>&1"
-      SC.logger.info filecompress
-      SC.logger.info  'Compressing with YUI:  '+ $to_minify + "..."
       
-      output = `#{filecompress}`      # It'd be nice to just read STDERR, but
-                                          # I can't find a reasonable, commonly-
-                                          # installed, works-on-all-OSes solution.
-      SC.logger.info output
-        if $?.exitstatus != 0
-        SC.logger.fatal(output)
-        SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
-        SC.logger.fatal("!!!!Failed compressing ... "+ build_root)
-        exit(1) 
+      if $to_minify.length > 0
+        yui_root = File.expand_path(File.join(LIBPATH, '..', 'vendor', 'yui-compressor'))
+        jar_path = File.join(yui_root, 'SCyuicompressor-2.4.2.jar')
+        filecompress = "java -jar " + jar_path + " --charset utf-8 --line-break 80 " + $to_minify * ' ' + " 2>&1"
+        SC.logger.info  'Compressing with YUI...'
+        
+        output = `#{filecompress}`      # It'd be nice to just read STDERR, but
+                                        # I can't find a reasonable, commonly-
+                                        # installed, works-on-all-OSes solution.
+        SC.logger.info output
+          if $?.exitstatus != 0
+          SC.logger.fatal(output)
+          SC.logger.fatal("!!!!YUI compressor failed, please check that your js code is valid")
+          SC.logger.fatal("!!!!Failed compressing ... "+ build_root)
+          exit(1) 
+        end
       end
     end    
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1042
+  version: 1.0.1043
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2010-01-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -696,6 +696,7 @@ files:
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/button/content.js
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/button/displayProperties.js
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/button/keyEquivalents.js
+- frameworks/sproutcore/frameworks/foundation/tests/mixins/button/ui.js
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/control/content.js
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/control/displayProperties.js
 - frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js
@@ -933,6 +934,7 @@ files:
 - frameworks/sproutcore/themes/standard_theme/Source/Panel.drawit/Data
 - frameworks/sproutcore/themes/standard_theme/Source/Panel.drawit/QuickLook/Preview.jpg
 - frameworks/sproutcore/themes/standard_theme/Source/Panel.drawit/QuickLook/Thumbnail.jpg
+- frameworks/sproutcore/themes/standard_theme/Source/SproutCore Theme Buttons.psd
 - frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/Data
 - frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/QuickLook/Preview.jpg
 - frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/QuickLook/Thumbnail.jpg