sproutcore 0.9.2 → 0.9.3

data/History.txt

@@ -1,5 +1,38 @@
 == SVN HEAD
 
+* Basic changes to get IE working.  All non-view tests now pass and the doc app and test runner both load and run in IE7.  Lots of visual fixes are still required for the sc-theme as well as IE-specific perf optimization and bug fixes.
+
+* [BUG] Default template for both client and template included a stray comma in their core.js file that breaks IE and Safari 2.  This is fixed in the templates and in the clients included with the framework, though you will need to make this change manually in your own apps.
+
+* beginInlineEdit() and endInlineEdit() on SC.LabelView were renamed to comply
+with the SC.Editable protocol.  Use beginEditing() and commitEditing() or
+discardEditing() instead.
+
+* Added SC.Editable mixin.  This provides a standard protocol for begining 
+and ending keyboard editing sessions on views.  SC.Editable is now used 
+by SC.LabelView, SC.ListItemView, SC.TextFieldView, and SC.TextareaFieldView.
+
+* Collection view now supports the default behavior to begin editing when you
+click on a selected item for a second time.  If you hit return it will also
+begin editing.  To support this, you must set contentValueIsEditable to YES 
+and implement beginEditing() on your item view. 
+
+* Inline editor is now supported in both SC.ListItemView and SC.LabelView.
+
+* Improved inline editor (now renamed SC.InlineTextFieldView for consistancy).
+The new editor can be used with basically any view now in addition to just the
+label view.  It also automatically inherits the font size and style of any
+underlying DOM element that you hand it.  To work with an inline editor you
+will need to implement the InlineEditorDelegate (see documentation).
+
+* Inline editor now displays with a fixed width and grows downward as you type instead of stretching out to the end.
+
+--
+
+* Added hello world sample app.
+
+* Updated contacts sample app.  It is much nicer now.
+
 * Add sproutcore freeze:gems command to freeze latest SproutCore in your local project.
 
 * Updated copyright to 2008.

data/Manifest.txt

@@ -39,18 +39,6 @@ clients/sc_test_runner/main.js
 clients/sc_test_runner/models/test.js
 clients/sc_test_runner/views/runner_frame.js
 clients/sc_test_runner/views/test_label.js
-clients/view_builder/builders/builder.js
-clients/view_builder/builders/button.js
-clients/view_builder/controllers/document.js
-clients/view_builder/core.js
-clients/view_builder/english.lproj/body.css
-clients/view_builder/english.lproj/body.rhtml
-clients/view_builder/english.lproj/controls.css
-clients/view_builder/english.lproj/strings.js
-clients/view_builder/main.js
-clients/view_builder/tests/controllers/document.rhtml
-clients/view_builder/tests/views/builder.rhtml
-clients/view_builder/views/builder.js
 config/hoe.rb
 config/requirements.rb
 frameworks/prototype/prototype.js
@@ -74,7 +62,6 @@ frameworks/sproutcore/english.lproj/images/sc-theme-ysprite.png
 frameworks/sproutcore/english.lproj/images/shared-icons.png
 frameworks/sproutcore/english.lproj/images/sproutcore-logo.png
 frameworks/sproutcore/english.lproj/images/sticky-note.png
-frameworks/sproutcore/english.lproj/inline_text_editor.css
 frameworks/sproutcore/english.lproj/menu.css
 frameworks/sproutcore/english.lproj/panels/background-fat.jpg
 frameworks/sproutcore/english.lproj/panels/background-thin.jpg
@@ -128,6 +115,8 @@ frameworks/sproutcore/lib/menu_views.rb
 frameworks/sproutcore/mixins/array.js
 frameworks/sproutcore/mixins/control.js
 frameworks/sproutcore/mixins/delegate_support.js
+frameworks/sproutcore/mixins/editable.js
+frameworks/sproutcore/mixins/inline_editor_delegate.js
 frameworks/sproutcore/mixins/observable.js
 frameworks/sproutcore/mixins/scrollable.js
 frameworks/sproutcore/mixins/selection_support.js
@@ -199,7 +188,7 @@ frameworks/sproutcore/views/field/textarea_field.js
 frameworks/sproutcore/views/filter_button.js
 frameworks/sproutcore/views/form.js
 frameworks/sproutcore/views/image.js
