sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_overlay.css

@@ -0,0 +1,74 @@
+@import "compass/css3";
+
+/* Overrides of the themed horizontal scroller to take it back to a basic black transparent OS X style overlay. */
+$theme.sc-overlay-scroller-view.sc-horizontal {
+
+  /* Track */
+  .track {
+    background: none;
+  }
+
+  .cap, .endcap {
+    background: none;
+  }
+
+  /* Buttons */
+  .button-top {
+    background: none;
+  }
+
+  .button-bottom {
+    background: none;
+  }
+
+  .button-top:active {
+    background: none;
+  }
+
+  .button-bottom:active {
+    background: none;
+  }
+
+  /* Thumb */
+  .thumb {
+  }
+
+  .thumb-top {
+    @include border-left-radius(4px);
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-left: 1px solid $overlay-thumb-border-color;
+    border-top: 1px solid $overlay-thumb-border-color;
+    border-bottom: 1px solid $overlay-thumb-border-color;
+    height: 7px;
+    top: 2px;
+  }
+
+  .thumb-clip {
+    height: 9px; /* +2px for white border */
+    top: 2px;
+  }
+
+  .thumb-inner {
+  }
+
+  .thumb-center {
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-top: 1px solid $overlay-thumb-border-color;
+    border-bottom: 1px solid $overlay-thumb-border-color;
+    width: initial;
+    height: 7px;
+  }
+
+  .thumb-bottom {
+    @include border-right-radius(4px);
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-right: 1px solid $overlay-thumb-border-color;
+    border-top: 1px solid $overlay-thumb-border-color;
+    border-bottom: 1px solid $overlay-thumb-border-color;
+    height: 7px;
+  }
+
+}

data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical.css

