sproutcore 1.5.0.pre.4 → 1.5.0.pre.4.1

data/lib/frameworks/sproutcore/themes/ace/resources/segmented/24px/segmented.css

@@ -43,7 +43,7 @@ $theme.sc-segment-view {
   &.active {
     .left { @include slice("segmented_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
   
   &.active.sc-first-segment {
@@ -59,7 +59,7 @@ $theme.sc-segment-view {
   &.sel {
     .left { @include slice("segmented_selected.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.sc-first-segment {
@@ -75,7 +75,7 @@ $theme.sc-segment-view {
   &.sel.active {
     .left { @include slice("segmented_selected_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.active.sc-first-segment {
@@ -88,4 +88,4 @@ $theme.sc-segment-view {
 
 }
 
-}
+}

data/lib/frameworks/sproutcore/themes/ace/resources/segmented/30px/segmented.css

@@ -43,7 +43,7 @@ $theme.sc-segment-view {
   &.active {
     .left { @include slice("segmented_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
   
   &.active.sc-first-segment {
@@ -59,7 +59,7 @@ $theme.sc-segment-view {
   &.sel {
     .left { @include slice("segmented_selected.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.sc-first-segment {
@@ -75,7 +75,7 @@ $theme.sc-segment-view {
   &.sel.active {
     .left { @include slice("segmented_selected_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.active.sc-first-segment {
@@ -88,4 +88,4 @@ $theme.sc-segment-view {
 
 }
 
-}
+}

data/lib/frameworks/sproutcore/themes/ace/resources/segmented/44px/segmented.css

@@ -45,7 +45,7 @@ $theme.sc-segment-view {
   &.active {
     .left { @include slice("segmented_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
   
   &.active.sc-first-segment {
@@ -61,7 +61,7 @@ $theme.sc-segment-view {
   &.sel {
     .left { @include slice("segmented_selected.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1, $repeat: repeat-x); }
     
     .sc-button-label { color: white; text-shadow: 0px -1px 1px rgba(0,0,0,.7);}
   }
@@ -79,7 +79,7 @@ $theme.sc-segment-view {
   &.sel.active {
     .left { @include slice("segmented_selected_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.active.sc-first-segment {
@@ -92,4 +92,4 @@ $theme.sc-segment-view {
 
 }
 
-}
+}

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

@@ -18,6 +18,10 @@ $theme.sc-segmented-view $theme.sc-segment-view {
   overflow:hidden;
   position: relative;
   padding: 0px;
+
+  .ie7 & {
+    display: inline;
+  }
   
   &.sc-first-segment { margin: 0px; padding: 0px ;}
   &.sc-last-segment { margin: 0px; padding: 0px; }

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

@@ -1,3 +1,7 @@
 $theme.slider {
   &.disabled { opacity: .5; }
-}
+
+  .thumb {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}

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

@@ -39,9 +39,17 @@ SC.AceTheme.sliderRenderDelegate = SC.RenderDelegate.create({
   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') + "%");
+      if (!handle) {
+        handle = dataSource.get('renderState')._cachedHandle = jquery.find('.sc-handle');
+      }
+
+      var frame = dataSource.get('frame'), value = dataSource.get('value');
+      if (frame && SC.platform.supportsCSS3DTransforms) {
+        value = (value / 100) * frame.width;
+        handle[0].style.cssText = "-webkit-transform: translate3d(" + value + "px,0,0);";
+      } else {
+        handle.css('left', value + "%");
+      }
     }
   }
   

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

@@ -1,8 +1,7 @@
-@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;
-  }
-}
+$theme.well {
+  -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

@@ -5,10 +5,8 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-SC.AceTheme.Well = SC.AceTheme.subtheme('well');
-
-SC.AceTheme.Well.containerRenderDelegate = SC.RenderDelegate.create({
-  name: 'container',
+SC.AceTheme.wellRenderDelegate = SC.RenderDelegate.create({
+  name: 'well',
   render: function(dataSource, context) {
     
   },

data/lib/gen/app/templates/apps/@target_name@/Buildfile

@@ -0,0 +1,14 @@
+# ===========================================================================
+# Project:   <%= namespace %>
+# Copyright: ©<%= Time.now.year %> My Company, Inc.
+# ===========================================================================
+
+# This is your Buildfile for your app, <%= namespace %>. This tells SproutCore
+# how to build your app. These settings override those in your project
+# Buildfile, which contains default settings for all apps in your project.
+#
+# This line tells SproutCore's CSS preprocessor what class names to target.
+# Since your app has a theme named '<%= css_name %>', and it is based on SproutCore's
+# Ace theme (named 'ace'), it is set to 'ace.<%= css_name %>'.
+config :<%= target_name %>, :css_theme => 'ace.<%= css_name %>'
+

data/lib/gen/app/templates/apps/@target_name@/theme.js

@@ -0,0 +1,27 @@
+// ==========================================================================
+// Project:   <%= namespace %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+// This is the theme that defines how your app renders.
+//
+// Your app is given its own theme so it is easier and less
+// messy for you to override specific things just for your
+// app.
+//
+// You don't have to create the whole theme on your own, though:
+// your app's theme is based on SproutCore's Ace theme.
+//
+// NOTE: if you want to change the theme this one is based on, don't
+// forget to change the :css_theme property in your buildfile.
+<%= namespace %>.Theme = SC.AceTheme.create({
+  name: '<%= css_name %>'
+});
+
+// SproutCore needs to know that your app's theme exists
+SC.Theme.addTheme(<%= namespace %>.Theme);
+
+// Setting it as the default theme makes every pane SproutCore
+// creates default to this theme unless otherwise specified.
+SC.defaultTheme = '<%= css_name %>';

data/lib/gen/html_app/templates/apps/@target_name@/resources/stylesheets/@target_name@.css

@@ -0,0 +1,4 @@
+.sc-view {
+  position: relative;
+  overflow: visible;
+}

data/lib/gen/project/templates/@filename@/Buildfile

@@ -3,5 +3,10 @@
 # Copyright: ©<%= Time.now.year %> My Company, Inc.
 # ===========================================================================
 
-# Add initial buildfile information here
-config :all, :required => :sproutcore
+# This is your Buildfile, which sets build settings for your project.
+# For example, this tells SproutCore's build tools that your requires
+# the SproutCore framework.
+config :all, :required => :sproutcore
+
+# In addition to this Buildfile, which gives settings for your entire project,
+# each of your apps has its own Buildfile with settings specific to that app.

data/lib/gen/theme/templates/themes/@target_name@/Buildfile

@@ -0,0 +1,3 @@
+config :<%= target_name %>, :css_theme => 'ace.<%= css_name %>'
+
+

data/lib/gen/theme/templates/themes/@target_name@/theme.js

@@ -0,0 +1,23 @@
+// ==========================================================================
+// Project:   <%= namespace %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+// This is the JavaScript representation of your theme.
+//
+// You don't have to create the whole theme on your own, though:
+// this theme is currently based on SproutCore's Ace theme.
+//
+// NOTE: if you want to change the theme this one is based on, don't
+// forget to change the :css_theme property in your buildfile.
+<%= namespace %> = SC.AceTheme.create({
+  name: '<%= css_name %>'
+});
+
+// To let apps use your theme, SproutCore must know where to find it.
+SC.Theme.addTheme(<%= namespace %>);
+
+// You do not need to set it as a default theme. Apps should set the
+// SC.defaultTheme variable. Usually, apps will create their own theme
+// and base it on yours.

data/lib/sproutcore/builders.rb

@@ -1,5 +1,7 @@
 require "sproutcore/builders/base"
 require "sproutcore/builders/module"
+require "sproutcore/builders/chance"
+require "sproutcore/builders/chance_file"
 require "sproutcore/builders/combine"
 require "sproutcore/builders/html"
 require "sproutcore/builders/javascript"

data/lib/sproutcore/builders/chance.rb

@@ -0,0 +1,64 @@
+require "sproutcore/builders/base"
+require "fileutils"
+require "chance"
+
+module SC
+  # This builder builds CSS using Chance.
+  class Builder::Chance < Builder::Base
+
+    def build(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.stage![:staging_path]
+        next unless File.exist?(src_path)
+
+        Chance.add_file src_path
+        chance.map_file(entry.filename, src_path)
+      end
+
+      chance.update
+
+      if chance.files["chance.css"]
+        css = chance.files["chance.css"]
+        css = rewrite_inline_code(css)
+
+        writeline dst_path, css
+      end
+
+      entry[:chance] = chance
+    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!(/url\s*\(\s*["']mhtml\:chance-mhtml\.txt!(.+?)["']\s*\)/) {|mhtml|
+        static_entry = entry.manifest.find_entry("__sc_chance_mhtml.txt")
+
+        if !static_entry
+          url = ''
+        else
+          url = static_entry.cacheable_url
+        end
+
+        "expression('url(\"mhtml:' + document.location.protocol + '//' + document.location.host + '" + url + "!" + $1 + "' + '\")')"
+      }
+
+      code.gsub!(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
+      replace_static_url(code)
+      code
+    end
+
+    def static_url(url=''); "url('#{url}')" ; end
+
+  end
+
+end

data/lib/sproutcore/builders/chance_file.rb

@@ -0,0 +1,59 @@
+require "sproutcore/builders/base"
+require "fileutils"
+require "chance"
+
+module SC
+  # This builder builds CSS using Chance.
+  class Builder::ChanceFile < Builder::Base
+
+    def build(dst_path)
+      entries = entry[:chance_entries] || [entry[:chance_entry]]
+      entries.each {|entry| entry.build! }
+
+      chance_file = entry[:chance_file]
+
+      src = entries.map {|entry|
+        chance = entry[:chance]
+
+        src = ""
+        src = chance.files[chance_file] unless chance.nil?
+        src = "" if src.nil?
+
+        src = rewrite_inline_code(src) if chance_file.end_with?("css")
+
+        src
+      }.join("\n")
+
+      writeline dst_path, src
+    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!(/mhtml\:chance-mhtml\.txt/) {|mhtml|
+        static_entry = entry.manifest.find_entry("__sc_chance_mhtml.txt")
+
+        if !static_entry
+          url = ''
+        else
+          url = static_entry.cacheable_url
+        end
+
+        url
+      }
+
+      code.gsub!(/((sc_require|require|sc_resource)\(\s*['"].*["']\s*\)\s*\;)/, '/* \1 */')
+      replace_static_url(code)
+      code
+    end
+
+    def static_url(url=''); "url('#{url}')" ; end
+
+  end
+
+end
+
+

data/lib/sproutcore/builders/combine.rb

@@ -19,51 +19,6 @@ 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]