sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

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

@@ -1,65 +1,77 @@
 @theme(sc-huge-size) {
-  
+
   $theme.button {
-    
+
     .sc-button-label {
       margin-top:4px;
       height: 30px;
       font-size:13px;
     }
-    
-    
+
+
     @include slices("normal_button.png", $left: 3, $right: 3);
-    
+
     &.active {
-      @include slices("active_button.png", $left: 3, $right: 3);    
+      @include slices("active_button.png", $left: 3, $right: 3);
     }
-  
+
     &.sel, &.def {
-      @include slices("selected_button.png", $left: 3, $right: 3);    
-  
-      &.sel.active, &.def.active {
-        @include slices("selected_active_button.png", $left: 3, $right: 3);    
-      }
+      @include slices("selected_button.png", $left: 3, $right: 3);
+
+    }
+
+    &.sel.active, &.def.active {
+      @include slices("selected_active_button.png", $left: 3, $right: 3);
+    }
+    
+    &.sc-static-layout .sc-button-label {
+      margin-left: 12px;
+      margin-right: 12px;
     }
   }
 
   @theme(point-left) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
-      
+
       .middle { left: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
     }
   }
-  
+
   @theme(point-right) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
-      
+
       .middle { right: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
     }
   }

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

@@ -13,6 +13,11 @@
     
     @include slices("normal_button.png", $left: 3, $right: 3);
     
+    &.sc-static-layout .sc-button-label {
+      margin-left: 3px;
+      margin-right: 3px;
+    }
+    
     &.active {
       @include slices("active_button.png", $left: 3, $right: 3);    
     }

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

@@ -25,4 +25,12 @@ $theme.button {
     text-align: center;
     margin-top: 0px;
   }
+  
+  &.sc-static-layout {
+    display: inline-block;
+    
+    .ie7 & {
+      display: inline;
+    }
+  }
 }

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

@@ -1,83 +1,92 @@
 @theme(dark.sc-regular-size) {
-  
+
   $theme.button {
-    
+
     .sc-button-label {
       height: 24px;
       padding-top:2px;
     }
-    
+
     @include slices("normal_button.png", $left: 3, $right: 3);
-    
+
     &.active {
-      @include slices("active_button.png", $left: 3, $right: 3);    
+      @include slices("active_button.png", $left: 3, $right: 3);
     }
-  
+
     &.sel, &.def {
-      @include slices("selected_button.png", $left: 3, $right: 3);    
-  
-      &.sel.active, &.def.active {
-        @include slices("selected_active_button.png", $left: 3, $right: 3);    
-      }
+      @include slices("selected_button.png", $left: 3, $right: 3);
+    }
+
+    &.sel.active, &.def.active {
+      @include slices("selected_active_button.png", $left: 3, $right: 3);
     }
   }
 
   @theme(point-left) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
-      
+
       .middle { left: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
     }
   }
-  
+
   @theme(point-right) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
-      
+
       .middle { right: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
     }
   }
-  
+
   @theme(capsule) {
     $theme.button {
       @include slices("normal_button_capsule.png", $left: 12, $right: 12, skip-middle);
-      
+
       .middle { left: 12px; right: 12px; }
 
       &.active {
         @include slices("active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_capsule.png", $left: 12, $right: 12, skip-middle);
+        .middle { left: 12px; right: 12px; }
       }
     }
   }

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

@@ -1,65 +1,71 @@
 @theme(dark.sc-huge-size) {
-  
+
   $theme.button {
-    
+
     .sc-button-label {
       margin-top:4px;
       height: 30px;
       font-size:13px;
     }
-    
-    
+
+
     @include slices("normal_button.png", $left: 3, $right: 3);
-    
+
     &.active {
-      @include slices("active_button.png", $left: 3, $right: 3);    
+      @include slices("active_button.png", $left: 3, $right: 3);
     }
-  
+
     &.sel, &.def {
-      @include slices("selected_button.png", $left: 3, $right: 3);    
-  
-      &.sel.active, &.def.active {
-        @include slices("selected_active_button.png", $left: 3, $right: 3);    
-      }
+      @include slices("selected_button.png", $left: 3, $right: 3);
+    }
+
+    &.sel.active, &.def.active {
+      @include slices("selected_active_button.png", $left: 3, $right: 3);
     }
   }
 
   @theme(point-left) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
-      
+
       .middle { left: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-right);
+        .middle { left: 12px; }
       }
     }
   }
