sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/slider.css

@@ -0,0 +1,27 @@
+@theme(sc-jumbo-size) {
+
+  $theme.slider {
+    overflow: visible;
+  
+    .track { 
+      position: absolute;
+      top: 50%; height: 5px; left: 0px; right: 0px;
+      margin-top: -3px;
+      
+      @include slices("track.png", $left: 3, $right: 3); 
+    }
+    
+    .sc-handle { 
+      display: block; position: absolute;
+      width: 22px; height: 24px; top: 50%; margin-top: -11px;
+
+      @include slice("knob.png"); 
+    }
+  
+    &.active {
+      .sc-handle { @include slice("knob_active.png"); }
+    }
+  
+  }
+
+}

data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.css

@@ -0,0 +1,3 @@
+$theme.slider {
+  &.disabled { opacity: .5; }
+}

data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.js

@@ -0,0 +1,48 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/**
+  Renders and updates the DOM representation of a slider.
+  
+  Parameters
+  -------------------------
+  Requires the following parameters:
+  
+  - value: a value from 0 to 1.
+  - frame: containing the frame in which the slider is being drawn.
+*/
+
+SC.AceTheme.sliderRenderDelegate = SC.RenderDelegate.create({
+  
+  name: 'slider',
+  
+  render: function(dataSource, context) {
+    var blankImage = SC.BLANK_IMAGE_URL;
+    
+    context = context.begin('span').addClass('track');
+    this.includeSlices(dataSource, context, SC.THREE_SLICE);
+    context = context.end();
+    
+    context.push(
+      '<img src="', blankImage, 
+      '" class="sc-handle" style="left: ', dataSource.get('value'), '%" />',
+      '</span>'
+    );
+    
+    dataSource.get('renderState')._cachedHandle = null;
+  },
+  
+  update: function(dataSource, jquery) {
+    if (dataSource.didChangeFor('sliderRenderDelegate', 'value')) {
+      var handle = dataSource.get('renderState')._cachedHandle;
+      if (!handle) handle = dataSource.get('renderState')._cachedHandle = jquery.find('.sc-handle');
+      
+      handle.css('left', dataSource.get('value') + "%");
+    }
+  }
+  
+});

data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css

@@ -0,0 +1,5 @@
+/* TODO: when new SplitView lands, do this proper ($theme.split-divider) */
+$theme.sc-split-divider-view {
+  background: #555;
+  border: 0px none;
+}

data/lib/frameworks/sproutcore/themes/ace/resources/tab/tab.css

@@ -0,0 +1,3 @@
+$theme.sc-tab-view {
+  overflow: visible;
+}

data/lib/frameworks/sproutcore/themes/ace/resources/toolbar/toolbar.css

@@ -0,0 +1,8 @@
+$theme.toolbar {
+  @include slice(toolbar.png, $width: 1, $repeat: repeat-x);
+  color: #555;
+  text-shadow: 0px 1px 1px white;
+  border-bottom: 1px solid #999;
+  -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, .5);
+  z-index: 10;
+}

data/lib/frameworks/sproutcore/themes/ace/resources/well/well.css

@@ -0,0 +1,8 @@
+@theme(well) {
+  $theme.container {
+    -sc-border-radius: 5px;
+    border: 1px solid #999;
+    -webkit-box-shadow: 1px 1px 1px rgba(255, 255, 255, .3);
+    overflow:hidden;
+  }
+}

data/lib/frameworks/sproutcore/themes/ace/resources/well/well.js

@@ -0,0 +1,19 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+SC.AceTheme.Well = SC.AceTheme.subtheme('well');
+
+SC.AceTheme.Well.containerRenderDelegate = SC.RenderDelegate.create({
+  name: 'container',
+  render: function(dataSource, context) {
+    
+  },
+  
+  update: function() {
+
+  }
+});

data/lib/frameworks/sproutcore/themes/ace/theme.js

@@ -0,0 +1,14 @@
+// Main Ace Theme
+SC.AceTheme = SC.BaseTheme.create({
+  name: "ace",
+  description: "A SproutCore built-in theme by Alex Iskander and contributors. Only supports browsers that implement CSS3."
+});
+
+SC.Theme.addTheme(SC.AceTheme);
+
+// Dark Variant
+SC.AceTheme.Dark = SC.AceTheme.subtheme("dark");
+
+// for backwards-compatibility with apps that do not set their
+// own default theme:
+SC.defaultTheme = 'ace';

data/lib/frameworks/sproutcore/themes/empty_theme/theme.js

@@ -0,0 +1,16 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/** @class
+  @extends SC.Theme
+  @since SproutCore 1.1
+*/
+SC.EmptyTheme = SC.BaseTheme.create({
+  name: 'sc-empty'
+});
+
+SC.Theme.addTheme(SC.EmptyTheme);