-frameworks/sproutcore/views/inline_text_editor.js
+frameworks/sproutcore/views/inline_text_field.js
 frameworks/sproutcore/views/label.js
 frameworks/sproutcore/views/list_item.js
 frameworks/sproutcore/views/menu_item.js

data/clients/sc_docs/controllers/docs.js

@@ -131,6 +131,7 @@ Docs.docsController = SC.Object.create({
     var clientName = this.get('clientName') ;
     var clientRoot = this.get('clientRoot') ;
     Docs.server.request(clientRoot, null, null, {
+      nonce: Date.now().toString(),
       onSuccess: this._rebuildSuccess.bind(this),
       onFailure: this._rebuildFailure.bind(this)
     }, 'post') ;

data/clients/sc_docs/core.js

@@ -14,6 +14,6 @@ Docs = SC.Object.create({
   FIXTURES: [],
 
   // Any keys in this array will be instantiated automatically from main.
-  controllers: [],
+  controllers: []
   
 }) ;

data/clients/sc_test_runner/controllers/runner.js

@@ -84,6 +84,7 @@ TestRunner.runnerController = SC.Object.create({
     // current client.
     var urlRoot = this.get('urlRoot') ;
     TestRunner.server.request(urlRoot, 'index.js', null, {
+      nonce: Date.now().toString(),
       onSuccess: this._reloadSuccess.bind(this),
       onFailure: this._reloadFailure.bind(this)
     }) ;
@@ -92,6 +93,9 @@ TestRunner.runnerController = SC.Object.create({
   _reloadSuccess: function(status, transport) {
     var json = transport.responseText ;
     var records = eval(json) ;
+    
+    console.log('JSON: %@'.fmt(json)) ;
+    
     if ($type(records) != T_ARRAY) {
       return this._reloadFailure(status, transport) ;
     }
@@ -100,6 +104,7 @@ TestRunner.runnerController = SC.Object.create({
     // the records included in the list.  This is what will become our new
     // list.
     var recs = SC.Store.updateRecords(records, this, TestRunner.Test, true);
+    console.log('retrieved records: %@'.fmt(recs.join(','))) ;
     
     // show warning panel if the records are empty.  Also reload tests
     // periodically so that when the user resolves the problem, we can start

data/clients/sc_test_runner/core.js

@@ -14,6 +14,6 @@ TestRunner = SC.Object.create({
   FIXTURES: [],
 
   // Any keys in this array will be instantiated automatically from main.
-  controllers: [],
+  controllers: []
   
 }) ;

data/frameworks/sproutcore/english.lproj/core.css

@@ -1,6 +1,7 @@
 /* @override 
 	http://localhost:4020/static/sproutcore/en/_cache/core-1207528979.css
 	http://localhost:4020/static/sproutcore/en/_cache/core-1207680408.css
+	http://localhost:4020/static/sproutcore/en/_cache/core-1208585577.css
 */
 
 /* =============================================
@@ -58,6 +59,10 @@
 
 /* @group SC.ListItemView */
 
+.sc-list-item-view {
+  overflow: hidden;
+}
+
 .sc-list-item-view .sc-icon {
 	width: 16px;
 	height: 16px;
@@ -85,6 +90,10 @@
 	right: 14px;
 }
 
+.sc-list-item-view .sc-label {
+  text-overflow: ellipse;
+}
+
 /* @end */
 
 /* @group SC.SourceListView */
@@ -111,5 +120,37 @@
 
 /* @end */
 
+/* @group SC.InlineTextFieldView */
+
+.sc-inline-text-field-view {
+	position: absolute ;
+	z-index: 10000000;
+	padding: 0;
+	margin: 0;
+}
+
+/* sizer needs to be able to resize
+   vertically so that we can compute the
+   new size for the text. */
+.sc-inline-text-field-view .sizer {
+	position: absolute;
+	left:  0;
+	top:  0;
+	width: 100%;
+}
+
+.sc-inline-text-field-view .inner-field {
+	position: absolute ;
+	left: 0;
+	top:  0;
+	width: 100%;
+	height:  100%;
+	border: none ;
+	overflow:  hidden ;
+	resize: none;
+}
+
+/* @end */
+
 
 

data/frameworks/sproutcore/english.lproj/theme.css

@@ -456,5 +456,25 @@ input.show-hint {
 
 /* @end */
 
+/* @group SC.InlineTextFieldView */
+
+.sc-theme .sc-inline-text-field-view {
+}
+
+.sc-theme .sc-inline-text-field-view .inner-field {
+	border: 1px solid #888;
+	-webkit-box-shadow: #555 0px 1px 5px ;
+	background-color: white ;
+}
+
+.sc-theme .sc-inline-text-field-view .inner-field.invalid {
+	outline: 2px red solid;
+}
+
+/* @end */
+
+
+
+
 
 

data/frameworks/sproutcore/foundation/animator.js

@@ -63,7 +63,15 @@ Animator.prototype = {
 		this.state = Math.max(0, Math.min(1, from));
 		this.lastTime = new Date().getTime();
 		if (!this.intervalId) {
-			this.intervalId = window.setInterval(this.timerDelegate, this.options.interval);
+      // this.intervalId = this.setInterval(this.timerDelegate, this.options.interval);
+     
+       this.intervalId = SC.Timer.schedule({
+          target: this, 
+          action: this.timerDelegate, 
+          interval: this.options.interval,
+          repeats: YES
+        }) ;
+    
 		}
 	},
 	// animate from the current state to provided value
@@ -113,7 +121,8 @@ Animator.prototype = {
 		} finally {
 			this.options.onStep.call(this);
 			if (this.target == this.state) {
-				window.clearInterval(this.intervalId);
+        // window.clearInterval(this.intervalId);
+				this.intervalId.invalidate();
 				this.intervalId = null;
 				this.options.onComplete.call(this);
 			}

data/frameworks/sproutcore/foundation/date.js

@@ -97,7 +97,7 @@ Object.extend(Date,{
   	var token2="";
   	var x,y;
   	var now=new Date();
-  	var year=now.getYear();
+  	var year=now.getFullYear();
   	var month=now.getMonth()+1;
   	var date=1;
   	var hh=now.getHours();
@@ -302,7 +302,7 @@ Object.extend(Date.prototype, {
   	var i_format=0;
   	var c="";
   	var token="";
-  	var y=date.getYear()+"";
+  	var y=date.getFullYear()+"";
   	var M=date.getMonth()+1;
   	var d=date.getDate();
   	var E=date.getDay();

data/frameworks/sproutcore/foundation/object.js

@@ -49,7 +49,7 @@ SC.BENCHMARK_OBJECTS = NO;
 
 */
 SC.Object = function(noinit) { 
-	if (noinit == SC.Object._noinit_) return ;
+	if (noinit === SC.Object._noinit_) return ;
 	var ret = SC.Object._init.apply(this,$A(arguments)) ;
   return ret ;
 };
@@ -176,7 +176,7 @@ Object.extend(SC.Object,
     if (this._objectClassName) return this._objectClassName ;
     var ret = this ;
     while(ret && !ret._objectClassName) ret = ret._type; 
-    return (ret._objectClassName) ? ret._objectClassName : 'Anonymous' ;
+    return (ret && ret._objectClassName) ? ret._objectClassName : 'Anonymous' ;
   },
 
   /** @private

data/frameworks/sproutcore/foundation/server.js

@@ -98,6 +98,7 @@ SC.Server = SC.Object.extend({
       if (onFailure) onFailure(transport.status, transport, cacheCode,context);
     } ; 
     
+    console.log('REQUEST: %@'.fmt(url)) ;
     request = new Ajax.Request(url,opts) ;
   },
 
@@ -379,7 +380,7 @@ SC.Server = SC.Object.extend({
 
       // find the recordType
       if (data.type) {
-        var recordName = data.type.capitalize()
+        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] ;
@@ -404,7 +405,7 @@ SC.Server = SC.Object.extend({
     var ret = {} ;
     records.each(function(rec) {
       var recs = ret[rec.resourceURL || '*'] || [] ;
-      recs.push(rec) 
+      recs.push(rec)  ;
       ret[rec.resourceURL || '*'] = recs ;
     }) ;
     return ret ;
@@ -477,7 +478,7 @@ SC.Server = SC.Object.extend({
       
     // handle objects
     } else if (typeof(params) == "object") {
-      var ret = []       
+      var ret = [];
       for(var cur in params) {
         var key = (rootKey) ? (rootKey + '['+cur+']') : cur ;
         ret.push(this._toQueryString(params[cur],key)) ;

data/frameworks/sproutcore/foundation/set.js

@@ -69,7 +69,7 @@ SC.Set = SC.Object.extend(SC.Array,
   _each: function(iterator) {
     for (var key in this) {
       if (!this.hasOwnProperty(key)) continue ;
-      if (key[0] == '@') iterator(this[key]) ;
+      if (key.match(/^@/)) iterator(this[key]) ;
     }
   }
   

data/frameworks/sproutcore/foundation/unittest.js

@@ -166,7 +166,7 @@ Test.Unit.Runner.prototype = {
       if (!rootLog) {
         var el = document.createElement('div') ;
         el.id = 'test-log' ;
-        el.addClassName('testlog') ;
+        $(el).addClassName('testlog') ;
         var body = document.getElementsByTagName('body')[0] ;
         body.insertBefore(el, body.firstChild) ;
         rootLog = el ;
@@ -530,18 +530,20 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p
     this.timeToWait = time;
   },
   run: function() {
-    try {
-      try {
+    //try {
+      //try {
         if (!this.isWaiting) this.setup.bind(this)();
         this.isWaiting = false;
         this.test.bind(this)();
-      } finally {
+      //} catch(e) {
+      //  throw e; // required for IE compatibility.
+      //} finally {
         if(!this.isWaiting) {
           this.teardown.bind(this)();
         }
-      }
-    }
-    catch(e) { this.error(e); }
+      //}
+    //}
+    //catch(e) { this.error(e); }
   }
 });
 
@@ -595,7 +597,7 @@ Test.context = function(name, spec, log){
       default:
         var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
         var body = spec[specName].toString().split('\n').slice(1);
-        if(/^\{/.test(body[0])) body = body.slice(1);
+        if(/^\s*\{/.test(body[0])) body = body.slice(1);
         body.pop();
         body = body.map(function(statement){ 
           return statement.strip() ;
@@ -618,5 +620,6 @@ Test.Observer = function()
     if (!arguments.callee.notified) arguments.callee.notified = 0;
     return ++arguments.callee.notified;
   };
-}
+} ;
+
 

data/frameworks/sproutcore/lib/collection_view.rb

@@ -26,6 +26,7 @@ view_helper :collection_view do
   property :content_value_key
   property :group_visible_key
   property :group_title_key
+  property :content_value_editable, :key => 'contentValueIsEditable'
   property :accepts_first_responder, true
   property :can_reorder_content
   

data/frameworks/sproutcore/lib/core_views.rb

@@ -123,13 +123,17 @@ end
 view_helper :label_view do
   property(:formatter) { |v| v }
   property :localize,   false
+  property :editable, :key => 'isEditable'
   property :escape_html, true, :key => 'escapeHTML'
+  property :value
   
   var      :label, nil
+  var      :value, nil
   view     'SC.LabelView'
   
   css_class_names << 'sc-label-view'
   @inner_html = @label unless @label.nil?
+  @inner_html = @value unless @value.nil?
 end
 
 # Render an SC.SpinnerView. Inherits from SC.View. You should bind 

data/frameworks/sproutcore/mixins/editable.js

@@ -0,0 +1,144 @@
+// ========================================================================
+// SproutCore
+// copyright 2006-2008 Sprout Systems, Inc.
+// ========================================================================
+
+/**
+  @namespace
+
+  The Editable mixin is a standard protocol used to activate keyboard editing 
+  on views that are editable such as text fields, label views and item views.
+  
+  You should apply this mixin, or implement the methods, if you are
+  designing an item view for a collection and you want to automatically
+  trigger editing.
+  
+  h2. Using Editable Views
+  
+  To use a view that includes the Editable mixin, you simply call three
+  methods on the view:
+  
+  - To begin editing, call beginEditing().  This will make the view first responder and allow the user to make changes to it.  If the view cannot begin editing for some reason, it will return NO.
+  
+  - If you want to cancel editing, you should try calling discardEditing().  This will cause the editor to discard its changed value and resign first responder.  Some editors do not support cancelling editing and will return NO.  If this is the case, you may optionally try calling commitEditing() instead to force the view to resign first responder, even though this will commit the changes.
+  
+  - If you want to end editing, while saving any changes that were made, try calling commitEditing().  This will cause the editor to validate and apply its changed value and resign first responder.  If the editor cannot validate its contents for some reason, it will return NO.  In this case you may optionally try calling discardEditing() instead to force the view to resign first responder, even though this will discard the changes.
+  
+  
+  h2. Implementing an Editable View
+  
+  To implement a new view that is editable, you should implement the three
+  methods defined below: beginEditing(), discardEditing(), and
+  commitEditing().  If you already allow editing when your view becomes first
+  responder and commit your changes when the view loses first responder status
+  then you can simply apply this mixin and not override any methods.
+  
+  
+  @since SproutCore 1.0
+  
+*/
+SC.Editable = {  
+
+  /**
+    Indicates whether a view is editable or not.  You can optionally 
+    implement the methods in this mixin to disallow editing is isEditable is
+    NO.
+  */
+  isEditable: NO,
+  
+  /**
+    Indicates whether editing is currently in progress.  The methods you
+    implement should generally up this property as appropriate when you 
+    begin and end editing.
+  */
+  isEditing: NO,
+  
+  /**
+    Begins editing on the view.
+    
+    This method is called by other views when they want you to begin editing.
+    You should write this method to become first responder, perform any 
+    additional setup needed to begin editing and then return YES.
+    
+    If for some reason you do not want to allow editing right now, you can
+    also return NO.  If your view is already editing, then you should not
+    restart editing again but just return YES.
+
+    The default implementation checks to see if editing is allowed, then
+    becomes first responder and updates the isEditing property if appropriate.
+    Generally you will want to replace this method with your own 
+    implementation and not call the default.
+    
+    @returns {Boolean} YES if editing began or is in progress, NO otherwise
+  */
+  beginEditing: function() {
+    if (!this.get('isEditable')) return NO ;
+    if (this.get('isEditing')) return YES ;
+    
+    // begin editing
+    this.set('isEditing', YES) ;
+    this.becomeFirstResponder() ;
+    return YES ;
+  },
+  
+  /**
+    Ends editing on the view, discarding any changes that were made to the
+    view value in the meantime.
+    
+    This method is called by other views when they want to cancel editing
+    that began earlier.  When this method is called you should resign first
+    responder, restore the original value of the view and return YES.
+    
+    If your view cannot revert back to its original state before editing began
+    then you can implement this method to simply return NO.  A properly
+    implemented client may try to call commitEditing() instead to force your
+    view to end editing anyway.
+    
+    If this method is called on a view that is not currently editing, you
+    should always just return YES.
+    
+    The default implementation does not support discarding changes and always
+    returns NO.
+    
+    @returns {Boolean} YES if changes were discarded and editing ended.
+  */
+  discardEditing: function() {
+    // if we are not editing, return YES, otherwise NO.
+    return !this.get('isEditing') ;
+  },
+  
+  /**
+    Ends editing on the view, committing any changes that were made to the 
+    view value in the meantime.
+    
+    This method is called by other views when they want to end editing, 
+    saving any changes that were made to the view in the meantime.  When this
+    method is called you should resign first responder, save the latest
+    value of the view and return YES.
+    
+    If your view cannot save the current state of the view for some reason 
+    (for example if validation fails), then you should return NO.  Properly
+    implemented clients may then try to call discardEditing() to force your
+    view to resign first responder anyway.
+    
+    Some views apply changes to their value immediately during an edit instead
+    of waiting for the view to end editing.  If this is the case, you should
+    still implement commitEditing but you simply may not save any value 
+    changes.
+  
+    If this method is called on a view that is not currently editing, you
+    should always just reutrn YES.
+    
+    The default implementation sets isEditing to NO, resigns first responder
+    and returns YES.
+    
+    @returns {Boolean} YES if changes were discarded and editing ended.
+  */
+  commitEditing: function() {
+    if (!this.get('isEditing')) return YES;
+    this.set('isEditing', NO) ;
+    this.resignFirstResponder() ;
+    return YES ;
+  }
+
+} ;