@@ -1,35 +1,34 @@
 /* Track */
 $theme.sc-scroller-view.sc-vertical {
   .track {
+    @include slice("track_and_arrows.png", $repeat: repeat-y, $height: 1, $top: 16);
 	  position: absolute;
   	top: 0;
   	right: 0;
   	bottom: 0;
   	width: 14px;
-  	@include slice("track_and_arrows.png", $repeat: repeat-y, $height: 1, $top: 16);
   }
 
   .cap {
-  	position:absolute;
+    @include slice("track_and_arrows.png", $height: 16);
+  	position: absolute;
   	width: 14px;
   	height: 16px;
   	top: 0;
-    @include slice("track_and_arrows.png", $height: 16);
   }
 
   /* Buttons */
   .button-top, .button-left {
-	  position:absolute;
-	  @include slice("track_and_arrows.png", $bottom: 15, $height: 26);
+    @include slice("track_and_arrows.png", $bottom: 15, $height: 26);
+	  position: absolute;
   	height: 26px;
     width: 14px;
     bottom: 15px;
   }
 
-
   .button-right, .button-bottom {
-  	position:absolute;
-  	@include slice("track_and_arrows.png", $bottom: 0, $height: 15);
+    @include slice("track_and_arrows.png", $bottom: 0, $height: 15);
+  	position: absolute;
   	height: 15px;
     width: 14px;
     bottom: 0;
@@ -48,33 +47,32 @@ $theme.sc-scroller-view.sc-vertical {
 
   /* Thumb */
   .thumb {
-  	position:absolute;
-  	overflow: visible;
+  	position: absolute;
   }
 
   .thumb-center {
+    @include slice("thumb.png", $repeat: repeat-y, $top: 10, $height: 1);
   	position: absolute;
   	width: 14px;
   	top: 10px;
   	bottom: 8px; /* hack to account for a different cap length than is hard-coded in;
   	we need a render delegate here pretty badly. */
-  	@include slice("thumb.png", $repeat: repeat-y, $top: 10, $height: 1);
   }
 
   .thumb-top, .thumb-left {
+    @include slice("thumb.png", $height: 10);
   	position: absolute;
   	width: 14px;
   	top: 0;
   	height: 10px;
-  	@include slice("thumb.png", $height: 10);
   }
 
   .thumb-right, .thumb-bottom {
+    @include slice("thumb.png", $height: 10, $bottom: 0);
   	position: absolute;
   	width: 14px;
   	bottom: -2px; /* hack to account for a different cap length than is hard-coded in;
   	we need a render delegate here pretty badly. */
   	height: 10px;
-  	@include slice("thumb.png", $height: 10, $bottom: 0);
   }
 }

data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_overlay.css

@@ -0,0 +1,74 @@
+@import "compass/css3";
+
+/* Overrides of the themed vertical scroller to take it back to a basic black transparent OS X style overlay. */
+$theme.sc-overlay-scroller-view.sc-vertical {
+
+  /* Track */
+  .track {
+    background: none;
+  }
+
+  .cap, .endcap {
+    background: none;
+  }
+
+  /* Buttons */
+  .button-top {
+    background: none;
+  }
+
+  .button-bottom {
+    background: none;
+  }
+
+  .button-top:active {
+    background: none;
+  }
+
+  .button-bottom:active {
+    background: none;
+  }
+
+  /* Thumb */
+  .thumb {
+  }
+
+  .thumb-top {
+    @include border-top-radius(4px);
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-top: 1px solid $overlay-thumb-border-color;
+    border-right: 1px solid $overlay-thumb-border-color;
+    border-left: 1px solid $overlay-thumb-border-color;
+    left: 1px;
+    width: 7px;
+  }
+
+  .thumb-clip {
+    left: 1px;
+    width: 9px; /* +2px for white border */
+  }
+
+  .thumb-inner {
+  }
+
+  .thumb-center {
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-right: 1px solid $overlay-thumb-border-color;
+    border-left: 1px solid $overlay-thumb-border-color;
+    height: initial;
+    width: 7px;
+  }
+
+  .thumb-bottom {
+    @include border-bottom-radius(4px);
+    background-color: $overlay-thumb-background-color;
+    background-image: none;
+    border-right: 1px solid $overlay-thumb-border-color;
+    border-left: 1px solid $overlay-thumb-border-color;
+    border-bottom: 1px solid $overlay-thumb-border-color;
+    width: 7px;
+  }
+
+}

data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/{22px → jumbo}/slider.css

@@ -5,21 +5,26 @@
 
     .track {
       position: absolute;
-      top: 50%; height: 5px; left: 0; right: 0;
-      margin-top: -3px;
+      top: 50%; height: 7px; left: 0; right: 0;
+      margin-top: -3.5px;
 
       @include slices("track.png", $left: 3, $right: 3);
     }
 
+    .sc-slider-step-mark {
+      height: 5px;
+      margin-top: -3px;
+    }
+
     .sc-handle {
       display: block; position: absolute;
-      width: 22px; height: 24px; top: 50%; margin-top: -11px;
+      width: 27px; height: 27px; top: 50%; margin-top: -13.5px; margin-left: -13.5px;
 
       @include slice("knob.png");
     }
 
     &.active {
-      .sc-handle { @include slice("knob_active.png"); }
+      .sc-handle { @include slice("knob-active.png"); }
     }
 
   }

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

@@ -0,0 +1,32 @@
+@theme(sc-regular-size) {
+
+  $theme.slider {
+    overflow: visible;
+
+    .track {
+      position: absolute;
+      top: 50%; height: 6px; left: 0; right: 0;
+      margin-top: -2px;
+
+      @include slices("track.png", $left: 3, $right: 3);
+    }
+
+    .sc-slider-step-mark {
+      height: 5px;
+      margin-top: -2px;
+    }
+
+    .sc-handle {
+      display: block; position: absolute;
+      width: 21px; height: 21px; top: 50%; margin-top: -10.5px; margin-left: -10.5px;
+
+      @include slice("knob.png");
+    }
+
+    &.active {
+      .sc-handle { @include slice("knob-active.png"); }
+    }
+
+  }
+
+}

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

@@ -1,6 +1,19 @@
 $theme.slider {
   &.disabled { opacity: .5; }
 
+  /* TODO: These could use some slightly Ace-ier styles. */
+  .sc-slider-step-mark {
+    position: absolute;
+    width: 1px;
+    background-color: #CACACA;
+    border-right: 1px solid #DDD;
+    top: 50%;
+    margin-left: -1px;
+    &.sc-slider-step-mark-first, &.sc-slider-step-mark-last {
+      display: none;
+    }
+  }
+
   .sc-handle {
     -webkit-transform: translate3d(0,0,0);
     background: transparent;

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

@@ -0,0 +1,32 @@
+@theme(sc-small-size) {
+
+  $theme.slider {
+    overflow: visible;
+
+    .track {
+      position: absolute;
+      top: 50%; height: 4px; left: 0; right: 0;
+      margin-top: -2px;
+
+      @include slices("track.png", $left: 3, $right: 3);
+    }
+
+    .sc-slider-step-mark {
+      height: 5px;
+      margin-top: -2px;
+    }
+
+    .sc-handle {
+      display: block; position: absolute;
+      width: 18px; height: 18px; top: 50%; margin-top: -8.5px; margin-left: -9px;
+
+      @include slice("knob.png");
+    }
+
+    &.active {
+      .sc-handle { @include slice("knob-active.png"); }
+    }
+
+  }
+
+}

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

@@ -10,8 +10,7 @@ $theme.split-divider {
     position: absolute;
   }
 
-
-  .sc-layout-horizontal & {
+  &.sc-layout-horizontal {
     .line {
       left: 5px;
       width: 1px;
@@ -20,7 +19,7 @@ $theme.split-divider {
     }
   }
 
-  .sc-layout-vertical & {
+  &.sc-layout-vertical {
     .line {
       top: 5px;
       height: 1px;

data/lib/sproutcore/builders/chance_file.rb

@@ -8,7 +8,7 @@ module SC
 
     def build(dst_path)
       instances = entry[:chance_instances] || [entry[:chance_instance]]
-      
+
       # Ensure all entries are staged. When Abbot updates, it may skip regenerating
       # the manifest and just run us, in which case, the previous staged version
       # will be out-of-date.
@@ -23,7 +23,7 @@ module SC
 
 
         src = ""
-        src = chance.output_for chance_file unless chance.nil?
+        src = chance.output_for(chance_file, dst_path) unless chance.nil?
         src = "" if src.nil?
 
         if (chance_file.end_with?("css") or chance_file.end_with?("js")) and src.length > 0
@@ -34,7 +34,7 @@ module SC
         src
       }.join("")
 
-      # Don't write empty files... but keep in mind that hte 
+      # Don't write empty files... but keep in mind that hte
       if src.length > 0
         if chance_file.end_with?("png")
           # Writing it as binary to avoid newline problems on Windows

data/lib/sproutcore/helpers/minifier.rb

@@ -104,6 +104,7 @@ module SC::Helpers
 
       if js_paths.length > 0
         js_paths.each {|p|
+          p = Pathname.new(p).relative_path_from(Pathname.new(Dir.getwd))
           command = %{java -Xmx512m -XX:MaxPermSize=256m -jar "#{SC.js_jar}" -o "#{p}" "#{p}" 2>&1}
           output = `#{command}`