data/lib/frameworks/sproutcore/themes/standard_theme/english.lproj/segmented.css

@@ -2,12 +2,6 @@
   display: block;
 }
 
-.sc-theme .sc-segmented-view .sc-segment {
-	text-decoration: none ;
-	color: black ;
-	text-align: center ;
-}
-
 .sc-theme .sc-segment:active, .sc-segment:focus {
 	outline: none;
 }
@@ -21,8 +15,6 @@
 	width: 16px;
 }
 
-
-
 .sc-theme .sc-segmented-view.disabled .sc-segment img.icon {
 	opacity: 0.5;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; 
@@ -33,19 +25,22 @@
 /* @group Layout */
 
 .sc-theme .sc-segmented-view .sc-segment {
-	display: block;
+	display: inline-block;
 	top: 0;
 	height: 24px;
 	line-height: 24px;
 	text-shadow: #fff 0px 1px 0px;
 	margin-left: -1px;
+	text-decoration: none ;
+	color: black ;
+	text-align: center ;
 }
 
 .sc-theme .sc-segmented-view .sc-button-inner {
-	display: block;
-	min-width: 20px;
-	min-height: 24px;
-	border: none;
+  display: block;
+  min-width: 20px;
+  min-height: 24px;
+  border: none;
 }
 
 .sc-theme .sc-segmented-view .sc-segment {
@@ -57,17 +52,17 @@
 
 
 .sc-theme .sc-segmented-view .sc-segment .sc-button-inner {
-	padding-left: 0;
-	padding-right: 11px;
-	background:  transparent;
+  padding-left: 0;
+  padding-right: 11px;
+  background:  transparent;
 }
 
 .sc-theme .sc-segmented-view .sc-segment label {
-	display:  block;
-	line-height: 24px;
-	height:  24px;
-	text-align: center;
-	background:  transparent;
+  display: block;
+  line-height: 24px;
+  height:  24px;
+  text-align: center;
+  background:  transparent;
 }
 
 /* @end */

data/lib/sproutcore.rb

@@ -131,11 +131,18 @@ module SproutCore
 
   def self.yui_jar
     @yui_jar ||= begin
-      yui_root = File.expand_path("../sproutcore/vendor/yui-compressor", __FILE__)
-      File.join(yui_root, 'SCyuicompressor-2.4.2.jar')
+      yui_root = File.expand_path("../sproutcore/vendor/sproutcore/lib", __FILE__)
+      File.join(yui_root, 'yuicompressor-2.4.4.jar')
     end
   end
 
+  # def self.closure_jar
+  #     @closure_jar ||= begin
+  #       closure_root = File.expand_path("../sproutcore/vendor/sproutcore/lib", __FILE__)
+  #       File.join(closure_root, 'compiler.jar')
+  #     end
+  #   end
+
   def self.profile(env)
     if ENV[env]
       require "ruby-prof"

data/lib/sproutcore/builders.rb

@@ -1,5 +1,5 @@
 require "sproutcore/builders/base"
-require "sproutcore/builders/bundle"
+require "sproutcore/builders/module"
 require "sproutcore/builders/combine"
 require "sproutcore/builders/html"
 require "sproutcore/builders/javascript"
@@ -10,4 +10,5 @@ require "sproutcore/builders/strings"
 require "sproutcore/builders/stylesheet"
 require "sproutcore/builders/test"
 require "sproutcore/builders/test_index"
+require "sproutcore/builders/string_wrapper"
 

data/lib/sproutcore/builders/base.rb

@@ -52,13 +52,18 @@ module SC
       end
 
       # writes the passed lines to the named file
-      def writelines(dst_path, lines)
+      def writeline(dst_path, line)
         FileUtils.mkdir_p(File.dirname(dst_path))
         File.open(dst_path, 'w') do |f|
-          f.write joinlines(lines)
+          f.write line
         end
       end
 
+      # writes the passed lines to the named file
+      def writelines(dst_path, lines)
+        writeline(dst_path,joinlines(lines))
+      end
+
       # Handles occurances of sc_static() or static_url()
       def replace_static_url(line)
         line.gsub!(/(sc_static|static_url|sc_target)\(\s*['"](.+?)['"]\s*\)/) do | rsrc |

data/lib/sproutcore/builders/combine.rb

@@ -8,6 +8,8 @@
 require "sproutcore/builders/base"
 require 'fileutils'
 
+require 'chance'
+
 module SC
 
   # This builder combines several javascript files into a single file.  It is
@@ -17,6 +19,51 @@ module SC
   #
   class Builder::Combine < Builder::Base
 
+    # override this method in subclasses to actually do build
+    def self.buildWithChance(entry, dst_path)
+      new(entry).buildWithChance(dst_path)
+    end
+      
+    def buildWithChance(dst_path)
+      theme_name = entry.target.config[:css_theme]
+      
+      chance = Chance::Instance.new({:theme => theme_name })
+
+      entries = entry.ordered_entries || entry.source_entries
+  
+      entries.each do |entry|
+        src_path = entry[:source_path]
+        next unless File.exist?(src_path)
+        
+        Chance.add_file src_path
+        chance.map_file(entry.filename, src_path)
+      end
+
+      chance.update
+
+      if chance.css
+        css = chance.css
+        css = rewrite_inline_code(css)
+        
+        writeline dst_path, css
+      end
+      
+    end
+    
+    # Rewrites any inline content such as static urls.  Subclasseses can
+    # override this to rewrite any other inline content.
+    #
+    # The default will rewrite calls to static_url().
+    def rewrite_inline_code(code)
+      # look for sc_require, require or sc_resource.  wrap in comment
+      code.gsub!(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
+      replace_static_url(code)
+      code
+    end
+    
+    def static_url(url=''); "url('#{url}')" ; end
+    
+
     def build(dst_path)
       lines = []
       entries = entry[:ordered_entries] || entry[:source_entries]
@@ -51,7 +98,8 @@ SC.LAZY_INSTANTIATION['#{target_name}'].push(
   )
 );
 "
-    end
+      end
+
       writelines dst_path, lines
     end
 

data/lib/sproutcore/builders/html.rb

@@ -117,7 +117,9 @@ module SC
         $to_html5_manifest_networks = CONFIG[:html5_manifest_networks]
         @content_for_html5_manifest = true
       end
+      $to_minify << dst_path
       writelines dst_path, [self.render]
+      
     end
 
     def default_content_for_key; :resources; end

data/lib/sproutcore/builders/javascript.rb

@@ -46,7 +46,7 @@ SC.LAZY_INSTANTIATION['#{target_name}'].push(
 
       # Try to load dependencies if we're not combining javascript.
       if entry[:notify_onload]
-        lines << "; if ((typeof SC !== 'undefined') && SC && SC.scriptDidLoad) SC.scriptDidLoad('#{target_name}');"
+        lines << "; if ((typeof SC !== 'undefined') && SC && SC.Module && SC.Module.scriptDidLoad) SC.Module.scriptDidLoad('#{target_name}');"
       end
 
       if entry[:lazy_instantiation] && entry[:notify_onload]

data/lib/sproutcore/builders/minify.rb

@@ -35,12 +35,12 @@ module SC
     def build_css(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
-        $to_minify << dst_path
+		# $to_minify << dst_path
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
         FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -jar \"" + SC.yui_jar + "\" --charset utf-8 --line-break 0 --nomunge --preserve-semi --disable-optimizations \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
+        filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --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}`
 
@@ -56,38 +56,38 @@ module SC
     def build_javascript(dst_path)
       a = Regexp.new('^'+MANIFEST.build_root)
       if dst_path =~ a
-        $to_minify << dst_path
+        # $to_minify << dst_path
         FileUtils.mkdir_p(File.dirname(dst_path))
         FileUtils.copy(entry.source_path, dst_path)
       else
         FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-        filecompress = "java -jar \"" + SC.yui_jar + "\" --charset utf-8 --line-break 80 \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
-        SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
+        filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --js \"" + entry.source_path + "\" --js_output_file \"" + dst_path + "\" 2>&1"
+        SC.logger.info  'Compiling with YUI:  '+ filecompress + "..."
 
         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)
+          SC.logger.fatal("!!!!YUI compiler failed, please check that your js code is valid")
+          SC.logger.fatal("!!!!Failed compiling ... "+ dst_path)
         end
       end
     end
 
     def build_inline_javascript(dst_path)
-      SC.logger.info  'Compressing inline Javascript with YUI: ' + dst_path + "..."
+      SC.logger.info  'Compiling inline Javascript with YUI: ' + dst_path + "..."
       FileUtils.mkdir_p(File.dirname(dst_path)) # make sure loc exists...
-      filecompress = "java -jar \"" + SC.yui_jar + "\" --charset utf-8 --line-break 80 \"" + entry.source_path + "\" -o \"" + dst_path + "\" 2>&1"
-      SC.logger.info  'Compressing with YUI:  '+ dst_path + "..."
+      filecompress = "java -Xmx128m -jar \"" + SC.yui_jar + "\" --js \"" + entry.source_path + "\" --js_output_file \"" + dst_path + "\" 2>&1"
+      SC.logger.info  'Compiling with YUI:  '+ filecompress + "..."
 
       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)
+        SC.logger.fatal("!!!!YUI compiler failed, please check that your js code is valid")
+        SC.logger.fatal("!!!!Failed compiling ... "+ dst_path)
       end
     end