sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/enhance.js

@@ -0,0 +1,177 @@
+module("Function#enhance");
+
+test("reopening and enhancing", function() {
+  var Klass = SC.Object.extend({
+    loudly: function(string) {
+      return string + this.get('exclaim');
+    },
+    exclaim: "!"
+  });
+
+  Klass.reopen({
+    loudly: function(original, string) {
+      return original(string.toUpperCase());
+    }.enhance()
+  });
+
+  var obj = Klass.create();
+  equals(obj.loudly("foo"), "FOO!");
+});
+
+test("subclassing and then enhancing the parent", function() {
+  var Klass = SC.Object.extend({
+    loudly: function(string) {
+      return string + this.get('exclaim');
+    },
+    exclaim: "!"
+  });
+
+  Klass.reopen({
+    loudly: function(original, string) {
+      return original(string.toUpperCase());
+    }.enhance()
+  });
+
+  SubKlass = Klass.extend({
+    loudly: function(string) {
+      return "ZOMG " + sc_super();
+    }
+  });
+
+  Klass.reopen({
+    loudly: function(original, string) {
+      return "OHAI: " + original(string);
+    }.enhance()
+  });
+
+  var obj = SubKlass.create();
+  equals(obj.loudly("foo"), "ZOMG OHAI: FOO!");
+});
+
+test("calling sc_super inside a reopened class", function() {
+  var Klass = SC.Object.extend({
+    loudly: function(string) {
+      return string + this.get('exclaim');
+    },
+    exclaim: "!"
+  });
+
+  Klass.reopen({
+    loudly: function(original, string) {
+      return original(string.toUpperCase());
+    }.enhance()
+  });
+
+  SubKlass = Klass.extend({});
+
+  SubKlass.reopen({
+    loudly: function(string) {
+      return "ZOMG " + sc_super();
+    }
+  });
+
+  SubKlass.reopen({
+    loudly: function(original, string) {
+      return "OHAI: " + original(string);
+    }.enhance()
+  });
+
+  Klass.reopen({
+    loudly: function(original, string) {
+      return "HAHA " + original(string);
+    }.enhance()
+  });
+
+  var obj = SubKlass.create();
+  equals(obj.loudly("foo"), "OHAI: ZOMG HAHA FOO!");
+});
+
+test("calling sc_super inside a reopened class", function() {
+  var Klass = SC.Object.extend();
+
+  var object = Klass.create({
+    loudly: function(string) {
+      return sc_super() + "!";
+    }
+  });
+
+  Klass.reopen({
+    loudly: function(string) {
+      return string.toUpperCase();
+    }
+  });
+
+  equals(object.loudly("foo"), "FOO!");
+});
+
+test("sc_super to a non-method", function() {
+  var Klass = SC.Object.extend({
+    wot: function() {
+      return sc_super();
+    }
+  });
+
+  var object = Klass.create(), error;
+
+  try {
+    object.wot();
+  } catch(e) {
+    error = e;
+  }
+
+  ok(error, "sc_super throws an error if there is no superclass method");
+});
+
+test("sc_super works in enhanced methods", function() {
+  var Klass = SC.Object.extend({
+    loudly: function(string) {
+      console.log(string);
+      return string.toUpperCase();
+    }
+  });
+
+  var SubKlass = Klass.extend({
+    loudly: function(string) {}
+  });
+
+  SubKlass.reopen({
+    loudly: function(original, string) {
+      return sc_super();
+    }.enhance()
+  });
+
+  var object = SubKlass.create({});
+
+  equals("TOM DAAALE IS A FOO", object.loudly("Tom DAAALE is a foo"), "sc_super should work in enhanced methods");
+});
+
+// When creating a new instance of a class or extending a class, SproutCore
+// keeps a record of the object that calls to sc_super should be looked up
+// on.
+//
+// Calls to sc_super are dynamic, which means that you can modify a class or
+// superclass of an object at runtime, and sc_super will correctly pick up
+// those changes. This is especially important for calls to reopen and
+// enhance.
+test("__sc_super__ semantics", function() {
+  var rootObject = SC.Object.create({});
+  ok(rootObject.__sc_super__ === SC.Object.prototype, "SproutCore remembers that new SC.Objects should super to SC.Object.prototype");
+
+  var basicObject = new SC.Object();
+  ok(basicObject.__sc_super__ === SC.Object.prototype, "SproutCore remembers that SC.Objects created by new SC.Object should super to SC.Object.prototype");
+
+  var Klass = SC.Object.extend({});
+  ok(Klass.__sc_super__ === SC.Object.prototype, "SproutCore remembers the original begetted prototype for subclasses");
+
+  var object = Klass.create({});
+  ok(object.__sc_super__ === Klass.prototype, "SproutCore remembers the original prototype for new instances");
+
+  var basicSubclassObject = new Klass();
+  ok(basicSubclassObject.__sc_super__ === Klass.prototype, "SproutCore remembers the original prototype for new instances created with new");
+
+  var SubKlass = Klass.extend({});
+  ok(SubKlass.__sc_super__ === Klass.prototype, "SproutCore remembers the original begetted prototype for custom subclasses");
+
+  SubKlass.reopen({});
+  ok(SubKlass.__sc_super__ === Klass.prototype, "Reopen doesn't break prototype recordkeeping");
+});

