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

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/dock.css

@@ -22,6 +22,7 @@
   border: none;
 }
 
+.sc-theme .anchored .sc-collection-view .sc-collection-item.sel,
 .sc-theme.focus .anchored .sc-collection-view.focus .sc-collection-item.sel {
   background: #A4BE49;
   color: #000;
@@ -66,6 +67,10 @@
   border-top: 1px solid #333;
 }
 
+.anchored .sc-label-view {
+  color: #fff;
+}
+
 .anchored .sc-label-view.title {
   top: 12px !important;
 }

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/general.css

@@ -23,7 +23,6 @@
 /* General Styles
 ---------------------------------------------- */
 
-body.sc-theme,
 body.sc-theme > .sc-pane.sc-main{ 
   overflow: hidden;
   background: static_url('images/main-bg.png');

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/menu.css

@@ -21,11 +21,7 @@
   background: none;
 }
 
-.sc-panel.sc-menu .sc-menu-item a span {
-  color: #eaeaea;
-  text-shadow: 0 1px 0 #000;
-}
-
+.sc-panel.sc-menu .sc-menu-item a span,
 .sc-panel.sc-menu .sc-menu-item.focus a span {
   color: #eaeaea;
   text-shadow: 0 1px 0 #000;
@@ -40,13 +36,14 @@
 }
 
 /* Hide superfluous divs (css3 baby!) */
-.sc-panel.sc-menu .top-left-edge,
-.sc-panel.sc-menu .top-edge,
-.sc-panel.sc-menu .top-right-edge,
-.sc-panel.sc-menu .right-edge,
-.sc-panel.sc-menu .bottom-right-edge,
-.sc-panel.sc-menu .bottom-edge,
-.sc-panel.sc-menu .bottom-left-edge,
-.sc-panel.sc-menu .left-edge {
+.greenhouse.menu .panel-background .top-left,
+.greenhouse.menu .panel-background .top,
+.greenhouse.menu .panel-background .top-right,
+.greenhouse.menu .panel-background .left,
+.greenhouse.menu .panel-background .middle,
+.greenhouse.menu .panel-background .right,
+.greenhouse.menu .panel-background .bottom-left,
+.greenhouse.menu .panel-background .bottom,
+.greenhouse.menu .panel-background .bottom-right {
   display: none;
 }

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/modal.css

@@ -28,13 +28,14 @@
 }
 
 /* Hide superfluous divs (css3 baby!) */
