sproutcore 0.9.13 → 0.9.14

data/frameworks/sproutcore/foundation/server.js

@@ -5,6 +5,9 @@
 
 require('core') ;
 
+SC.URL_ENCODED_FORMAT = 'url-encoded' ;
+SC.JSON_FORMAT = 'json';
+
 // The Server object knows how to send requests to the server and how to
 // get things back from the server.  It automatically handles situations
 // such as 304 caching and queuing requests to send to the server later if
@@ -37,6 +40,12 @@ SC.Server = SC.Object.extend({
   // Set this string to the format to be used to set your resource and verb.
   urlFormat: '/%@/%@',
   
+  // Set this string to either rails or json to set the post transport protocol
+  postFormat: SC.URL_ENCODED_FORMAT,
+  
+  // Set this string to true when escaping the JSON string is necessary
+  escapeJSON: true,
+  
   // call this in your main to preload any data sent from the server with the
   // initial page load.
   preload: function(clientData) {
@@ -189,7 +198,6 @@ SC.Server = SC.Object.extend({
         var recData = server._decamelizeData(rec.getPropertyData()) ;
         recData._guid = rec._guid ;
         context[rec._guid] = rec ;
-        rec.set('newRecord',false) ;
         return recData ;
       }) ;
 
@@ -218,6 +226,7 @@ SC.Server = SC.Object.extend({
         var pk = rec.get('primaryKey') ;
         var dataKey = (pk == 'guid') ? 'id' : pk.decamelize().toLowerCase().replace(/\-/g,'_') ;
         rec.set(pk,data[dataKey]) ;
+        rec.set('newRecord',false) ;
       }
     }) ;
     
@@ -288,20 +297,53 @@ SC.Server = SC.Object.extend({
 
       // collect data for records
       var server = this ;
-      var data = curRecords.map(function(rec) {
-        return server._decamelizeData(rec.getPropertyData()) ;
-      }) ;
 
-      // issue request
-      this.request(resource,'update',null,{
-        requestContext: records, 
-        onSuccess: this._commitSuccess.bind(this),
-        onFailure: this._commitFailure.bind(this),
-        records: data
-      },'post') ;
+      // start format differences
+      switch(this.get('postFormat')){
+        case SC.URL_ENCODED_FORMAT:     				
+          var data = curRecords.map(function(rec) {
+            return server._decamelizeData(rec.getPropertyData()) ;
+          }) ;
+
+          // issue request
+          this.request(resource,'update',null,{
+            requestContext: records, 
+            onSuccess: this._commitSuccess.bind(this),
+            onFailure: this._commitFailure.bind(this),
+            records: data
+            },'post') ;
+            break;
+
+        case SC.JSON_FORMAT:
+          // get all records and put them into an array
+          var objects = [];
+          for(rec in curRecords){
+            if (!curRecords.hasOwnProperty(rec)) continue ;
+            objects.push(curRecords[rec].get('attributes'));
+          }
+          
+          // convert to JSON and escape if this.escapeJSON is true
+          if(this.get('escapeJSON')){
+            var data = escape(objects.toJSONString());
+          } else {
+            var data = objects.toJSONString();
+          }
+          
+          // issue request			
+          this.request(resource,'update',null,{
+            requestContext: records, 
+            onSuccess: this._commitSuccess.bind(this),
+            onFailure: this._commitFailure.bind(this),
+            records: data
+            },'post') ;
+            break;
+        default: 
+          break;
+      }
+	    // end format differences
     }
   },
-  
+    
   // This method is called when a refresh is successful.  It expects an array
   // of hashes, which it will convert to records.
   _commitSuccess: function(status, transport, cacheCode, context) {
@@ -369,6 +411,7 @@ SC.Server = SC.Object.extend({
   // their data.
   refreshRecordsWithData: function(dataAry,recordType,cacheCode,loaded) {
     var server = this ;
+
     // first, prepare each data item in the Ary.
     dataAry = dataAry.map(function(data) {
       
@@ -381,16 +424,23 @@ SC.Server = SC.Object.extend({
       // find the recordType
       if (data.type) {
         var recordName = data.type.capitalize() ;
-        if (server.prefix) for(var prefixLoc=0;prefixLoc < server.prefix.length; prefixLoc++) {
-          var namespace = window[server.prefix[prefixLoc]] ;
-          if (namespace) data.recordType = namespace[recordName] ;
-          if (data.recordType) break ;
+        if (server.prefix) {
+          for (var prefixLoc = 0; prefixLoc < server.prefix.length; prefixLoc++) {
+            var prefixParts = server.prefix[prefixLoc].split('.');
+            var namespace = window;
+            for (var prefixPartsLoc = 0; prefixPartsLoc < prefixParts.length; prefixPartsLoc++) {
+              var namespace = namespace[prefixParts[prefixPartsLoc]] ;
+            }
+            if (namespace != window) data.recordType = namespace[recordName] ;
+            if (data.recordType) break ;
+          }
         } else data.recordType = window[recordName] ;
+        
         if (!data.recordType) console.log('skipping undefined recordType:'+recordName) ;
       } else data.recordType = recordType ;
+      
       if (!data.recordType) return null; // could not process.
-
-      return data ;
+      else return data ;
     }).compact() ;
     
     // now update.

data/frameworks/sproutcore/foundation/string.js

@@ -150,7 +150,6 @@ Object.extend(String,
     that are defined and use those instead.
   */
   currentLanguage: function () {
-    
     var ret = (this.useAutodetectedLanguage) ? (this.browserLanguage || this.preferredLanguage || 'en') : (this.preferredLanguage || this.browserLanguage || 'en') ;
 
     // then try a couple of normalized forms...
@@ -182,6 +181,7 @@ Object.extend(String,
         break;
         
       default:
+        ret = "English";
         break ;
     }
     return ret;

data/frameworks/sproutcore/globals/window.js

@@ -21,7 +21,7 @@ SC.window = SC.PaneView.extend({
     while(el && (el != document) && (!el._configured)) el = el.parentNode ;
     if (el) el = SC.View.findViewForElement(el) ;
     if (el == this) el = null ;
-    return el ;
+  	return el ;
   },
 
   // ........................................................................
@@ -223,6 +223,12 @@ SC.window = SC.PaneView.extend({
     {
       Event.stop(evt);
       ret = false ;
+      if(this._mouseDownView.mouseDragged && $type(this._mouseDownView.mouseDragged) == T_FUNCTION) {
+        //IE7: if the mouseDownView handles the mouseDragged event, set mouseCanDrag
+        //to true.  TODO: make an optional "allowBrowserSelect" property that
+        // would do the same thing; for now let's just prevent it in this case
+        this._mouseCanDrag = true;
+      }
     }
 
     SC.runLoop.endRunLoop();
@@ -263,10 +269,18 @@ SC.window = SC.PaneView.extend({
       evt._type = 'click';
       handler = SC.app.sendEvent(evt, this._mouseDownView);
     }
-    
+    this._mouseCanDrag = false;
     this._mouseDownView = null;
     SC.runLoop.endRunLoop() ;
   },
+
+  _ondblclick: function(evt){
+    if(SC.isIE())
+    {
+      this._clickCount = 2;
+      this._onmouseup(evt);
+    }
+  },
   
   _lastHovered: null,
 
@@ -285,6 +299,7 @@ SC.window = SC.PaneView.extend({
     // make sure the view gets focus no matter what.  FF is inconsistant 
     // about this.
     this._onfocus(); 
+    
 
     var lh = this._lastHovered || [] ;
     var nh = [] ;
@@ -349,38 +364,70 @@ SC.window = SC.PaneView.extend({
     }
   },
   
+  /** @private */
+  // these methods are used to prevent unnecessary text-selection in IE,
+  // there could be some more work to improve this behavior and make it
+  // a bit more useful; right now it's just to prevent bugs when dragging
+  // and dropping.
+  
+  _mouseCanDrag: true,
+  
+  _onselectstart: function() {
+    if(this._mouseCanDrag) {
+      return false;
+    } else {
+      return true;
+    }
+  },
+  
+  _ondrag: function() {
+    return false;
+  },
+  
   _hasFocus: NO,
   
-  _EVTS: ['mousedown', 'mouseup', 'click', 'dblclick', 'keydown', 'keyup', 'keypress', 'mouseover', 'mouseout', 'mousemove', 'resize', 'unload', 'focus', 'blur'],
+  _EVTS: ['mousedown', 'mouseup', 'click', 'dblclick', 'keydown', 'keyup', 'keypress', 'mouseover', 'mouseout', 'mousemove', 'resize', 'unload', 'focus', 'blur','drag','selectstart'],
 
   _listenerCache: [],
   
-  setup: function() {
-
+  setup: function()
+  {
     // setup event listeners for window.
     var win = this ;
-    win._EVTS.each(function(e) {
+    win._EVTS.each(function(e)
+    {
       var func = win['_on' + e] ;
       var target = (e != 'resize') ? document : window ;
-      if (func) {
+      if (func)
+      {
         var f = func.bindAsEventListener(win) ;
-
-        if (e === 'keypress' && SC.CAPTURE_BACKSPACE_KEY && SC.Platform.Firefox > 0) {
+        if (e === 'keypress' && SC.CAPTURE_BACKSPACE_KEY && SC.Platform.Firefox > 0)
+        {
           document.onkeypress = f ;
-        } else {
+        }
+        else if (e === 'selectstart' && SC.Platform.IE > 0)
+        {
+          //capture onselectstart events in IE (proprietary)
+          document.body.onselectstart = f;
+        }
+        else if (e === 'drag' && SC.Platform.IE > 0)
+        {
+          document.body.ondrag = f;
+        }
+        else
+        {
           Event.observe(target, e, f) ;
         }
-
         win._listenerCache.push([target, e, f]) ;
       }
     });
-    
-    this.get('size') ; // fetch the size from the window and save it.
+    this.get('size') ;
+    // fetch the size from the window and save it.
     this.set('isVisibleInWindow', true) ;
     this._onfocus() ;
-    
   }
-}).viewFor($tag('body')) ;
+  }).viewFor($tag('body')) ;
+
 
 // events:
 // window.onfocus --

data/frameworks/sproutcore/lib/core_views.rb

@@ -132,6 +132,7 @@ view_helper :label_view do
   
   var      :label, nil
   var      :value, nil
+  var      :tag, 'span'
   view     'SC.LabelView'
   
   css_class_names << 'sc-label-view'

data/frameworks/sproutcore/lib/index.rhtml

@@ -8,7 +8,8 @@
    # See the comments in this file for more information on what you can
    # change.
 -%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
@@ -26,8 +27,8 @@
 <%= @content_for_page_styles %>
   </head>
   <body class="<%= @theme || 'sc-theme' %> focus">  
-    <script>
-    if (window.SC && SC.setupBodyClassNames) SC.setupBodyClassNames() ;
+    <script type="text/javascript">
+    if (SC.setupBodyClassNames) SC.setupBodyClassNames() ;
     </script>
       
 <% #

data/frameworks/sproutcore/lib/menu_views.rb

@@ -80,12 +80,12 @@ view_helper :menu_item_view, :extends => :button_view do
   @href = nil
   @inner_html = [
     %(<a href="#{@my_href}">),
-      '<span class="sel">&#x2713;</span>',
-      '<span class="mixed">-</span>',
       '<span class="inner">',
         @image,
         %(<span class="label">#{@label}</span>),
       '</span>',
+      '<span class="sel">&#x2713;</span>',
+      '<span class="mixed">-</span>',
       %(<span class="shortcut">#{@shortcut}</span>),
     '</a>'
   ] * ''

data/frameworks/sproutcore/models/collection.js

@@ -6,46 +6,99 @@
 require('models/record') ;
 require('models/store') ;
 
-// A collection holds a set of records matching the specified conditions. You
-// can set the data source used to find the objects matching the conditions
-// to create collections pulled from the local set of objects or pulled 
-// from the server.
-//
-// Collection's automatically update their contents based on the conditions
-// settings you provide as the state of loaded records change.
-//
-SC.Collection = SC.Object.extend({
+/**
+  @class
+  @extends SC.Object
+  @since   0.9.14
+
+  @author Charles Jolley
+  
+  _IMPORTANT: SC.Collection currently has several known performance issues.  It 
+  is suitable for use in existing code, but it is possible that the API will 
+  change before SproutCore 1.0
+  
+  A collection holds a set of records matching the specified conditions. You
+  can set the data source used to find the objects matching the conditions
+  to create collections pulled from the local set of objects or pulled 
+  from the server.
+  
+  Collection's automatically update their contents based on the conditions
+  settings you provide as the state of loaded records change.
+*/
+SC.Collection = SC.Object.extend(
+/** @scope SC.Collection.prototype */ {
   
   // ........................................
   // CONFIGURABLE PROPERTIES
   //
   // Set these properties to control the records that will be in this list.
   
-  // indicates the keys to use to order the records.  If you want the records
-  // ordered by descending order, use a string like 'guid DESC'.
+  /**
+    Indicates the keys to use to order the records.  If you want the records
+    ordered by descending order, use a string like 'guid DESC'.
+    
+    @type {Array}
+  */
   orderBy: ['guid'],
 
-  // set this to the range of records you are interested in seeing or null if
-  // you want to see all records.  Note that collection actually retrieves
-  // a list of records slightly larger than what you pass here to allow for
-  // members to be added and removed.
-  offset: 0, limit: 0,
+  /**
+    Set this to the range of records you are interested in seeing or null if
+    you want to see all records.  Note that collection actually retrieves
+    a list of records slightly larger than what you pass here to allow for
+    members to be added and removed.
+    
+    @see SC.Collection.offset
+    
+    @type {Number}
+  */
+  limit: 0,
   
-  // set this to a hash with conditions options. e.g. { active: true }.  If you
-  // don't set this property, then all records of the given type will be
-  // used.
+  /**
+    Set this to the offset within the range of records you want to retrieve
+    this.get('limit') records from.
+    
+    @see SC.Collection.limit
+    
+    @type {Number}
+  */
+  offset: 0,
+  
+  /**
+    Set this to a hash with conditions options. e.g. { active: true }.  If you
+    don't set this property, then all records of the given type will be
+    used.
+    
+    Note also that if you are matching a property that contains an array, the
+    condition will match if the key you specify is found in the array.  For 
+    example  { groups: someGroup } would match any record where someGroup is
+    included in the groups array.
+    
+    @type {Object}
+  */
   conditions: {},
   
-  // this is the actual array of records in the current collection. This
-  // property will change anytime the record members change (but not when
-  // the member record properties change)
+  /**
+    @property
+  
+    This is the actual array of records in the current collection. This
+    property will change anytime the record members change (but not when
+    the member record properties change).
+  
+    @type {Array}
+  */
   records: function() {
     if (this._changedRecords) this._flushChangedRecords() ;
     return this._records ;
   }.property(),
   
-  // the total count of records matching the conditions settings. The contents
-  // of the records array will be clipped to the range value.
+  /**
+    @property
+    
+    The total count of records matching the conditions settings. The contents
+    of the records array will be clipped to the range value.
+    
+    @type {Number}
+  */
   count: function(key, value) {
     if (value !== undefined) {
       this._count = value ;
@@ -53,31 +106,56 @@ SC.Collection = SC.Object.extend({
     return this._count || 0 ;
   }.property(),
 
-  // set to true when the collection is destroyed
+  /**
+    Set to true when the collection is destroyed
+    
+    @type {Boolean}
+  */
   isDeleted: false, // RO
   
-  // set this to the data source you want to use to get the records.  Use
-  // either SC.Store or SC.Server.  If you use SC.Server, your recordType
-  // must have a resourceURL property. // NC
-  dataSource: SC.Store,
+  /**
+    Set this to the data source you want to use to get the records.  Use
+    either SC.Store or SC.Server.  If you use SC.Server, your recordType
+    must have a resourceURL property.
+    
+    This should be set when the collection is created and not changed later.
+    
+    @type {SC.Store or SC.Server}
+  */
+  dataSource: SC.Store, // NC
   
-  // set this to the type of record you want in the collection.  This should
-  // be set when the collection is created and not changed later.
+  /**
+    Set this to the type of record you want in the collection.
+    
+    This should be set when the collection is created and not changed later.
+    
+    @type {SC.Record}
+  */
   recordType: SC.Record, // NC
 
-  // set to true while a refresh is in progress.
+  /**
+    Set to true while a refresh is in progress.
+    
+    @type {Boolean}
+  */
   isLoading: false, // RO
   
-  // set to true if records have changed in a way that might leave the records out
-  // of date.
+  /**
+    Set to true if records have changed in a way that might leave the records out
+    of date.
+    
+    @type {Boolean}
+  */
   isDirty: false, // RO
   
   // ........................................
   // ACTIONS
   //
 
-  // call this to force the list to refresh.  The refresh may not happen
-  // right away, depending on the dataSource.
+  /**
+    Call this to force the list to refresh.  The refresh may not happen
+    right away, depending on the dataSource.
+  */
   refresh: function() {
     var recordType = this.get('recordType') || SC.Record ;
     var offset = (this._limit > 0) ? this._offset : 0 ;
@@ -107,11 +185,16 @@ SC.Collection = SC.Object.extend({
     return this; 
   },
   
-  // call this method when you are done with a collection.  This will remove
-  // it as an observer to changes in the SC.Store so that it can be reclaimed.
-  // isDeleted will also be set to true.
+  /**
+    Call this method when you are done with a collection.  This will remove
+    it as an observer to changes in the SC.Store so that it can be reclaimed.
+    isDeleted will also be set to true.
+  */
   destroy: function() { SC.Store.removeCollection(this); return this; },
   
+  /**
+    TODO: Needs documentation.
+  */
   newRecord: function(settings) {
     if (!settings) settings = {} ;
     settings.newRecord = true ;
@@ -258,74 +341,6 @@ SC.Collection = SC.Object.extend({
     this._reslice() ;
   },
   
-  /// SAVED FOR POSTERITY
-  _oldRecordsDidChange: function() {
-    var state = ((!rec.isDeleted) && rec.matchConditions(this.get('conditions'))) ? 'in' : 'out';
-    var records = this._records ;
-    
-    // see if this comes before or after
-    if ((this._limit > 0) && (state == "in") && records && (records.length > 0)) {
-      var order = this.get('orderBy') ;
-      if (rec.compareTo(records[0],order) < 0) {
-        state = "before" ;
-      } else if (rec.compareTo(records[records.length-1],order) > 0) {
-        state = "after" ;
-      }
-    }
-    
-    // does this currently belong to the collection.
-    var belongs = records.include(rec) ;
-    var reslice = false ; var refresh = false ;
-    
-    // now adjust appropriately
-    switch(state) {
-      case 'before':
-        // note: this is technically incorrect.  If the record comes before
-        // that might actually shift everything forward. But there is no
-        // way to really tell if the rec is just now being added or not.
-        //
-        // We let this go since this will only be temporarily wrong as the
-        // list will get refreshed.
-        //
-        if (belongs) { records = records.without(rec) ;  reslice = true; }
-        refresh = true ;
-        break ;
-
-      case 'after':
-      case 'out':
-        if (belongs) {
-          records = records.without(rec) ;
-          reslice = refresh = true ;
-        }
-        break ;
-        
-      case 'in':
-        // resort records
-        if (!belongs) {
-          records = records.slice();
-          records.push(rec) ;
-        } 
-        records = records.sort(function(a,b){ return a.compareTo(b,order); });
-        if (!records.isEqual(this._records)) reslice = refresh = true ;
-        break;
-    }
-    
-    if (reslice) {
-      this._records = records ;
-      if (this._limit > 0) {
-        var start = this.get('offset') - this._offset ;
-        var end = start + this.get('limit') ;
-        records = records.slice(start,end) ;
-      }
-      this.set('records',records) ;
-    }
-    
-    //if (refresh && !this._refreshing) {
-    //  this._refreshing = true ;
-    //  this.invokeLater(this.refresh, 1) ;
-    //}
-  },
-  
   // Anytime the properties used to filter the collection change, reslice if possible
   // then refresh from the data source.
   propertyObserver: function(observing,target,key,value) {

data/frameworks/sproutcore/models/record.js

@@ -114,7 +114,7 @@ SC.Record = SC.Object.extend(
 
   init: function()
   {
-    arguments.callee.base.apply(this, arguments);
+    sc_super();
     
     var primaryKeyName = this.get('primaryKey');
     if (!this.get(primaryKeyName))
@@ -462,7 +462,7 @@ SC.Record = SC.Object.extend(
     if (recValue && recValue.primaryKey) recValue = recValue.get(recValue.primaryKey) ;
     var stringify = (value instanceof RegExp);
     if (stringify)  {
-      return recValue.toString().match(value)
+      return recValue.toString().match(value) ;
     } else {
        return recValue==value ;
     }

data/frameworks/sproutcore/panes/manager.js

@@ -137,7 +137,7 @@ SC.PaneManager = SC.View.extend({
   
   // on init, add to main HTML page if not already added.
   init: function() {
-    arguments.callee.base.apply(this,arguments) ;
+    sc_super() ;
     var el = this.rootElement ;
     if (!this.parentNode) {
       $tag('body').insertBefore(el, null) ;

data/frameworks/sproutcore/panes/overlay.js

@@ -115,7 +115,7 @@ SC.OverlayPaneView = SC.PaneView.extend({
 
   keyDown: function(evt) {
     if (!this.interpretKeyEvents(evt)) {
-      return arguments.callee.base.apply(this,arguments);
+      return sc_super();
     }
   },
   
@@ -206,7 +206,7 @@ SC.OverlayPaneView = SC.PaneView.extend({
     }.observes('content'),
     
     init: function() {
-      arguments.callee.base.apply(this,arguments) ;
+      sc_super() ;
       
       // only Safari does well enough with animations to handle this dainty
       // guy. 
@@ -228,7 +228,7 @@ SC.OverlayPaneView = SC.PaneView.extend({
   // view to match its content
   show: function() {
     this.containerView._fixWidth();
-    arguments.callee.base.apply(this,arguments);
+    sc_super();
     //this.focusFirstKeyView() ;
   }