data/lib/frameworks/sproutcore/frameworks/table/views/table.js

@@ -30,7 +30,7 @@ SC.TableView = SC.ListView.extend(SC.TableDelegate, {
   
   childViews: "tableHeadView scrollView".w(),
   
-  scrollView: SC.ScrollView.design({
+  scrollView: SC.ScrollView.extend({
     isVisible: YES,
     layout: {
       left:   -1,
@@ -40,7 +40,7 @@ SC.TableView = SC.ListView.extend(SC.TableDelegate, {
     },
     hasHorizontalScroller: NO,
     borderStyle: SC.BORDER_NONE,
-    contentView: SC.View.design({
+    contentView: SC.View.extend({
     }),
     
     // FIXME: Hack.
@@ -65,9 +65,10 @@ SC.TableView = SC.ListView.extend(SC.TableDelegate, {
   layout: { left: 0, right: 0, top: 0, bottom: 0 },
   
   init: function() {
+    sc_super();
+
     window.table = this; // DEBUG
     //this._sctv_columnsDidChange();
-    return sc_super();
   },
   
   
@@ -194,7 +195,7 @@ SC.TableView = SC.ListView.extend(SC.TableDelegate, {
     @property
     @type SC.View
   */
-  tableHeadView: SC.TableHeadView.design({
+  tableHeadView: SC.TableHeadView.extend({
     layout: { top: 0, left: 0, right: 0 }
   }),
   

data/lib/frameworks/sproutcore/frameworks/table/views/table_header.js

@@ -37,12 +37,14 @@ SC.TableHeaderView = SC.View.extend({
   /**
     The view that is visible when the column is in drag mode.
   */
-  dragModeView: SC.ListView.design({
+  dragModeView: SC.ListView.extend({
     isVisible: NO,
     
     layout: { left: 0, right: 0, bottom: 0 },
     
     init: function() {
+      sc_super();
+
       var tableHeaderView = this.get('parentView');
       
       if (tableHeaderView) {
@@ -79,6 +81,8 @@ SC.TableHeaderView = SC.View.extend({
   // = For the column we look after, set up some observers. =
   // ========================================================
   init: function() {
+    sc_super();
+
     var column = this.get('column');
     column.addObserver('width',     this, '_scthv_layoutDidChange');
     column.addObserver('maxWidth',  this, '_scthv_layoutDidChange');
@@ -89,8 +93,6 @@ SC.TableHeaderView = SC.View.extend({
     // var tableContent = column.get('tableContent');
     // var columnContent = this._scthv_columnContentFromTableContent(tableContent);
     // this.set('content', columnContent);
-    
-    return sc_super();
   },
   
   /**

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

@@ -26,12 +26,18 @@ SC.AceTheme.buttonRenderDelegate = SC.RenderDelegate.create({
     @param {SC.RenderContext} context the render context instance
   */
   render: function(dataSource, context) {
-    var labelContent;
-    
+    var labelContent,
+        toolTip = dataSource.get('displayToolTip');
+
     context.setClass('icon', !!dataSource.get('icon') || NO);
     context.setClass('def', dataSource.get('isDefault') || NO);
     context.setClass('cancel', dataSource.get('isCancel') || NO);
     
+    if (toolTip) {
+      context.attr('title', toolTip);
+      context.attr('alt', toolTip);
+    }
+
     this.includeSlices(dataSource, context, SC.THREE_SLICE);
 
     // Create the inner label element that contains the text and, optionally,

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

@@ -25,11 +25,10 @@ $theme.menu {
       text-shadow: 0px -1px 1px rgba(0, 0, 0, .6);
     }
     
-    &.disabled a:hover, &.disabled.focus {
+    &.disabled a:hover, &.disabled.focus a:hover {
+      span { color: #A0A0A0; }
       text-shadow: none;
       background: transparent;
-      text-shadow: none;
-      color: black;
     }
     
     /* CHECKBOXES */

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

@@ -1,6 +1,6 @@
 @theme(sc-small-size) {
 
-$theme.segment {
+$theme.sc-segment-view {
 
   height: 18px;
   

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

@@ -1,6 +1,6 @@
 @theme(sc-regular-size) {
 
-$theme.segment {
+$theme.sc-segment-view {
 
   height: 24px;
   

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

@@ -1,6 +1,6 @@
 @theme(sc-large-size) {
 
-$theme.segment {
+$theme.sc-segment-view {
 
   height: 30px;
   

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

@@ -1,6 +1,6 @@
 @theme(sc-jumbo-size) {
 
-$theme.segment {
+$theme.sc-segment-view {
 
   height: 44px;
   

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

@@ -1,4 +1,4 @@
-$theme.segmented {
+$theme.sc-segmented-view {
   overflow: visible;
 
   .disabled {
@@ -7,7 +7,7 @@ $theme.segmented {
 
 }
 
-$theme.segmented $theme.segment {
+$theme.sc-segmented-view $theme.sc-segment-view {
   margin: 0px;
   background: none;
   border: 0px none;

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

@@ -2,11 +2,11 @@
   display: block;
 }
 
-.sc-theme .sc-segment:active, .sc-segment:focus {
+.sc-theme .sc-segment-view:active, .sc-segment-view:focus {
 	outline: none;
 }
 
-.sc-theme .sc-segment img.icon {
+.sc-theme .sc-segment-view img.icon {
 	position: relative;
 	vertical-align: middle;
 	top: -2px;
@@ -15,7 +15,7 @@
 	width: 16px;
 }
 
-.sc-theme .sc-segmented-view.disabled .sc-segment img.icon {
+.sc-theme .sc-segmented-view.disabled .sc-segment-view img.icon {
 	opacity: 0.5;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; 
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
@@ -24,7 +24,7 @@
 
 /* @group Layout */
 
-.sc-theme .sc-segmented-view .sc-segment {
+.sc-theme .sc-segmented-view .sc-segment-view {
 	display: inline-block;
 	top: 0;
 	height: 24px;
@@ -43,7 +43,7 @@
   border: none;
 }
 
-.sc-theme .sc-segmented-view .sc-segment {
+.sc-theme .sc-segmented-view .sc-segment-view {
 	padding-left: 11px;
 	padding-right: 0;
 	border: none;
@@ -51,13 +51,13 @@
 }
 
 
-.sc-theme .sc-segmented-view .sc-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view .sc-button-inner {
   padding-left: 0;
   padding-right: 11px;
   background:  transparent;
 }
 
-.sc-theme .sc-segmented-view .sc-segment label {
+.sc-theme .sc-segmented-view .sc-segment-view label {
   display: block;
   line-height: 24px;
   height:  24px;
@@ -71,11 +71,11 @@
 
 /* @group Normal */
 
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -814px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -789px;
 }
 
@@ -84,13 +84,13 @@
   text-shadow: #fff 0px 1px 0px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment,
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -839px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -864px;
 }
 
@@ -102,28 +102,28 @@
 
 /* @group Active */
 
-.sc-theme .sc-segmented-view .sc-segment.active.sc-last-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-last-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -939px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sc-first-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-first-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -913px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active label {
+.sc-theme .sc-segmented-view .sc-segment-view.active label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -889px;
   text-shadow: #fff 0px 1px 0px;
   text-shadow:  black 0px -1px 0px;
   color: white;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sc-middle-segment,
-.sc-theme .sc-segmented-view .sc-segment.active.sc-last-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-middle-segment,
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-last-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -964px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sc-middle-segment .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.active.sc-first-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-middle-segment .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.active.sc-first-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -989px;
 }
 
@@ -133,34 +133,34 @@
 
 /* @group Normal - Disabled */
 
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-last-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-last-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1064px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment.disabled,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-first-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment.disabled,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-first-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1038px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.disabled label,
-.sc-theme .sc-segmented-view.disabled .sc-segment label {
+.sc-theme .sc-segmented-view .sc-segment-view.disabled label,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -1014px;
   color: #999;
   text-shadow: none;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment.disabled,
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment.disabled,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-middle-segment,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-last-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment.disabled,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment.disabled,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-middle-segment,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-last-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1089px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-middle-segment .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sc-first-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-middle-segment .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sc-first-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1114px;
 }
 
@@ -170,27 +170,27 @@
 
 /* @group Selected */
 
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment.sel .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment.sel .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1190px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment.sel {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment.sel {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1164px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sel label {
+.sc-theme .sc-segmented-view .sc-segment-view.sel label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -1140px;
   text-shadow:  black 0px -1px 0px;
   color: white;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment.sel,
-.sc-theme .sc-segmented-view .sc-segment.sc-last-segment.sel {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment.sel,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-last-segment.sel {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1215px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sc-middle-segment.sel .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.sc-first-segment.sel .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sc-middle-segment.sel .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.sc-first-segment.sel .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1240px;
 }
 
@@ -198,34 +198,34 @@
 
 /* @group Selected - Disabled */
 
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-last-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-last-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-last-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-last-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1442px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-first-segment.disabled,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-first-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-first-segment.disabled,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-first-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1416px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sel.disabled label,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel label {
+.sc-theme .sc-segmented-view .sc-segment-view.sel.disabled label,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -1392px;
 	color: white;
 	text-shadow: none;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-middle-segment.disabled,
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-last-segment.disabled,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-middle-segment,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-last-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-middle-segment.disabled,
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-last-segment.disabled,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-middle-segment,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-last-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1467px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-middle-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.sel.sc-first-segment.disabled .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-middle-segment .sc-button-inner,
-.sc-theme .sc-segmented-view.disabled .sc-segment.sel.sc-first-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-middle-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.sel.sc-first-segment.disabled .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-middle-segment .sc-button-inner,
+.sc-theme .sc-segmented-view.disabled .sc-segment-view.sel.sc-first-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1492px;
 }
 
@@ -237,27 +237,27 @@
 
 /* @group Selected - Active */
 
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-last-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-last-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1316px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-first-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-first-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1290px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sel label {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel label {
   background: static_url('images/sc-theme-repeat-x.png') repeat-x left -1266px;
   text-shadow:  black 0px -1px 0px;
   color: white;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-middle-segment,
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-last-segment {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-middle-segment,
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-last-segment {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat left -1341px;
 }
 
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-middle-segment .sc-button-inner,
-.sc-theme .sc-segmented-view .sc-segment.active.sel.sc-first-segment .sc-button-inner {
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-middle-segment .sc-button-inner,
+.sc-theme .sc-segmented-view .sc-segment-view.active.sel.sc-first-segment .sc-button-inner {
   background: static_url('images/sc-theme-repeat-x.png') no-repeat right -1366px;
 }
 

data/lib/gen/html_app/Buildfile

@@ -0,0 +1,36 @@
+# ==========================================================================
+# Generator: APP
+# Copyright: ©2006-2011 Strobe Inc. and contributors
+#            portions copyright ©2009 Apple Inc.
+# ==========================================================================
+
+namespace :generator do
+  
+  # Require a project then make sure the build root is always the project 
+  # root.
+  task :prepare do
+    GENERATOR.requires! :target_project
+    
+    # if the target name has a slash in it, then we are trying to create a 
+    # nested target.  extract the final part (since this is the target name)
+    # and then set the build root to the parent target.
+    if GENERATOR.target_name && GENERATOR.target_name =~ /\//
+      parent_target_name = GENERATOR.target_name.split('/')
+      GENERATOR.target_name = parent_target_name.pop
+      
+      parent_target_name = parent_target_name * "/"
+      project = GENERATOR.target_project
+      
+      GENERATOR.parent_target_name = parent_target_name
+      GENERATOR.parent_target = project.target_for(parent_target_name)
+      GENERATOR.requires! :parent_target, :parent_target_name
+      
+      GENERATOR.build_root = GENERATOR.parent_target.source_root
+    
+    # otherwise just use project_root
+    else        
+      GENERATOR.build_root = GENERATOR.target_project.project_root
+    end
+  end
+  
+end

data/lib/gen/html_app/README

@@ -0,0 +1 @@
+Your application target is now ready to use!