-  
+
   @theme(point-right) {
     $theme.button {
       @include slices("normal_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
-      
+
       .middle { right: 12px; }
 
       &.active {
         @include slices("active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel, &.def {
         @include slices("selected_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
 
       &.sel.active, &.def.active {
         @include slices("selected_active_button_pointer.png", $left: 12, $right: 12, skip-middle, skip-left);
+        .middle { right: 12px; }
       }
     }
   }

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

@@ -0,0 +1,11 @@
+$theme.image-button {
+  border: 0px none;
+
+  .img {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+  }
+}

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

@@ -0,0 +1,41 @@
+$theme.picker {
+  background: transparent;
+  
+  .panel-background {
+    position: absolute;
+    left: -15px;
+    top: -15px;
+    bottom: -15px;
+    right: -15px;
+    
+    @include slices("panel.png", $top: 25, $left: 25, $right: 25, $bottom: 25, $fill: 1 1);
+  }
+  
+  &.perfectBottom {
+    .sc-pointer {
+      position: absolute; width: 45px; height: 22px; margin-left: -22px; left: 50%; top: -20px;
+      @include slice("pointers.png", $left: 28, $top: 2, $width: 45, $height: 22);
+    }
+  }
+  
+  &.perfectRight {
+    .sc-pointer {
+      position: absolute; width: 22px; height: 50px; left: -19px; top: 2px;
+      @include slice("pointers.png", $left: 2, $top: 26, $width: 22, $height: 50);
+    }
+  }
+  
+  &.perfectLeft {
+    .sc-pointer {
+      position: absolute; width: 22px; height: 50px; right: -19px; top: 2px;
+      @include slice("pointers.png", $left: 76, $top: 26, $width: 22, $height: 50);
+    }
+  }
+  
+  &.perfectTop {
+    .sc-pointer {
+      position: absolute; width: 45px; height: 22px; margin-left: -22px; left: 50%; bottom: -19px;
+      @include slice("pointers.png", $left: 28, $top: 76, $width: 45, $height: 22);
+    }
+  }
+}

data/lib/sproutcore.rb

@@ -161,6 +161,8 @@ end  # module SC
 
 SC = SproutCore # alias
 
+Encoding.default_external = "UTF-8" if defined?(Encoding)
+
 require "sproutcore/buildfile"
 require "sproutcore/tools"
 require "sproutcore/rack"

data/lib/sproutcore/buildfile.rb

@@ -6,7 +6,6 @@
 # ===========================================================================
 
 require "sproutcore/models/hash_struct"
-require "sproutcore/buildfile/cloneable"
 require "sproutcore/buildfile/task_manager"
 
 module SC
@@ -91,7 +90,6 @@ module SC
     # Default buildfile names.  Override with SC.env.buildfile_names
     BUILDFILE_NAMES = %w(Buildfile sc-config sc-config.rb)
 
-    include Cloneable
     include TaskManager
 
     # The location of the buildfile represented by this object.
@@ -212,10 +210,10 @@ module SC
     #  task_name:: the full name of the task, including namespaces
     #  consts:: Optional hash of constant values to set on the env
     def invoke(task_name, consts = {})
-      original, SproutCore::RakeConstants.constants = SproutCore::RakeConstants.constants, consts
+      original, SproutCore::RakeConstants.constant_list = SproutCore::RakeConstants.constant_list, consts
       self[task_name].invoke(consts)
     ensure
-      SproutCore::RakeConstants.constants = original
+      SproutCore::RakeConstants.constant_list = original
     end
 
     # Returns true if the buildfile has the named task defined
@@ -255,7 +253,7 @@ module SC
     end
 
     # Application options from the command line
-    attr_reader :options
+    attr_accessor :options
 
     ################################################
     # CONFIG METHODS
@@ -287,7 +285,7 @@ module SC
     # The hash of configs as loaded from the files.  The configs are stored
     # by mode and then by config name.  To get a merged config, use
     # config_for().
-    attr_reader :configs
+    attr_accessor :configs
 
     # The hash of proxy commands
 
@@ -370,6 +368,9 @@ module SC
     def project_type; @project_type || :default; end
     attr_writer :project_type
 
+    attr_writer :is_project
+    protected :is_project=
+
     # Returns YES if this buildfile appears to represent a project.  If you
     # use the project() helper method, it will set this
     def project?; @is_project || false; end
@@ -380,7 +381,7 @@ module SC
     #
 
     # The hash of all proxies paths and their options
-    attr_reader :proxies
+    attr_accessor :proxies
 
     # Adds a proxy to the list of proxy paths.  These are used only in server
     # mode to proxy certain URLs.  If you call this method with the same
@@ -417,18 +418,17 @@ module SC
       ret = super
 
       # Make sure the tasks themselves are cloned
-      tasks = ret.instance_variable_get('@tasks')
-      tasks.each do | key, task |
-        tasks[key] = task.dup(ret)
+      ret_tasks = ret.instance_variable_set("@tasks", {})
+      @tasks.each do | key, task |
+        ret_tasks[key] = task.dup(ret)
       end
 
       # Deep clone the config and proxy hashes as well...
-      %w(@configs @proxies @options).each do |ivar|
-        cloned_ivar = instance_variable_get(ivar).deep_clone
-        ret.instance_variable_set(ivar, cloned_ivar)
-      end
+      ret.configs = Marshal.load(Marshal.dump(configs))
+      ret.proxies = Marshal.load(Marshal.dump(proxies))
+      ret.options = Marshal.load(Marshal.dump(options))
 
-      ret.instance_variable_set('@is_project', false) # transient - do not dup
+      ret.is_project = false if ret.project?
 
       return ret
     end
@@ -450,11 +450,11 @@ end
 module SproutCore
  module RakeConstants
    class << self
-     attr_accessor :constants
+     attr_accessor :constant_list
    end
 
    def const_missing(name)
-     ret = (RakeConstants.constants && RakeConstants.constants[name.to_s.downcase.to_sym]) || super
+     ret = (RakeConstants.constant_list && RakeConstants.constant_list[name.to_s.downcase.to_sym]) || super
    end
  end
 end