sproutcore 1.0.1009 → 1.0.1024

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

@@ -166,7 +166,7 @@ SC.ListItemView = SC.View.extend(
   */
   contentIsEditable: function() {
     var content = this.get('content');
-    return content && (content.get('isEditable')!==NO);
+    return content && (content.get ? content.get('isEditable')!==NO : NO);
   }.property('content').cacheable(),
   
   /**
@@ -192,7 +192,7 @@ SC.ListItemView = SC.View.extend(
     // outline level wrapper
     working = context.begin("div").addClass("sc-outline");
     if (level>=0 && indent>0) working.addStyle("left", indent*(level+1));
-    
+
     // handle disclosure triangle
     value = this.get('disclosureState');
     if (value !== SC.LEAF_NODE) {

data/frameworks/sproutcore/frameworks/desktop/views/menu_item.js

@@ -266,7 +266,7 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
       className = '' ;
     } else {
       className = image ;
-      url = sc_static('blank.gif') ; 
+      url = SC.BLANK_IMAGE_URL; 
     }
     // generate the img element...
     context.begin('img').addClass('image').addClass(className).attr('src', url).end() ;
@@ -282,7 +282,7 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
   */
 
   renderLabel: function(context, label) {
-    context.push("<span class='value'>"+label+"</span>") ;
+    context.push("<span class='value ellipsis'>"+label+"</span>") ;
   },
   
   /** 
@@ -297,7 +297,7 @@ SC.MenuItemView = SC.ButtonView.extend( SC.ContentDisplay,
   renderBranch: function(context, hasBranch) {
 
     var a = '>' ;
-    var url = sc_static('blank.gif') ;
+    var url = SC.BLANK_IMAGE_URL;
     context.push('<span class= "hasBranch">'+a+'</span>') ; 
   },
 

data/frameworks/sproutcore/frameworks/desktop/views/radio.js

@@ -212,7 +212,7 @@ SC.RadioView = SC.FieldView.extend(
         // get the icon from the item, if one exists...
         icon = item[3];
         if (icon) {
-          url = (icon.indexOf('/')>=0) ? icon : static_url('blank');
+          url = (icon.indexOf('/')>=0) ? icon : SC.BLANK_IMAGE_URL;
           className = (url === icon) ? '' : icon ;
           icon = '<img src="%@" class="icon %@" alt="" />'.fmt(url, className);
         } else icon = '';
@@ -221,7 +221,6 @@ SC.RadioView = SC.FieldView.extend(
         disabled = (!item[2]) || (!this.get('isEnabled')) ? 'disabled="disabled" ' : '';
         
         labelText = this.escapeHTML ? SC.RenderContext.escapeHTML(item[0]) : item[0];
-        var blankImage = static_url('blank');
         
         context.push('<label class="sc-radio-button ', selectionStateClassNames, '">');
         context.push('<input type="radio" value="', idx, '" name="', name, '" ', disabled, '/>');

data/frameworks/sproutcore/frameworks/desktop/views/scroll.js

@@ -526,7 +526,7 @@ SC.ScrollView = SC.View.extend(SC.Border, {
     this._scroll_wheelDeltaX += evt.wheelDeltaX;
     this._scroll_wheelDeltaY += evt.wheelDeltaY;
     this.invokeLater(this._scroll_mouseWheel, 10) ;
-    return YES ;  
+    return this.get('canScrollHorizontal') || this.get('canScrollVertical') ;  
   },
   
   /** @private */

data/frameworks/sproutcore/frameworks/desktop/views/segmented.js

@@ -346,7 +346,7 @@ SC.SegmentedView = SC.View.extend(SC.Control,
       }
 
       if (icon) {
-        url = (icon.indexOf('/')>=0) ? icon : static_url('blank');
+        url = (icon.indexOf('/')>=0) ? icon : SC.BLANK_IMAGE_URL;
         className = (url === icon) ? '' : icon ;
         icon = '<img src="'+url+'" alt="" class="icon '+className+'" />';
       } else {

data/frameworks/sproutcore/frameworks/desktop/views/slider.js

@@ -103,7 +103,7 @@ SC.SliderView = SC.View.extend(SC.Control,
     value = Math.floor((value - min) / (max - min) * 100);
     
     if(firstTime) {
-      var blankImage = static_url('blank');
+      var blankImage = SC.BLANK_IMAGE_URL;
       context.push('<span class="sc-inner">');
       context.push('<span class="sc-leftcap"></span>');
       context.push('<span class="sc-rightcap"></span>');

data/frameworks/sproutcore/frameworks/desktop/views/source_list_group.js

@@ -74,7 +74,7 @@ SC.SourceListGroupView = SC.View.extend(SC.Control, SC.CollectionGroup,
   
   render: function(context, firstTime) {
     context.push('<a href="javascript:;" class="sc-source-list-label sc-disclosure-view sc-button-view button disclosure no-disclosure">') ;
-    context.push('<img src="%@" class="button" />'.fmt(sc_static('blank'))) ;
+    context.push('<img src="%@" class="button" />'.fmt(SC.BLANK_IMAGE_URL)) ;
     context.push('<span class="label"></span></a>') ;
   },
   

data/frameworks/sproutcore/frameworks/desktop/views/well.js

@@ -0,0 +1,80 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/** @class
+
+  A WellView is a ContainerView with a border. It's useful when you want to
+  group a set of views. It allows you to easily switch its contents too.
+  
+  It has a default contentLayout that will replace the layout of the contentView.
+  
+  @extends SC.ContainerView
+  @since SproutCore 1.0
+  @test in progress
+*/
+SC.WellView = SC.ContainerView.extend(
+/** @scope SC.WellView.prototype */ {
+  
+  classNames: 'sc-well-view',
+  
+  /**
+    Layout for the content of the container view.
+    @property {Object}
+  */
+  contentLayout: {top:10, bottom:10, left:10, right:10},
+  
+  
+  /**
+     Overrides createChildViews and replaces the layout of the contentView
+     with the one in contentLayout.
+   */
+  
+  createChildViews: function() {
+    // if contentView is defined, then create the content
+    var view = this.get('contentView') ;
+    if (view) {
+      view = this.contentView = this.createChildView(view) ;
+      view.set('layout', this.contentLayout);
+      this.childViews = [view] ;
+    } 
+  },
+  
+  /**
+     The render method for the WellView simply add the html necessary for
+     the border.
+     
+   */
+  
+  render: function(context, firstTime) {
+    sc_super();
+    if(firstTime){
+     context.push("<div class='top-left-edge'></div>",
+       "<div class='top-edge'></div>",
+       "<div class='top-right-edge'></div>",
+       "<div class='right-edge'></div>",
+       "<div class='bottom-right-edge'></div>",
+       "<div class='bottom-edge'></div>",
+       "<div class='bottom-left-edge'></div>",
+       "<div class='left-edge'></div>",
+       "<div class='content-background'></div>");
+     }    
+  },
+  
+  /**
+     Invoked whenever the content property changes.  This method will simply
+     call replaceContent and set the contentLayout in the new contentView.
+     
+     Override replaceContent to change how the view is
+     swapped out.
+   */
+  contentViewDidChange: function() {
+    var view = this.get('contentView');
+    view.set('layout', this.contentLayout);
+    this.replaceContent(view);
+  }.observes('contentView')
+  
+}) ;

data/frameworks/sproutcore/frameworks/foundation/fixtures/malformed.json

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>
+			This is not JSON
+		</title>
+	</head>
+	<body>
+	</body>
+</html>

data/frameworks/sproutcore/frameworks/foundation/mixins/button.js

@@ -169,7 +169,7 @@ SC.Button = {
     // if there is no image element yet, create it and insert it just before
     // title.
     if (icon) {
-      var blank = static_url('blank');
+      var blank = SC.BLANK_IMAGE_URL;
 
       image = '<img src="%@1" alt="" class="%@2" />' ;
       if (icon.indexOf('/') >= 0) {

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

@@ -143,13 +143,17 @@ SC.InlineTextFieldView = SC.TextFieldView.extend(SC.DelegateSupport,
     paneElem = pane.$()[0];
     if(this._optIsCollection && delLayout.left){
       layout.left=this._optframe.x-delLayout.left-paneElem.offsetLeft-1;
+      if(SC.browser.msie==7) layout.left--;
     }else{
       layout.left=this._optframe.x-paneElem.offsetLeft-1;
+      if(SC.browser.msie==7) layout.left--;
     }
     if(this._optIsCollection && delLayout.top){
       layout.top=this._optframe.y-delLayout.top-paneElem.offsetTop;
+      if(SC.browser.msie==7) layout.top=layout.top-2;
     }else{
-      layout.top=this._optframe.y-paneElem.offsetTop;  
+      layout.top=this._optframe.y-paneElem.offsetTop;
+      if(SC.browser.msie==7) layout.top=layout.top-2;  
     }
 
     this.set('layout', layout);

data/frameworks/sproutcore/frameworks/foundation/panes/pane.js

@@ -470,7 +470,7 @@ SC.Pane = SC.View.extend( /** @scope SC.Pane.prototype */ {
     rootResponder.panes.remove(this) ;
     this.rootResponder = null ;
     
-    // clean up some of my own properties 
+    // clean up some of my own properties
     this.set('isPaneAttached', NO) ;
     this.parentViewDidChange() ;
     return this ;

data/frameworks/sproutcore/frameworks/foundation/system/cursor.js

@@ -49,8 +49,8 @@ SC.Cursor = SC.Object.extend(
     sc_super() ;
     
     // create a unique style rule and add it to the shared cursor style sheet
-    var cursorStyle = this.get('cursorStyle') || SC.DEFAULT_CURSOR ;
-    var ss = this.constructor.sharedStyleSheet() ;
+    var cursorStyle = this.get('cursorStyle') || SC.DEFAULT_CURSOR ,
+        ss = this.constructor.sharedStyleSheet() ;
     
     if (ss.insertRule) { // WC3
       ss.insertRule(
@@ -83,20 +83,21 @@ SC.Cursor = SC.Object.extend(
   
   /** @private */
   cursorStyleDidChange: function() {
-    var cursorStyle = this.get('cursorStyle') || SC.DEFAULT_CURSOR ;
-    var rule = this._rule ;
+    var cursorStyle, rule, selector, ss, rules, idx, len;
+    cursorStyle = this.get('cursorStyle') || SC.DEFAULT_CURSOR;
+    rule = this._rule;
     if (rule) {
       rule.style.cursor = cursorStyle ; // fast path
       return ;
     }
     
     // slow path, taken only once
-    var selector = '.'+this.get('className') ;
-    var ss = this.constructor.sharedStyleSheet() ;
-    var rules = (ss.cssRules ? ss.cssRules : ss.rules) || [] ;
+    selector = '.'+this.get('className') ;
+    ss = this.constructor.sharedStyleSheet() ;
+    rules = (ss.cssRules ? ss.cssRules : ss.rules) || [] ;
     
     // find our rule, cache it, and update the cursor style property
-    for (var idx=0, len = rules.length; idx<len; ++idx) {
+    for (idx=0, len = rules.length; idx<len; ++idx) {
       rule = rules[idx] ;
       if (rule.selectorText === selector) {
         this._rule = rule ; // cache for next time
@@ -112,12 +113,12 @@ SC.Cursor = SC.Object.extend(
 
 /** @private */
 SC.Cursor.sharedStyleSheet = function() {
-  var ss = this._styleSheet ;
+  var head, ss = this._styleSheet ;
   if (!ss) {
     // create the stylesheet object the hard way (works everywhere)
     ss = document.createElement('style') ;
     ss.type = 'text/css' ;
-    var head = document.getElementsByTagName('head')[0] ;
+    head = document.getElementsByTagName('head')[0] ;
     if (!head) head = document.documentElement ; // fix for Opera
     head.appendChild(ss) ;
     

data/frameworks/sproutcore/frameworks/foundation/system/event.js

@@ -32,9 +32,9 @@ SC.Event = function(originalEvent) {
   // copy properties from original event, if passed in.
   if (originalEvent) {
     this.originalEvent = originalEvent ;
-    var props = SC.Event._props, len = props.length, idx = len ;
+    var props = SC.Event._props, len = props.length, idx = len , key;
     while(--idx >= 0) {
-      var key = props[idx] ;
+      key = props[idx] ;
       this[key] = originalEvent[key] ;
     }
   }
@@ -207,8 +207,8 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     // Get the handlers queue for this element/eventType.  If the queue does
     // not exist yet, create it and also setup the shared listener for this
     // eventType.
-    var events = SC.data(elem, "events") || SC.data(elem, "events", {}) ;
-    var handlers = events[eventType]; 
+    var events = SC.data(elem, "events") || SC.data(elem, "events", {}) ,
+        handlers = events[eventType]; 
     if (!handlers) {
       handlers = events[eventType] = {} ;
       this._addEventListener(elem, eventType) ;
@@ -293,7 +293,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
           method = target[method] ;
         }
         
-        delete events[SC.guidFor(method)] ;
+        delete handlers[SC.guidFor(method)] ;
         
         // check to see if there are handlers left on this event/eventType.
         // if not, then cleanup the handlers.
@@ -399,10 +399,11 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     // Normalize to an array
     args = SC.A(args) ;
 
-    var ret, fn = SC.typeOf(elem[eventType] || null) === SC.T_FUNCTION ;
+    var ret, fn = SC.typeOf(elem[eventType] || null) === SC.T_FUNCTION , 
+        event, current, onfoo;
 
     // Get the event to pass, creating a fake one if necessary
-    var event = args[0];
+    event = args[0];
     if (!event || !event.preventDefault) {
       event = this.simulateEvent(elem, eventType) ;
       args.unshift(event) ;
@@ -411,7 +412,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     event.type = eventType ;
     
     // Trigger the event - bubble if enabled
-    var current = elem;
+    current = elem;
     do {
       ret = SC.Event.handle.apply(current, args);
       current = (current===document) ? null : (current.parentNode || document);
@@ -419,8 +420,8 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     current = null ;
 
     // Handle triggering native .onfoo handlers
-    var onfoo = elem["on" + eventType] ;
-    var isClick = SC.CoreQuery.nodeName(elem, 'a') && eventType === 'click';
+    onfoo = elem["on" + eventType] ;
+    isClick = SC.CoreQuery.nodeName(elem, 'a') && eventType === 'click';
     if ((!fn || isClick) && onfoo && onfoo.apply(elem, args) === NO) ret = NO;
 
     // Trigger the native events (except for clicks on links)
@@ -459,7 +460,7 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     if ((typeof SC === "undefined") || SC.Event.triggered) return YES ;
     
     // returned undefined or NO
-    var val, ret, namespace, all, handlers, args;
+    var val, ret, namespace, all, handlers, args, key, handler, method, target;
 
     // normalize event across browsers.  The new event will actually wrap the
     // real event with a normalized API.
@@ -471,16 +472,16 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     if (!handlers) return NO ; // nothing to do
     
     // invoke all handlers
-    for (var key in handlers ) {
-      var handler = handlers[key];
-      var method = handler[1] ;
+    for (key in handlers ) {
+      handler = handlers[key];
+      method = handler[1] ;
 
       // Pass in a reference to the handler function itself
       // So that we can later remove it
       event.handler = method;
       event.data = event.context = handler[2];
 
-      var target = handler[0] || this ;
+      target = handler[0] || this ;
       ret = method.apply( target, args );
       
       if (val !== NO) val = ret;

data/frameworks/sproutcore/frameworks/foundation/system/render_context.js

@@ -553,7 +553,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   classNames: function(classNames, cloneOnModify) {
     if (classNames === undefined) {
       if (!this._classNames && this._elem) {
-        this._classNames = (this._elem.getAttribute('class')||'').split(' ');
+        this._classNames = (SC.$(this._elem).attr('class')||'').split(' ');
       }
       
       if (this._cloneClassNames) {
@@ -611,7 +611,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     var classNames = this._classNames, idx;
     if (!classNames && this._elem) {
       classNames = this._classNames = 
-        (this._elem.getAttribute('class')||'').split(' ');
+        (SC.$(this._elem).attr('class')||'').split(' ');
     }
 
     if (classNames && (idx=classNames.indexOf(className))>=0) {
@@ -666,7 +666,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
       classNames = this._classNames ;
       if (!classNames && this._elem) {
         classNames = this._classNames = 
-          (this._elem.getAttribute('class')||'').split(' ');
+          (SC.$(this._elem).attr('class')||'').split(' ');
       }
       if (!classNames) classNames = this._classNames = [];
     

data/frameworks/sproutcore/frameworks/foundation/system/request.js

@@ -334,12 +334,13 @@ SC.Request = SC.Object.extend(SC.Copyable, SC.Freezable,
     Your notification callback should expect to receive the Response object
     as the first parameter plus any additional parameters that you pass.  
     
+    @param {Number} status
     @param {Object} target
     @param {String|function} action
     @param {Hash} params
     @returns {SC.Request} receiver
   */
-  notify: function(status, target, action) {
+  notify: function(status, target, action, params) {
     
     // normalize status
     var hasStatus = YES, params ;
@@ -369,7 +370,7 @@ SC.Request.mixin(/** @scope SC.Request */ {
     @returns {SC.Request} receiver
   */
   getUrl: function(address) {
-    return SC.Request.create().set('address', address).set('type', 'GET');
+    return this.create().set('address', address).set('type', 'GET');
   },
 
   /**
@@ -380,7 +381,7 @@ SC.Request.mixin(/** @scope SC.Request */ {
     @returns {SC.Request} receiver
   */
   postUrl: function(address, body) {
-    var req = SC.Request.create().set('address', address).set('type', 'POST');
+    var req = this.create().set('address', address).set('type', 'POST');
     if(body) req.set('body', body) ;
     return req ;
   },
@@ -392,7 +393,7 @@ SC.Request.mixin(/** @scope SC.Request */ {
     @returns {SC.Request} receiver
   */
   deleteUrl: function(address) {
-    return SC.Request.create().set('address', address).set('type', 'DELETE');
+    return this.create().set('address', address).set('type', 'DELETE');
   },
 
   /**
@@ -403,7 +404,7 @@ SC.Request.mixin(/** @scope SC.Request */ {
     @returns {SC.Request} receiver
   */
   putUrl: function(address, body) {
-    var req = SC.Request.create().set('address', address).set('type', 'PUT');
+    var req = this.create().set('address', address).set('type', 'PUT');
     if(body) req.set('body', body) ;
     return req ;
   }