-.sc-modal.for-sc-panel + .sc-panel .top-left-edge,
-.sc-modal.for-sc-panel + .sc-panel .top-edge,
-.sc-modal.for-sc-panel + .sc-panel .top-right-edge,
-.sc-modal.for-sc-panel + .sc-panel .right-edge,
-.sc-modal.for-sc-panel + .sc-panel .bottom-right-edge,
-.sc-modal.for-sc-panel + .sc-panel .bottom-edge,
-.sc-modal.for-sc-panel + .sc-panel .bottom-left-edge,
-.sc-modal.for-sc-panel + .sc-panel .left-edge {
+.greenhouse.panel .panel-background .top-left,
+.greenhouse.panel .panel-background .top,
+.greenhouse.panel .panel-background .top-right,
+.greenhouse.panel .panel-background .left,
+.greenhouse.panel .panel-background .middle,
+.greenhouse.panel .panel-background .right,
+.greenhouse.panel .panel-background .bottom-left,
+.greenhouse.panel .panel-background .bottom,
+.greenhouse.panel .panel-background .bottom-right {
   display: none;
 }

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/picker.css

@@ -7,7 +7,8 @@
 
 
 /* Pointers */
-.gh-picker.sc-pane.sc-panel.sc-palette.sc-picker .perfectBottom {
+
+.sc-pane.sc-panel.sc-picker.gh-picker .perfectBottom {
   width: 25px;
   height: 15px;
   top: -11px;
@@ -15,7 +16,7 @@
   margin-left: -13px;
   background: static_url('images/picker/pointer-top.png') no-repeat;
 }
-.gh-picker.sc-pane.sc-panel.sc-palette.sc-picker .perfectTop {
+.sc-pane.sc-panel.sc-picker.gh-picker .perfectTop {
   width: 21px;
   height: 11px;
   bottom: -11px;
@@ -23,14 +24,14 @@
   margin-left: -11px;
   background: static_url('images/picker/pointer-bottom.png') no-repeat;
 }
-.gh-picker.sc-pane.sc-panel.sc-palette.sc-picker .perfectLeft {
+.sc-pane.sc-panel.sc-picker.gh-picker .perfectLeft {
   width: 12px;
   height: 22px;
   right: -13px;
   top: 22%;
   background: static_url('images/picker/pointer-right.png') no-repeat;
 }
-.gh-picker.sc-pane.sc-panel.sc-palette.sc-picker .perfectRight {
+.sc-pane.sc-panel.sc-picker.gh-picker .perfectRight {
   width: 12px;
   height: 22px;
   left: -13px;
@@ -39,7 +40,12 @@
 }
 
 /* Edges */
-.gh-picker.sc-pane.sc-panel.sc-palette .top-left-edge {
+
+.gh-picker .panel-background div {
+  position: absolute;
+}
+
+.gh-picker .panel-background .top-left {
   width: 18px;
   height: 53px;
   top: 0px;
@@ -48,7 +54,7 @@
   background: static_url('images/picker/top-left.png') no-repeat;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .top-edge {
+.gh-picker .panel-background .top {
   left: 9px;
   right: 9px;
   height: 53px;
@@ -56,7 +62,7 @@
   background: static_url('images/picker/top.png') repeat-x;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .top-right-edge{
+.gh-picker .panel-background .top-right {
   width: 18px;
   height: 53px;
   top: 0px;
@@ -65,7 +71,7 @@
   background: static_url('images/picker/top-right.png') no-repeat;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .right-edge{
+.gh-picker .panel-background .right {
   top: 53px;
   bottom: 11px;
   width: 18px;
@@ -73,7 +79,7 @@
   background: static_url('images/picker/right.png') repeat-y;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .bottom-right-edge {
+.gh-picker .panel-background .bottom-right {
   width: 18px;
   height: 23px;
   bottom: -12px;
@@ -82,7 +88,7 @@
   background: static_url('images/picker/bottom-right.png') no-repeat;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .bottom-edge {
+.gh-picker .panel-background .bottom {
   left: 9px;
   right: 9px;
   height: 23px;
@@ -90,7 +96,7 @@
   background: static_url('images/picker/bottom.png') repeat-x;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .bottom-left-edge {
+.gh-picker .panel-background .bottom-left {
   width: 18px;
   height: 23px;
   bottom: -12px;
@@ -99,7 +105,7 @@
   background: static_url('images/picker/bottom-left.png') no-repeat;
 }
 
-.gh-picker.sc-pane.sc-panel.sc-palette .left-edge {
+.gh-picker .panel-background .left {
   top: 53px;
   bottom: 11px;
   width: 18px;
@@ -118,6 +124,7 @@
   border: none;
 }
 
+.sc-theme .sc-panel.sc-palette .sc-collection-view .sc-collection-item.sel,
 .sc-theme.focus .sc-panel.sc-palette .sc-collection-view.focus .sc-collection-item.sel {
   background: #A4BE49;
   color: #000;

data/lib/frameworks/sproutcore/apps/greenhouse/models/design.js

@@ -20,7 +20,7 @@ Greenhouse.Design = SC.Record.extend(
   defaults: SC.Record.attr(Object),
   
   canEdit: function(){
-    return this._parentRecord.get('canEdit');
-  }.property().cacheable()
+    return this.getPath('parentRecord.canEdit');
+  }.property('parentRecord').cacheable()
   
 }) ;

data/lib/frameworks/sproutcore/apps/greenhouse/states/modals.js

@@ -22,7 +22,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
       parallelStatechart: 'modals',
 
       newBindingPopup: function(item){
-        Greenhouse.createBindingPopup.set('newItem', item);
+        Greenhouse.setPath('modalStates.createBindingPopup.newItem', item);
         this.gotoState('createBindingPopup');
       },
 

data/lib/frameworks/sproutcore/apps/greenhouse/theme.js

@@ -16,10 +16,10 @@ SC.Theme.addTheme(Greenhouse.Theme);
 SC.defaultTheme = 'greenhouse';
 
 
-Greenhouse.Theme.Well.containerRenderDelegate = SC.Object.create({
+Greenhouse.Theme.wellRenderDelegate = SC.Object.create({
   name: 'container',
   
   render: function(dataSource, context) {},
   
   update: function() {}
-});
+});

data/lib/frameworks/sproutcore/apps/greenhouse/views/plist_item.js

@@ -27,7 +27,6 @@ Greenhouse.PlistItemView = SC.View.extend(SC.Control,
       key = this.get('contentValueKey');
       propertyKey = (key && content) ? (content.get ? content.get(key) : content[key]) : content ;
       value = content.get('value');
-      
       //do the label
       context.begin('label').addStyle({paddingLeft: 5}).text(propertyKey).end();
       if(value !== undefined){
@@ -38,6 +37,9 @@ Greenhouse.PlistItemView = SC.View.extend(SC.Control,
          this.renderCheckbox(context,content.get('value'));
          //context.begin('span').addStyle(this._valueStyle).text("bool").end();
        }
+       else if(value.isBinding){
+         context.begin('span').addStyle(this._valueStyle).text(value.displayValue()).end();
+       }
        else{
          value = value.toString();
          context.begin('span').addStyle(this._valueStyle).text(value).end();

data/lib/frameworks/sproutcore/frameworks/animation/core.js

@@ -62,7 +62,7 @@ SC.Animatable = {
 
   // properties that adjust should relay to style
   _styleProperties: [ "display", "transform" ],
-  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY opacity'.w(),
+  _layoutStyles: 'width height top bottom marginLeft marginTop left right zIndex minWidth maxWidth minHeight maxHeight centerX centerY opacity border borderTop borderRight borderBottom borderLeft'.w(),
 
   // we cache this dictionary so we don't generate a new one each time we make
   // a new animation. It is used so we can start the animations in order—

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -17,38 +17,49 @@ SC._detectBrowser = function(userAgent, language) {
   version = browser.version = (userAgent.match( /.*(?:rv|chrome|webkit|opera|ie)[\/: ](.+?)([ \);]|$)/ ) || [])[1];
   webkitVersion = (userAgent.match( /webkit\/(.+?) / ) || [])[1];
 
-  // Platforms -- these should probably be moved to another object
-  // We test for these first because it is helpful when determining browsers below
-  browser.windows = !!/windows/.test(userAgent);
-  browser.mac = !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent));
-  browser.iOS = !!/iphone|ipod|ipad/.test(userAgent);
-  browser.android = !!/android/.test(userAgent);
-
-  // IE-based browsers
+  browser.windows = browser.isWindows = !!/windows/.test(userAgent);
+  browser.mac = browser.isMac = !!/macintosh/.test(userAgent) || (/mac os x/.test(userAgent) && !/like mac os x/.test(userAgent));
+  browser.iPhone = browser.isiPhone = !!/iphone/.test(userAgent);
+  browser.iPod = browser.isiPod = !!/ipod/.test(userAgent);
+  browser.iPad = browser.isiPad = !!/ipad/.test(userAgent);
+  browser.iOS = browser.isiOS = browser.iPhone || browser.iPod || browser.iPad;
+  browser.android = browser.isAndroid = !!/android/.test(userAgent);
+
   browser.opera = /opera/.test(userAgent) ? version : 0;
+  browser.isOpera = !!browser.opera;
+
   browser.msie = /msie/.test(userAgent) && !browser.opera ? version : 0;
+  browser.isIE = !!browser.msie;
+  browser.isIE8OrLower = !!(browser.msie && parseInt(browser.msie, 10) <= 8);
 
-  // Mozilla browsers
   browser.mozilla = /mozilla/.test(userAgent) && !/(compatible|webkit|msie)/.test(userAgent) ? version : 0;
+  browser.isMozilla = !!browser.mozilla;
 
-  // Webkit-based browsers
   browser.webkit = /webkit/.test(userAgent) ? webkitVersion : 0;
+  browser.isWebkit = !!browser.webkit;
+
   browser.chrome = /chrome/.test(userAgent) ? version: 0;
+  browser.isChrome = !!browser.chrome;
+
   browser.mobileSafari = /apple.*mobile.*safari/.test(userAgent) && browser.iOS ? webkitVersion : 0;
-  browser.iPadSafari = /iPad/.test(userAgent) && browser.iOS ? webkitVersion : 0;
-  browser.iPhoneSafari = /iPhone/.test(userAgent) && browser.iOS ? webkitVersion : 0;
-  
-  // this is a stupid test -- anything that aren't the following doesn't necessarily mean Safari
+  browser.isMobileSafari = !!browser.mobileSafari;
+
+  browser.iPadSafari = browser.iPad && browser.isMobileSafari ? webkitVersion : 0;
+  browser.isiPadSafari = !!browser.iPadSafari;
+
+  browser.iPhoneSafari = browser.iPhone && browser.isMobileSafari ? webkitVersion : 0;
+  browser.isiPhoneSafari = !!browser.iphoneSafari;
+
+  browser.iPodSafari = browser.iPod && browser.isMobileSafari ? webkitVersion : 0;
+  browser.isiPodSafari = !!browser.iPodSafari;
+
   browser.safari = browser.webkit && !browser.chrome && !browser.iOS && !browser.android ? webkitVersion : 0;
+  browser.isSafari = !!browser.safari;
 
-  // Language
   browser.language = language.split('-', 1)[0];
   
-  
-  browser.isIE8OrLower = !!(browser.msie && parseInt(browser.msie,10) <= 8);
-  
-  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : browser.mobileSafari ? 'mobile-safari' : 'unknown' ;
-  return browser ;
+  browser.current = browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.chrome ? 'chrome' : browser.safari ? 'safari' : browser.opera ? 'opera' : browser.mobileSafari ? 'mobile-safari' : 'unknown';
+  return browser;
 };
 
 SC.browser = SC._detectBrowser();

data/lib/frameworks/sproutcore/frameworks/bootstrap/tests/system/browser.js

@@ -10,6 +10,9 @@ var cleanBrowser = {
   windows: 0,
   mac: 0,
   iOS: 0,
+  iPhone: 0,
+  iPod: 0,
+  iPad: 0,
   android: 0,
   opera: 0,
   msie: 0,
@@ -17,6 +20,9 @@ var cleanBrowser = {
   webkit: 0,
   chrome: 0,
   mobileSafari: 0,
+  iPadSafari: 0,
+  iPodSafari: 0,
+  iPhoneSafari: 0,
   safari: 0
 };
 
@@ -133,27 +139,27 @@ test("Firefox Windows 4.0b7pre", function() {
 
 test("Mobile Safari - iOS 3.2.2 iPad", function() {
   var userAgent = "Mozilla/5.0 (iPad; U; CPU OS 3_2_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B500 Safari/531.21.10";
-  testUserAgent(userAgent, { version: '531.21.10', webkit: '531.21.10', mobileSafari: '531.21.10', current: 'mobile-safari', iOS: true });
+  testUserAgent(userAgent, { version: '531.21.10', webkit: '531.21.10', mobileSafari: '531.21.10', iPadSafari: '531.21.10', current: 'mobile-safari', iOS: true, iPad: true });
 });
 
-test("Mobile Safari - iOS 4.0", function() {
+test("Mobile Safari - iOS 4.0 iPhone", function() {
   var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', current: 'mobile-safari', iOS: true });
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', iPhoneSafari: '532.9', current: 'mobile-safari', iOS: true, iPhone: true });
 });
 
-test("Mobile Safari - iOS 4.1", function() {
+test("Mobile Safari - iOS 4.1 iPhone", function() {
   var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', current: 'mobile-safari', iOS: true });
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', mobileSafari: '532.9', iPhoneSafari: '532.9', current: 'mobile-safari', iOS: true, iPhone: true });
 });
 
-test("iOS WebView - iOS 4.1", function() {
+test("iOS WebView - iOS 4.1 iPhone", function() {
   var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Mobile/8B117";
-  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', current: 'unknown', iOS: true });
+  testUserAgent(userAgent, { version: '532.9', webkit: '532.9', current: 'unknown', iOS: true, iPhone: true });
 });
 
-test("iOS WebView - iOS 4.2.1", function() {
+test("iOS WebView - iOS 4.2.1 iPhone", function() {
   var userAgent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile/8C14";
-  testUserAgent(userAgent, { version: '533.17.9', webkit: '533.17.9', current: 'unknown', iOS: true });
+  testUserAgent(userAgent, { version: '533.17.9', webkit: '533.17.9', current: 'unknown', iOS: true, iPhone: true });
 });
 
 test("Unknown", function() {

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/responder_context.js

@@ -128,7 +128,7 @@ SC.ResponderContext = {
 
     if (this._locked) {
       if (trace) {
-        console.log('%@: AFTER ACTION: makeFirstResponder => %@'.fmt(this, this.responderNameFor(responder)));
+        SC.Logger.log('%@: AFTER ACTION: makeFirstResponder => %@'.fmt(this, this.responderNameFor(responder)));
       }
 
       this._pendingResponder = responder;
@@ -136,7 +136,7 @@ SC.ResponderContext = {
     }
 
     if (trace) {
-      console.log('%@: makeFirstResponder => %@'.fmt(this, this.responderNameFor(responder)));
+      SC.Logger.log('%@: makeFirstResponder => %@'.fmt(this, this.responderNameFor(responder)));
     }
 
     if (responder) responder.set("becomingFirstResponder", YES);
@@ -233,7 +233,7 @@ SC.ResponderContext = {
 
     this._locked = YES;
     if (trace) {
-      console.log("%@: begin action '%@' (%@, %@)".fmt(this, action, sender, context));
+      SC.Logger.log("%@: begin action '%@' (%@, %@)".fmt(this, action, sender, context));
     }
 
     if (!handled && !working && this.tryToPerform) {
@@ -251,8 +251,8 @@ SC.ResponderContext = {
     }
 
     if (trace) {
-      if (!handled) console.log("%@:  action '%@' NOT HANDLED".fmt(this,action));
-      else console.log("%@: action '%@' handled by %@".fmt(this, action, this.responderNameFor(working)));
+      if (!handled) SC.Logger.log("%@:  action '%@' NOT HANDLED".fmt(this,action));
+      else SC.Logger.log("%@: action '%@' handled by %@".fmt(this, action, this.responderNameFor(working)));
     }
 
     this._locked = NO ;

data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js

@@ -654,7 +654,7 @@ SC.Pane = SC.View.extend(SC.ResponderContext,
   init: function() {
     // Backwards compatibility
     if (this.hasTouchIntercept === YES) {
-      console.warn("Do not set hasTouchIntercept directly. Use wantsTouchIntercept instead.");
+      SC.Logger.warn("Do not set hasTouchIntercept directly. Use wantsTouchIntercept instead.");
       this.hasTouchIntercept = SC.platform.touch;
     }
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/browser.js

@@ -5,54 +5,32 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/** Detects the current browser type. Borrowed from jQuery + prototype */
-SC.mixin(SC.browser, (function() {
-  var viewport  = window.innerWidth,
-      browser = SC.browser,
-      standalone = navigator.standalone;
-  
-  // Add more SC-like descriptions...
-  SC.extend(browser, /** @scope SC.browser */ {
-    
-    isOpera: !!browser.opera,
-    isIE: !!browser.msie,
-    isSafari: !!browser.safari,
-    isMobileSafari: (!!browser.mobileSafari || !!browser.standalone),
-    isMozilla: !!browser.mozilla,
-    isWindows: !!browser.windows,
-    isMac: !!browser.mac,
-    isAndroid: !!browser.android,
-    isiPhone: ((!!browser.mobileSafari || !!browser.standalone) && (viewport == 320 || viewport == 480)),
+SC.mixin(SC.browser,
+/** @scope SC.browser */ {
 
-    /**
-      The current browser name.  This is useful for switch statements. */
-    current: browser.msie ? 'msie' : browser.mozilla ? 'mozilla' : browser.safari ? 'safari' : browser.opera ? 'opera' : 'unknown',
-    
-    /**
-      Pass any number of arguments, and this will check them against the browser
-      version split on ".".  If any of them are not equal, return the inequality.
-      If as many arguments as were passed in are equal, return 0.  If something
-      is NaN, return 0. */
-    compareVersion: function () {
-      if (this._versionSplit === undefined) {
-        var coerce = function (part) {
-          return Number(part.match(/^[0-9]+/));
-        };
-        this._versionSplit = SC.A(this.version.split('.')).map(coerce);
-      }
+  /**
+    Pass any number of arguments, and this will check them against the browser
+    version split on ".".  If any of them are not equal, return the inequality.
+    If as many arguments as were passed in are equal, return 0.  If something
+    is NaN, return 0.
+  */
+  compareVersion: function () {
+    if (this._versionSplit === undefined) {
+      var coerce = function (part) {
+        return Number(part.match(/^[0-9]+/));
+      };
+      this._versionSplit = SC.A(this.version.split('.')).map(coerce);
+    }
 
-      var tests = SC.A(arguments).map(Number);
-      for (var i = 0; i < tests.length; i++) {
-        var check = this._versionSplit[i] - tests[i];
-        if (isNaN(check)) return 0;
-        if (check !== 0) return check;
-      }
-      
-      return 0;
+    var tests = SC.A(arguments).map(Number);
+    for (var i = 0; i < tests.length; i++) {
+      var check = this._versionSplit[i] - tests[i];
+      if (isNaN(check)) return 0;
+      if (check !== 0) return check;
     }
     
-  }) ;
-  return browser ;
+    return 0;
+  }
 
-})() );
+});