sproutcore 1.0.1049.pre.2 → 1.4.0.rc

data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js

@@ -224,18 +224,11 @@ SC.RecordAttribute = SC.Object.extend(
     } 
 
     nvalue = value = record.readAttribute(attrKey);
-    if (SC.none(value) && (value = this.get('defaultValue')) && record.get('status') & SC.Record.READY_NEW) {
+    if (SC.none(value) && (value = this.get('defaultValue'))) {
        if (typeof value === SC.T_FUNCTION) {
-        nvalue = this.defaultValue(record, key, this);
+        value = this.defaultValue(record, key, this);
         // write default value so it doesn't have to be executed again
         if ((nvalue !== value)  &&  record.get('store').readDataHash(record.get('storeKey'))) {
-          value = nvalue;
-          record.writeAttribute(attrKey, value, true);
-        }
-      } else {
-        if (SC.kindOf(value, SC.DateTime)) {
-          record.writeAttribute(attrKey, value.toISO8601(), true);
-        } else {
           record.writeAttribute(attrKey, value, true);
         }
       }
@@ -400,10 +393,9 @@ SC.RecordAttribute.registerTransform(Date, {
 
   /** @private - convert a string to a Date */
   to: function(str, attr) {
-    if (str === null) {
+    if (str === null)
       return null;
-    }
-    
+
     var ret ;
     str = str.toString() || '';
     

data/lib/frameworks/sproutcore/frameworks/datastore/models/single_attribute.js

@@ -56,7 +56,7 @@ SC.SingleAttribute = SC.RecordAttribute.extend(
         inverseKey, isMaster, oldRec, attr, ret, nvalue;
     
     // WRITE
-    if (newRec !== undefined) {
+    if (newRec !== undefined && this.get('isEditable')) {
 
       // can only take other records or null
       if (newRec && !SC.kindOf(newRec, SC.Record)) {

data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/list_item.css

@@ -60,41 +60,17 @@
 
 /* @group Icon */
 
-.sc-list-item-view img.icon,
-.sc-list-item-view img.right-icon {
-	margin-top: -9px;
-	position: absolute;
-	top: 50%;
-}
-
 .sc-list-item-view img.icon {
+	position: absolute ;
 	left: 5px;
+	top: 50%;
+	margin-top: -9px;
 }
 
 .sc-list-item-view.has-checkbox img.icon {
 	left: 25px;
 }
 
-.sc-list-item-view img.right-icon {
-  right: 5px;
-}
-
-.sc-list-item-view.has-count img.right-icon {
-  right: 32px;
-}
-.sc-list-item-view.has-count.two-digit img.right-icon {
-  right: 38px;
-}
-.sc-list-item-view.has-count.three-digit img.right-icon {
-  right: 44px;
-}
-.sc-list-item-view.has-count.four-digit img.right-icon {
-  right: 50px;
-}
-.sc-list-item-view.has-count.five-digit img.right-icon {
-  right: 56px;
-}
-
 /* @end */
 
 /* @group Checkbox */

data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/touch-scroller.css

@@ -0,0 +1,196 @@
+/* Track */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .track {
+  background: none;
+  display: none;
+}
+
+/* Cap */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .cap,
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .endcap {
+  background: none;
+  display: none;
+}
+
+/* Buttons */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .button-top {
+  background: none;
+  display: none;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .button-bottom {
+  background: none;
+  display: none;
+}
+
+/* Active */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .button-top:active {
+  background: none;
+  display: none;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .button-bottom:active {
+  background: none;
+  display: none;
+}
+
+/* Thumb */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb {
+  position: absolute;
+  opacity: 0.5;
+  -webkit-transform: translateZ(0px);
+  width: 16px;
+  height: 1044px;
+  overflow: hidden;
+}
+
+
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb-top {
+  -webkit-border-top-left-radius: 4px;
+  -webkit-border-top-right-radius: 4px;
+  position: absolute;
+  width: 5px;
+  top: 0px;
+  left: 5px;
+  height: 10px;
+  background: black;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb-clip {
+  position: absolute;
+  overflow:hidden;
+  height: 1034px;
+  width: 5px;
+  top: 10px;
+  left: 5px;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb-inner {
+  -webkit-transform: translate3d(0px,0px,0px);
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  width: 5px;
+  height: 1034px;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb-center {
+  position: absolute;
+  width: 5px;
+  left: 0px;
+  top: 0px;
+  height: 1024px;
+  background: black;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-vertical .thumb-bottom {
+  -webkit-border-bottom-left-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  position: absolute;
+  width: 5px;
+  top: 1024px;
+  left: 0px;
+  height: 10px;
+  background: black;
+}
+
+
+
+
+
+/* Track */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .track {
+  background: none;
+  display: none;
+}
+
+/* Cap */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .cap,
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .endcap {
+  background: none;
+  display: none;
+}
+
+/* Buttons */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .button-top {
+  background: none;
+  display: none;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .button-bottom {
+  background: none;
+  display: none;
+}
+
+/* Active */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .button-top:active {
+  background: none;
+  display: none;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .button-bottom:active {
+  background: none;
+  display: none;
+}
+
+/* Thumb */
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb {
+  position: absolute;
+  opacity: 0.5;
+  -webkit-transform: translateZ(0px);
+  height: 16px;
+  width: 1044px;
+  overflow: hidden;
+}
+
+
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb-top {
+  -webkit-border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  position: absolute;
+  width: 10px;
+  top: 5px;
+  left: 0px;
+  height: 5px;
+  background: black;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb-clip {
+  position: absolute;
+  overflow:hidden;
+  width: 1034px;
+  height: 5px;
+  left: 10px;
+  top: 5px;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb-inner {
+  -webkit-transform: translate3d(0px,0px,0px);
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  height: 5px;
+  width: 1034px;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb-center {
+  position: absolute;
+  height: 5px;
+  top: 0px;
+  left: 0px;
+  width: 1024px;
+  background: black;
+}
+
+.sc-theme .sc-view.sc-touch-scroller-view.sc-horizontal .thumb-bottom {
+  -webkit-border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  position: absolute;
+  height: 5px;
+  left: 1024px;
+  top: 0px;
+  width: 10px;
+  background: black;
+}
+

data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js

@@ -270,16 +270,25 @@ SC.CollectionFastPath = {
           it is not used). As such, use sparingly.
   */
   itemViewForContentIndex: function(index) {
-    var view = this._indexMap[index];
+    var content = this.get("content");
+    if (!content) return;
+    
+    var item = content.objectAt(index);
+    if (!item) return null;
+    
+    var exampleView = this.exampleViewForItem(item, index),
+        view = this._indexMap[index];
+    
+    if (view && view.createdFromExampleView !== exampleView) {
+      this.removeItemView(view);
+      this.unmapView(item, index);
+      view = null;
+    }
+    
     if (!view) {
-      var content = this.get("content"), item;
-      item = content.objectAt(index);
-      if (!item) return null;
-      
-      // get example view and create item view
-      var exampleView = this.exampleViewForItem(item, index);
       view = this.addItemView(exampleView, item, index);
     }
+    
     return view;
   },
   
@@ -622,7 +631,6 @@ SC.CollectionFastPath = {
   */
   updateItemView: function(current, exampleView, object, index) {
     if (!current.get("layerIsCacheable") || current.createdFromExampleView !== exampleView) {
-      console.error("BAD UPDATE");
       // unmap old and remove
       this.unmapView(current, index);
       delete this._indexMap[index];
@@ -651,6 +659,9 @@ SC.CollectionFastPath = {
     The fast-path that computes a special 
   */
   touchScrollDidChange: function(left, top) {
+    // prevent getting too many in close succession.
+    if (Date.now() - this._lastTouchScrollTime < 25) return;
+    
     var clippingFrame = this.get('clippingFrame');
     
     var cf = this._inScrollClippingFrame || (this._inScrollClippingFrame = {x: 0, y: 0, width: 0, height: 0});
@@ -676,6 +687,8 @@ SC.CollectionFastPath = {
     }
     this._lastNowShowing = r;
     this.reloadIfNeeded(r, YES);
+    
+    this._lastTouchScrollTime = Date.now();
   }
   
 };

data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js

@@ -236,7 +236,7 @@ SC.AlertPane = SC.PanelPane.extend({
             localize: YES,
             titleMinWidth: 64,
             layout: { right: 5, height: 'auto', width: 'auto', bottom: 0 },
-            controlStyle: 'capsule',
+            theme: 'capsule',
             title: "Cancel", 
             isCancel: YES,
             action: "dismiss",
@@ -249,7 +249,7 @@ SC.AlertPane = SC.PanelPane.extend({
             localize: YES,
             titleMinWidth: 64,
             layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-            controlStyle: 'capsule',
+            theme: 'capsule',
             title: "OK", 
             isDefault: YES,
             action: "dismiss"
@@ -266,7 +266,7 @@ SC.AlertPane = SC.PanelPane.extend({
             localize: YES,
             titleMinWidth: 64,
             layout: { left: 0, height: 'auto', width: 'auto', bottom: 0 },
-            controlStyle: 'capsule',
+            theme: 'capsule',
             title: "Extra", 
             action: "dismiss",
             isVisible: NO

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -224,6 +224,11 @@ SC.MenuPane = SC.PickerPane.extend(
     @default YES
   */
   acceptsMenuPane: YES,
+  
+  /**
+    Disable context menu.
+  */
+  isContextMenuEnabled: NO,
 
   // ..........................................................
   // METHODS
@@ -247,7 +252,6 @@ SC.MenuPane = SC.PickerPane.extend(
     if (anchorViewOrElement) {
       anchor = anchorViewOrElement.isView ? anchorViewOrElement.get('layer') : anchorViewOrElement;
     }
-
     this.set('anchorElement',anchor) ;
     this.set('anchor',anchorViewOrElement);
     if (preferMatrix) this.set('preferMatrix',preferMatrix) ;
@@ -261,15 +265,7 @@ SC.MenuPane = SC.PickerPane.extend(
     this.set('defaultResponder', this);
     this.endPropertyChanges();
 
-    // IE7 has a bug where, intermittently, appending a menu pane will cause
-    // the other panes to blank out, until the user interacts with the window.
-    // If we wait until the end of the RunLoop to append the pane, IE redraws
-    // correctly.
-    if (parseInt(SC.browser.msie, 0)===7) {
-      this.invokeLast(this.append);
-    } else {
-      this.append();
-    }
+    this.append();
   },
 
   /**
@@ -441,7 +437,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @isReadOnly
     @property Array
   */
-  menuItemKeys: 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemSeparatorKey itemActionKey itemCheckboxKey itemShortCutKey itemBranchKey itemHeightKey itemSubMenuKey itemKeyEquivalentKey itemTargetKey'.w(),
+  menuItemKeys: 'itemTitleKey itemValueKey itemIsEnabledKey itemIconKey itemSeparatorKey itemActionKey itemCheckboxKey itemShortCutKey itemHeightKey itemSubMenuKey itemKeyEquivalentKey itemTargetKey'.w(),
 
   // ..........................................................
   // INTERNAL PROPERTIES
@@ -1005,6 +1001,9 @@ SC.MenuPane = SC.PickerPane.extend(
   },
 
   performKeyEquivalent: function(keyEquivalent) {
+    //If menu is not visible
+    if (!this.get('isVisibleInWindow')) return NO;
+    
     // Look for menu item that has this key equivalent
     var menuItem = this._keyEquivalents[keyEquivalent];
 
@@ -1014,18 +1013,15 @@ SC.MenuPane = SC.PickerPane.extend(
       return YES;
     }
 
-    // If escape key was pressed and no menu item handled it,
-    // close the menu pane.
-    if (keyEquivalent === 'escape') {
+    // If escape key or the enter key was pressed and no menu item handled it,
+    // close the menu pane and return YES that the event was handled
+    if (keyEquivalent === 'escape'|| keyEquivalent === 'return') {
       this.remove();
       return YES;
     }
-    //If a menu is visible and you hit enter
-    // it shouldn't go down to other responders.
-    if (keyEquivalent === 'return') {
-      return YES;
-    }
+
     return NO;
+
   },
 
   selectMenuItemForString: function(buffer) {