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

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js

@@ -8,8 +8,6 @@
 /*global module test htmlbody ok equals same stop start */
 
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
-
 (function() {
   var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
 
@@ -63,7 +61,16 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
   // ..........................................................
   // TEST VIEWS
   //
-  module('SC.TabView ui', pane.standardSetup());
+  module('SC.TabView ui', {
+    setup: function(){
+      htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+      pane.standardSetup().setup();
+    },
+    teardown: function(){
+      pane.standardSetup().teardown();
+      clearHtmlbody();
+    }
+  });
 
   test("Check that all tabViews are visible", function() {
     ok(pane.view('tabView1').get('isVisibleInWindow'), 'tabView1.isVisibleInWindow should be YES');

data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js

@@ -524,7 +524,7 @@ SC.ButtonView = SC.View.extend(SC.Control, SC.Button,
             paddingLeft = parseInt(label.css('paddingLeft'),0),
             marginRight = parseInt(label.css('marginRight'),0),
             marginLeft = parseInt(label.css('marginLeft'),0);
-        if(marginRight=='auto') console.log(marginRight+","+marginLeft+","+paddingRight+","+paddingLeft);
+        if(marginRight=='auto') SC.Logger.log(marginRight+","+marginLeft+","+paddingRight+","+paddingLeft);
         if(!paddingRight && isNaN(paddingRight)) paddingRight = 0;
         if(!paddingLeft && isNaN(paddingLeft)) paddingLeft = 0;
         if(!marginRight && isNaN(marginRight)) marginRight = 0;

data/lib/frameworks/sproutcore/frameworks/desktop/views/file.js

@@ -97,7 +97,7 @@ SC.FileView = SC.FieldView.extend(
     
   */
   setFieldValue: function(newValue) {
-    console.log("SC.FileView: setFieldValue: %@ does nothing".fmt(newValue));
+    SC.Logger.log("SC.FileView: setFieldValue: %@ does nothing".fmt(newValue));
     //if (newValue) throw SC.$error('SC.FileView can not set the value of the file field');
   },
   

data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js

@@ -27,6 +27,7 @@ SC.LIST_ITEM_ACTION_EJECT = 'sc-list-item-cancel-eject';
   @since SproutCore 1.0
 */
 SC.ListItemView = SC.View.extend(
+    SC.InlineEditable,
     SC.Control,
 /** @scope SC.ListItemView.prototype */ {
 
@@ -604,13 +605,6 @@ SC.ListItemView = SC.View.extend(
     return YES ;
   },
 
-  /** @private
-   Set editing to true so edits will no longer be allowed.
-  */
-  inlineEditorWillBeginEditing: function(inlineEditor) {
-   this.set('isEditing', YES);
-  },
-
   /** @private
    Hide the label view while the inline editor covers it.
   */

data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js

@@ -251,6 +251,14 @@ SC.SelectFieldView = SC.FieldView.extend(
     } else return sc_super();
   },
    
+  touchStart: function(evt) {
+    return this.mouseDown(evt);
+  },
+  
+  touchEnd: function(evt) {
+    return this.mouseUp(evt);
+  },
+
   // when fetching the raw value, convert back to an object if needed...
   /** @private */
   getFieldValue: function() {
@@ -323,12 +331,14 @@ SC.SelectFieldView = SC.FieldView.extend(
     if (this.get('isEnabled') === false) this.$()[0].disabled = true;
     SC.Event.add(input, 'blur', this, this.fieldDidBlur);
     SC.Event.add(input, 'focus',this, this.fieldDidFocus);
+    SC.Event.add(input, 'change',this, this._field_fieldValueDidChange);
   },
   
   willDestroyLayer: function() {
     var input = this.$input();
     SC.Event.remove(input, 'focus', this, this.fieldDidFocus);
     SC.Event.remove(input, 'blur', this, this.fieldDidBlur);
+    SC.Event.remove(input, 'change',this, this._field_fieldValueDidChange);
   }
  
 });

data/lib/frameworks/sproutcore/frameworks/desktop/views/toolbar.js

@@ -38,8 +38,7 @@ SC.ANCHOR_BOTTOM_RIGHT = { bottom: 0, right: 0 };
 /** @class
 
   A toolbar view can be anchored at the top or bottom of the window to contain
-  your main toolbar buttons.  The default implementation assumes you may have
-  a leftView, rightView, and centerView, which will be properly laid out.
+  your main toolbar buttons.
 
   You can also override the layout property yourself or simply set the
   anchorLocation to SC.ANCHOR_TOP or SC.ANCHOR_BOTTOM.  This will configure
@@ -49,7 +48,7 @@ SC.ANCHOR_BOTTOM_RIGHT = { bottom: 0, right: 0 };
   @since SproutCore 1.0
 */
 SC.ToolbarView = SC.View.extend(
-  /** @scope SC.ToolbarView.prototype */ {
+/** @scope SC.ToolbarView.prototype */ {
 
   classNames: ['sc-toolbar-view'],
 
@@ -60,6 +59,7 @@ SC.ToolbarView = SC.View.extend(
     @property {String}
   */
   ariaRole: 'toolbar',
+
   /**
     Default anchor location.  This will be applied automatically to the
     toolbar layout if you set it.

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/collection_content.js

@@ -159,7 +159,7 @@ SC.CollectionContent = {
     @returns {void}
   */
   contentIndexExpand: function(view, content, idx) {
-    console.log('contentIndexExpand(%@, %@, %@)'.fmt(view,content,idx));
+    SC.Logger.log('contentIndexExpand(%@, %@, %@)'.fmt(view,content,idx));
   },
   
   /**
@@ -172,7 +172,7 @@ SC.CollectionContent = {
     @returns {void}
   */
   contentIndexCollapse: function(view, content, idx) {
-    console.log('contentIndexCollapse(%@, %@, %@)'.fmt(view,content,idx));
+    SC.Logger.log('contentIndexCollapse(%@, %@, %@)'.fmt(view,content,idx));
   }
     
 };

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js

@@ -125,10 +125,12 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(
     if (!this._optframe || !del) {
       throw "At least frame and delegate options are required for inline editor";
     }
-    
+
     this._originalValue = options.value;
-    if (SC.none(this._originalValue))
+
+    if (SC.none(this._originalValue)){
       this._originalValue = "";
+    }
     this._multiline = (options.multiline !== undefined) ? options.multiline : NO ;
     if (this._multiline) {
       this.set('isTextArea', YES);
@@ -141,15 +143,25 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(
     this.set('validator', options.validator) ;
     this.set('value', this._originalValue) ;
     //this.set('selectedRange', options.selectedRange || { start: this._originalValue.length, length: 0 }) ;
-    
+
     // add to window.
-    
+
+
+    // First try to find the pane in the options hash.
+    // If it's not available, ask the delegate for it.
     pane = options.pane;
+    if (!pane) {
+      pane = del.get('pane');
+    }
+    paneElem = pane.$()[0];
 
     layout.height = this._optframe.height;
     layout.width=this._optframe.width;
+
     tarLayout = options.layout;
-    paneElem = pane.$()[0];
+    if (!tarLayout) {
+      tarLayout = del.get('layout');
+    }
     if (this._optIsCollection && tarLayout.left) {
       layout.left=this._optframe.x-tarLayout.left-paneElem.offsetLeft-1;
       if(SC.browser.msie==7) layout.left--;

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inner_frame.js

@@ -12,8 +12,8 @@ SC.BEST_FIT = "fitBest";
 SC.BEST_FIT_DOWN_ONLY = "fitBestDown";
 
 /**
-  InnerFrame provides the innerFrameForSize function, which will return a frame for the give size adjusted
-  to fit within the view's own frame according to the align and scale properties.
+  InnerFrame provides the innerFrameForSize function, which will return a frame for the given size adjusted
+  to fit within the given outer size, according to the align and scale properties.
 
   View's that render images will find this mixin particularly useful for fitting their images.
 
@@ -29,28 +29,61 @@ SC.InnerFrame = {
     <tr><td>SC.ALIGN_BOTTOM_LEFT</td><td>SC.ALIGN_BOTTOM</td><td>SC.ALIGN_BOTTOM_RIGHT</td></tr>
     </table>
 
-    @property {SC.ALIGN_CENTER|SC.ALIGN_TOP_LEFT|SC.ALIGN_TOP|SC.ALIGN_TOP_RIGHT|SC.ALIGN_RIGHT|SC.ALIGN_BOTTOM_RIGHT|SC.BOTTOM|SC.BOTTOM_LEFT|SC.LEFT|Number}
+    @property {SC.ALIGN_CENTER|SC.ALIGN_TOP_LEFT|SC.ALIGN_TOP|SC.ALIGN_TOP_RIGHT|SC.ALIGN_RIGHT|SC.ALIGN_BOTTOM_RIGHT|SC.BOTTOM|SC.BOTTOM_LEFT|SC.LEFT}
     @default SC.ALIGN_CENTER
   */
   align: SC.ALIGN_CENTER,
 
-  innerFrameForSize: function(innerWidth, innerHeight) {
+  /**
+    Returns a frame (x, y, width, height) fitting the source size (sourceWidth & sourceHeight) within the
+    destination size (destWidth & destHeight) according to the align and scale properties.  This is essential to
+    positioning child views or elements within parent views or elements in elegant ways.
+
+    Examples using 'align' on a 10x10px inner size within a 20x20px outer size ('scale' = SC.SCALE_NONE):
+
+    <table>
+    <tr><th>'align'</th><th>innerFrameForSize(10, 10, 20, 20)</th></tr>
+    <tr><td>SC.ALIGN_TOP_LEFT</td><td>{x: 0, y: 0, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_TOP</td><td>{x: 5, y: 0, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_TOP_RIGHT</td><td>{x: 10, y: 0, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_LEFT</td><td>{x: 0, y: 5, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_CENTER</td><td>{x: 5, y: 5, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_RIGHT</td><td>{x: 10, y: 5, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_BOTTOM_LEFT</td><td>{x: 0, y: 10, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_BOTTOM</td><td>{x: 5, y: 10, width: 10, height: 10}</td></tr>
+    <tr><td>SC.ALIGN_BOTTOM_RIGHT</td><td>{x: 10, y: 10, width: 10, height: 10}</td></tr>
+    </table>
+
+
+    Examples using 'scale' on a 10x15px inner size within a 20x20px outer size ('align' = SC.ALIGN_CENTER):
+
+    <table>
+    <tr><th>'scale'</th><th>innerFrameForSize(10, 15, 20, 20)</th></tr>
+    <tr><td>SC.SCALE_NONE</td><td>{x: 5, y: 5, width: 10, height: 10}</td></tr>
+    <tr><td>SC.FILL</td><td>{x: 0, y: 0, width: 20, height: 20}</td></tr>
+    <tr><td>SC.FILL_PROPORTIONALLY</td><td>{x: 0, y: -5, width: 20, height: 30}</td></tr>
+    <tr><td>SC.BEST_FIT</td><td>{x: 3, y: 0, width: 13, height: 20}</td></tr>
+    <tr><td>SC.BEST_FIT_DOWN_ONLY</td><td>{x: 5, y: 3, width: 10, height: 15}</td></tr>
+    <tr><td>2.0</td><td>{x: 0, y: -5, width: 20, height: 30}</td></tr>
+    </table>
+
+    @returns {Object} the inner frame with properties: {x: value, y: value, width: value, height: value }
+   */
+
+  innerFrameForSize: function(sourceWidth, sourceHeight, destWidth, destHeight) {
     var align = this.get('align'),
         scale = this.get('scale'),
-        frame = this.get('frame') || { width: 0, height: 0 },  // frame is 'null' until rendered when useStaticLayout
-        frameWidth = frame.width,
-        frameHeight = frame.height,
         scaleX,
         scaleY,
         result;
 
     // Fast path
-    result = { x: 0, y: 0, width: frameWidth, height: frameHeight };
+    result = { x: 0, y: 0, width: destWidth, height: destHeight };
     if (scale === SC.FILL) return result;
 
     // Determine the appropriate scale
-    scaleX = frameWidth / innerWidth;
-    scaleY = frameHeight / innerHeight;
+    scaleX = destWidth / sourceWidth;
+    scaleY = destHeight / sourceHeight;
 
     switch (scale) {
       case SC.FILL_PROPORTIONALLY:
@@ -60,7 +93,7 @@ SC.InnerFrame = {
         scale = scaleX < scaleY ? scaleX : scaleY;
         break;
       case SC.BEST_FIT_DOWN_ONLY:
-        if ((innerWidth > frameWidth) || (innerHeight > frameHeight)) {
+        if ((sourceWidth > destWidth) || (sourceHeight > destHeight)) {
           scale = scaleX < scaleY ? scaleX : scaleY;
         } else {
           scale = 1.0;
@@ -78,51 +111,51 @@ SC.InnerFrame = {
         }
     }
 
-    innerWidth *= scale;
-    innerHeight *= scale;
-    result.width = Math.round(innerWidth);
-    result.height = Math.round(innerHeight);
+    sourceWidth *= scale;
+    sourceHeight *= scale;
+    result.width = Math.round(sourceWidth);
+    result.height = Math.round(sourceHeight);
 
     // Align the image within its frame
     switch (align) {
       case SC.ALIGN_LEFT:
         result.x = 0;
-        result.y = (frameHeight / 2) - (innerHeight / 2);
+        result.y = (destHeight / 2) - (sourceHeight / 2);
         break;
       case SC.ALIGN_RIGHT:
-        result.x = frameWidth - innerWidth;
-        result.y = (frameHeight / 2) - (innerHeight / 2);
+        result.x = destWidth - sourceWidth;
+        result.y = (destHeight / 2) - (sourceHeight / 2);
         break;
       case SC.ALIGN_TOP:
-        result.x = (frameWidth / 2) - (innerWidth / 2);
+        result.x = (destWidth / 2) - (sourceWidth / 2);
         result.y = 0;
         break;
       case SC.ALIGN_BOTTOM:
-        result.x = (frameWidth / 2) - (innerWidth / 2);
-        result.y = frameHeight - innerHeight;
+        result.x = (destWidth / 2) - (sourceWidth / 2);
+        result.y = destHeight - sourceHeight;
         break;
       case SC.ALIGN_TOP_LEFT:
         result.x = 0;
         result.y = 0;
         break;
       case SC.ALIGN_TOP_RIGHT:
-        result.x = frameWidth - innerWidth;
+        result.x = destWidth - sourceWidth;
         result.y = 0;
         break;
       case SC.ALIGN_BOTTOM_LEFT:
         result.x = 0;
-        result.y = frameHeight - innerHeight;
+        result.y = destHeight - sourceHeight;
         break;
       case SC.ALIGN_BOTTOM_RIGHT:
-        result.x = frameWidth - innerWidth;
-        result.y = frameHeight - innerHeight;
+        result.x = destWidth - sourceWidth;
+        result.y = destHeight - sourceHeight;
         break;
       default: // SC.ALIGN_CENTER || SC.ALIGN_MIDDLE
         if (align !== SC.ALIGN_CENTER && align !== SC.ALIGN_MIDDLE) {
           SC.Logger.warn("SC.InnerFrame: The align '%@' was not understood.  Align must be one of SC.ALIGN_CENTER/SC.ALIGN_MIDDLE, SC.ALIGN_LEFT, SC.ALIGN_RIGHT, SC.ALIGN_TOP, SC.ALIGN_BOTTOM, SC.ALIGN_TOP_LEFT, SC.ALIGN_TOP_RIGHT, SC.ALIGN_BOTTOM_LEFT or SC.ALIGN_BOTTOM_RIGHT.".fmt(align));
         }
-        result.x = (frameWidth / 2) - (innerWidth / 2);
-        result.y = (frameHeight / 2) - (innerHeight / 2);
+        result.x = (destWidth / 2) - (sourceWidth / 2);
+        result.y = (destHeight / 2) - (sourceHeight / 2);
     }
 
     return result;

data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js

@@ -68,7 +68,7 @@ SC.BaseTheme.canvasImageRenderDelegate = SC.RenderDelegate.create({
   update: function(dataSource, jquery) {
     var elem = jquery[0],
         image = dataSource.get('image'),
-        frame = dataSource.view.get('frame'),
+        frame = dataSource.get('frame'),
         frameWidth = frame.width,
         frameHeight = frame.height,
         innerFrame = dataSource.get('innerFrame'),

data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js

@@ -195,7 +195,7 @@ SC.Benchmark = {
     }
     var start = stat._starts.pop() ;
     if (!start) {
-      console.log('SC.Benchmark "%@" ended without a matching start.  No information was saved.'.fmt(key));
+      SC.Logger.log('SC.Benchmark "%@" ended without a matching start.  No information was saved.'.fmt(key));
       return ;
     }
 
@@ -503,7 +503,7 @@ SC.Benchmark = {
     // log each line to make this easier to read on an iPad
     var lines = this.report(key).split('\n'),
         len   = lines.length, idx;
-    for(idx=0;idx<len;idx++) console.log(lines[idx]);
+    for(idx=0;idx<len;idx++) SC.Logger.log(lines[idx]);
   },
 
   /**
@@ -512,12 +512,12 @@ SC.Benchmark = {
   */
   startProfile: function(key) {
     if (!this.enabled) return ;
-    if (console && console.profile) console.profile(key) ;
+    SC.Logger.profile(key) ;
   },
 
   endProfile: function(key) {
     if (!this.enabled) return ;
-    if (console && console.profileEnd) console.profileEnd(key) ;
+    SC.Logger.profileEnd(key) ;
   },
 
   // PRIVATE METHODS

data/lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js

@@ -40,6 +40,8 @@ SC.Cookie = SC.Object.extend({
   /**
     Amount of time until the cookie expires. Set to -1 in order to delete the cookie.
 
+    If passing an Integer, it is interpreted as a number of days.
+
     @property {Integer|SC.DateTime|Date}
   */
   expires: null,
@@ -100,32 +102,28 @@ SC.Cookie = SC.Object.extend({
         expires = this.get('expires'),
         path = this.get('path'),
         domain = this.get('domain'),
-        secure = this.get('secure');
+        secure = this.get('secure'),
+        output = '',
+        date;
 
-    var expiresOutput = '';
-    if (expires && (SC.typeOf(expires) === SC.T_NUMBER || (SC.DateTime && expires.get && expires.get('milliseconds')) || SC.typeOf(expires.toUTCString) === SC.T_FUNCTION)) {
-      var date;
-      if (SC.typeOf(expires) === SC.T_NUMBER) {
+    if (expires) {
+      if (typeof expires === SC.T_NUMBER) {
         date = new Date();
-        date.setTime(date.getTime()+(expires*24*60*60*1000));
-      }
-      else if (SC.DateTime && expires.get && expires.get('milliseconds')) {
+        date.setTime(date.getTime() + (expires*24*60*60*1000));
+      } else if (SC.DateTime && expires.get && expires.get('milliseconds')) {
         date = new Date(expires.get('milliseconds'));
-      }
-      else if (SC.typeOf(expires.toUTCString) === SC.T_FUNCTION) {
+      } else if (expires.toUTCString && expires.toUTCString.apply) {
         date = expires;
       }
 
-      if (date) {
-        expiresOutput = '; expires=' + date.toUTCString();
-      }
+      if (date) output = "; expires=" + date.toUTCString();
     }
 
-    var pathOutput = path ? '; path=' + path : '';
-    var domainOutput = domain ? '; domain=' + domain : '';
-    var secureOutput = secure ? '; secure' : '';
+    if (!SC.none(path)) output += '; path=' + path;
+    if (!SC.none(domain)) output += '; domain=' + domain;
+    if (secure === YES) output += '; secure';
 
-    document.cookie = [name, '=', encodeURIComponent(value), expiresOutput, pathOutput, domainOutput, secureOutput].join('');
+    document.cookie = name + "=" + encodeURIComponent(value) + output;
 
     return this;
   }
@@ -142,7 +140,7 @@ SC.Cookie.mixin(
     @returns SC.Cookie object containing name and value of cookie
   */
   find: function(name) {
-    if (document.cookie && document.cookie != '') {
+    if (document.cookie && document.cookie !== '') {
       var cookies = document.cookie.split(';');
       for (var i = 0; i < cookies.length; i++) {
         var cookie = String(cookies[i]).trim();
@@ -158,3 +156,16 @@ SC.Cookie.mixin(
   }
 
 });
+
+SC.CookieMonster = {
+  nomNomNom: function(cookie) {
+    var isCookie = SC.kindOf(cookie, SC.Cookie);
+    if (isCookie) {
+      SC.Logger.log("YUM!");
+      return cookie.destroy();
+    }
+    
+    SC.Logger.error("Y U PASS ME NO COOKIE? %@", cookie);
+    return NO;
+  }
+};