sproutcore 1.6.0.beta.3-x86-mingw32 → 1.6.0.rc.1-x86-mingw32

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js

@@ -5,62 +5,60 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-
 SC.DateTime.mixin(
-  /** @scope SC.DateTime */ {
-  
+/** @scope SC.DateTime */ {
+
   /**
-    The localized day names. Add the key `'_SC.DateTime.dayNames'` and its
+    The localized day names. Add the key `_SC.DateTime.dayNames` and its
     value to your `strings.js` file to add support for another language than
     English.
 
     Default is evaluated on the `document.ready` event.
 
-    @property {Array}
+    @type Array
     @default '_SC.DateTime.dayNames'.loc().w()
   */
   dayNames: null,
-  
+
   /**
     The localized abbreviated day names. Add the key
-    `'_SC.DateTime.abbreviatedDayNames'` and its value to your `strings.js`
+    `_SC.DateTime.abbreviatedDayNames` and its value to your `strings.js`
     file to add support for another language than English.
 
     Default is evaluated on the `document.ready` event.
 
-    @property
-    @type {Array}
+    @type Array
     @default '_SC.DateTime.abbreviatedDayNames'.loc().w()
   */
   abbreviatedDayNames: null,
 
   /**
-    The localized month names. Add the key `'_SC.DateTime.monthNames'` and its
+    The localized month names. Add the key `_SC.DateTime.monthNames` and its
     value to your `strings.js` file to add support for another language than
     English.
 
     Default is evaluated on the `document.ready` event.
 
-    @property
-    @type {Array}
+    @type Array
     @default '_SC.DateTime.monthNames'.loc().w()
   */
   monthNames: null,
 
   /**
     The localized abbreviated month names. Add the key
-    `'_SC.DateTime.abbreviatedMonthNames'` and its value to your `strings.js`
+    `_SC.DateTime.abbreviatedMonthNames` and its value to your `strings.js`
     file to add support for another language than English.
 
     Default is evaluated on the `document.ready` event.
 
-    @property
-    @type {Array}
+    @type Array
     @default '_SC.DateTime.abbreviatedMonthNames'.loc().w()
   */
   abbreviatedMonthNames: null,
 
-  /** @private
+  /**
+    @private
+
     Called on `document.ready`.
 
     Because localizations may have been modified by an application developer,

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

@@ -33,7 +33,7 @@ SC.CollectionRowDelegate = {
     @type Number
     @default 18
   */
-  itemHeight: 18,
+  itemHeight: 24,
   
   /**
     This inserts empty space between rows that you can use for borders.

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

@@ -235,7 +235,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @default YES
   */
   localize: YES,
-  
+
   /**
     Whether or not this menu pane should accept the “current menu pane”
     designation when visible, which is the highest-priority pane when routing
@@ -246,7 +246,7 @@ SC.MenuPane = SC.PickerPane.extend(
     @default YES
   */
   acceptsMenuPane: YES,
-  
+
   /**
     Disable context menu.
     
@@ -383,7 +383,7 @@ SC.MenuPane = SC.PickerPane.extend(
   itemSeparatorKey: 'separator',
 
   /**
-    The name of the property that contains the target for the action that is 
+    The name of the property that contains the target for the action that is
     triggered when the user clicks the menu item.
 
     Note that this property is ignored if the menu item has a submenu.
@@ -457,14 +457,23 @@ SC.MenuPane = SC.PickerPane.extend(
   itemDisableMenuFlashKey: 'disableMenuFlash',
 
   /**
-    The array of keys used by `SC.MenuItemView` when inspecting your menu items
+    The name of the property that determines whether layerID should be applied to the item .
+
+    @type String
+    @default "layerId"
+    @commonTask Menu Item Properties
+  */
+  itemLayerIdKey: 'layerId',
+
+  /**
+    The array of keys used by SC.MenuItemView when inspecting your menu items
     for display properties.
 
     @private
     @isReadOnly
     @property Array
   */
-  menuItemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemSeparatorKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey', 'itemHeightKey', 'itemSubMenuKey', 'itemKeyEquivalentKey', 'itemTargetKey'],
+  menuItemKeys: ['itemTitleKey', 'itemValueKey', 'itemIsEnabledKey', 'itemIconKey', 'itemSeparatorKey', 'itemActionKey', 'itemCheckboxKey', 'itemShortCutKey', 'itemHeightKey', 'itemSubMenuKey', 'itemKeyEquivalentKey', 'itemTargetKey', 'itemLayerIdKey'],
 
   // ..........................................................
   // INTERNAL PROPERTIES
@@ -604,7 +613,7 @@ SC.MenuPane = SC.PickerPane.extend(
         exampleView = this.get('exampleView'), item, view,
         height, heightKey, separatorKey, defaultHeight, separatorHeight,
         menuHeight, menuHeightPadding, keyEquivalentKey, keyEquivalent,
-        keyArray, idx,
+        keyArray, idx, layerIdKey, propertiesHash,
         len;
 
     if (!items) return views; // return an empty array
@@ -613,7 +622,7 @@ SC.MenuPane = SC.PickerPane.extend(
     defaultHeight = this.get('itemHeight');
     keyEquivalentKey = this.get('itemKeyEquivalentKey');
     separatorHeight = this.get('itemSeparatorHeight');
-
+    layerIdKey = this.get('itemLayerIdKey');
     menuHeightPadding = Math.floor(this.get('menuHeightPadding')/2);
     menuHeight = menuHeightPadding;
 
@@ -626,15 +635,18 @@ SC.MenuPane = SC.PickerPane.extend(
       if (!height) {
         height = item.get(separatorKey) ? separatorHeight : defaultHeight;
       }
-      view = this._menuView.createChildView(exampleView, {
+      propertiesHash = {
         layout: { height: height, top: menuHeight },
         contentDisplayProperties: keyArray,
         content: item,
         parentMenu: this
-      });
+      };
+      if(item.get(layerIdKey)) {
+        propertiesHash.layerId = item.get(layerIdKey);
+      }
+      view = this._menuView.createChildView(exampleView, propertiesHash);
       views[idx] = view;
       menuHeight += height;
-
       keyEquivalent = item.get(keyEquivalentKey);
       if (keyEquivalent) {
         // if array, apply each one for this view
@@ -997,7 +1009,7 @@ SC.MenuPane = SC.PickerPane.extend(
   performKeyEquivalent: function(keyEquivalent, evt, fromVisibleControl) {
     //If menu is not visible
     if (!fromVisibleControl && !this.get('isVisibleInWindow')) return NO;
-    
+
     // Look for menu item that has this key equivalent
     var menuItem = this._keyEquivalents[keyEquivalent];
 

data/lib/frameworks/sproutcore/frameworks/desktop/resources/alert.css

@@ -0,0 +1,49 @@
+.sc-alert {
+  background: white;
+  .info {
+    position: relative ;
+    min-height: 48px;
+    padding: 20px 12px 58px 74px;
+    &.plain {
+      padding: 20px 12px 58px 16px;
+    }
+    .icon {
+      position: absolute;
+      left: 12px;
+      top: 14px;
+    }
+    .header {
+      background-color: transparent;
+      color: black;
+      margin: 0;
+      padding: 0;
+      font-size: 16px;
+      margin-bottom: 6px;
+      font-family: inherit ;
+    }
+    .description {
+      padding: 0;
+      margin: 6px 0px;
+      font-size: 12px;
+      margin-right: 20px;
+    }
+    .caption {
+      padding: 0;
+      margin: 6px 0px;
+      font-size: 11px;
+      margin-right: 20px;
+    }
+    .separator {
+      position: absolute;
+      width: 100%;
+      height: 2px;
+      left: 0px;
+      bottom: 50px;
+      background: #eaeaea ;
+    }
+  }
+}
+
+.sc-pane.sc-panel.sc-alert > div > .sc-view {
+  overflow: visible;
+}

data/lib/frameworks/sproutcore/frameworks/desktop/resources/disclosure.css

@@ -0,0 +1,20 @@
+/* SC.DisclosureView - sc-theme */
+
+.sc-button-view.sc-disclosure-view {
+  background: transparent;
+  .button {
+  	width: 16px;
+  	height: 16px;
+  	position: absolute;
+  	left: 0px;
+  	top: 0px;
+  }
+  .sc-button-label {
+  	position: absolute;
+  	left: 16px;
+  	top: 0;
+  	bottom: 0;
+  	right: 0;
+  	text-align: left;
+  }
+}

data/lib/frameworks/sproutcore/frameworks/desktop/{english.lproj → resources}/drag.css

@@ -1,4 +1,4 @@
-.sc-view.sc-ghost-view {
+.sc-ghost-view {
   opacity: 0.5;
 	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; 

data/lib/frameworks/sproutcore/frameworks/desktop/resources/icons.css

@@ -0,0 +1,214 @@
+/*
+  These built-in images/icons are available for use in your own application free of charge.  Just pass one of these CSS classnames as an image.
+*/
+
+/* @group 48-Pixel images/icons */
+
+.sc-icon-alert-48 {
+	width: 48px;
+	height: 48px;
+	@include slice("images/icons/sc-icon-alert-48.png");
+}
+
+.sc-icon-info-48 {
+	width: 48px;
+	height: 48px;
+	@include slice("images/icons/sc-icon-info-48.png");
+}
+
+.sc-icon-error-48 {
+	width: 48px;
+	height: 48px;
+	@include slice("images/icons/sc-icon-error-48.png");
+}
+
+
+/* @end */
+
+/* @group 24-Pixel images/icons */
+
+.sc-icon-tools-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-tools-24.png");
+}
+
+.sc-icon-bookmark-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-bookmark-24.png");
+}
+
+.sc-icon-info-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-info-24.png");
+}
+
+.sc-icon-help-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-help-24.png");
+}
+
+.sc-icon-alert-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-alert-24.png");
+}
+
+.sc-icon-left-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-left-24.png");
+}
+
+.sc-icon-right-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-right-24.png");
+}
+
+.sc-icon-up-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-up-24.png");
+}
+
+.sc-icon-down-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-down-24.png");
+}
+
+.sc-icon-undo-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-undo-24.png");
+}
+
+.sc-icon-redo-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-redo-24.png");
+}
+
+.sc-icon-group-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-group-24.png");
+}
+
+.sc-icon-user-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-user-24.png");
+}
+
+.sc-icon-cancel-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-cancel-24.png");
+}
+
+.sc-icon-options-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-options-24.png");
+}
+
+.sc-icon-folder-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-folder-24.png");
+}
+
+.sc-icon-trash-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-trash-24.png");
+}
+
+.sc-icon-document-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-document-24.png");
+}
+
+.sc-icon-favorite-24 {
+	width: 24px;
+	height: 24px;
+	@include slice("images/icons/sc-icon-favorite-24.png");
+}
+
+/* @end */
+
+/* @group 16-Pixel images/icons */
+
+.sc-icon-bookmark-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-bookmark-16.png");
+}
+
+.sc-icon-info-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-info-16.png");
+}
+
+.sc-icon-help-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-help-16.png");
+}
+
+.sc-icon-alert-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-alert-16.png");
+}
+
+.sc-icon-group-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-group-16.png");
+}
+
+.sc-icon-user-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-user-16.png");
+}
+
+.sc-icon-options-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-options-16.png");
+}
+
+.sc-icon-folder-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-folder-16.png");
+}
+
+.sc-icon-trash-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-trash-16.png");
+}
+
+.sc-icon-document-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-document-16.png");
+}
+
+.sc-icon-favorite-16 {
+	width: 16px;
+	height: 16px;
+	@include slice("images/icons/sc-icon-favorite-16.png");
+}
+
+/* @end */