sproutcore 1.6.0.beta.3-java → 1.6.0-java

data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js

@@ -274,3 +274,32 @@ test("Timeouts - Status listener callback", function() {
   }, 500);
 });
 
+test("Test Multiple listeners per single status response", function() {
+
+
+  var numResponses = 0;
+  var response;
+
+  expect(4);
+
+  request.notify(200, this, function(response) {
+    numResponses++;
+    ok(true, "Receieved a response");
+
+    if (numResponses === 2) window.start();
+  });
+
+  request.notify(200, this, function(response) {
+    numResponses++;
+    ok(true, "Receieved a response");
+
+    if (numResponses === 2) window.start();
+  });
+
+  response = request.send();
+  ok(response !== null, 'request.send() should return a response object');
+  ok(response.get('status')<0, 'response should still not have a return code since this should be async');
+
+  stop() ; // stops the test runner - wait for response
+});
+

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js

@@ -448,6 +448,8 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
       }
 
       lastContent.removeObserver('status', this, sfunc);
+
+      this.teardownEnumerablePropertyChains(lastContent);
     }
 
     // save new cached values
@@ -480,6 +482,8 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
       // Observer for changes to the status property, in case this is an
       // SC.Record or SC.RecordArray.
       content.addObserver('status', this, sfunc);
+
+      this.setupEnumerablePropertyChains(content);
     } else {
       newlen = SC.none(content) ? 0 : 1;
     }
@@ -487,6 +491,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array, SC.SelectionSupport,
     // finally, notify enumerable content has changed.
     this._scac_length = newlen;
     this._scac_contentStatusDidChange();
+
     this.arrayContentDidChange(0, 0, newlen);
     this.updateSelectionAfterContentChange();
   }.observes('content'),

data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js

@@ -39,6 +39,26 @@ SC.Controller = SC.Object.extend(
     
     @property {Boolean}
   */
-  isEditable: YES
+  isEditable: YES,
+  
+  /**
+   * Set this to YES if you are setting the controller content to a recordArray
+   * or other content that needs to be cleaned up (with `.destroy()`) when
+   * new content is set.
+   */
+  destroyContentOnReplace: NO,
+
+  contentObjectDidChanged: function() {
+    var oldContent, newContent;
+
+    if (!this.get('destroyContentOnReplace')) return;
+
+    oldContent = this._oldContent,
+    newContent = this.get('content');
+    if (oldContent && newContent !== oldContent && oldContent.destroy) {
+      oldContent.destroy();
+    }
+    this._oldContent = newContent;
+  }.observes('content')
 
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/controls/button.js

@@ -20,13 +20,18 @@ SC.Button = SC.TemplateView.extend({
     }
   },
 
+  rootResponder: function() {
+    var pane = this.get('pane');
+    return pane.get('rootResponder');
+  }.property('pane').cacheable(),
+
   // Setting isActive to false will remove 'is-active' from our
   // layer's class names.
   mouseUp: function(event) {
     if (this.get('isActive')) {
       var action = this.get('action'),
           target = this.get('target') || null,
-          rootResponder = this.getPath('pane.rootResponder');
+          rootResponder = this.get('rootResponder');
 
       if (action && rootResponder) {
         rootResponder.sendAction(action, target, this, this.get('pane'), null, this);
@@ -46,4 +51,3 @@ SC.Button = SC.TemplateView.extend({
     this.mouseUp(touch);
   }
 });
-

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

@@ -107,23 +107,7 @@ SC.mixin(/** @lends SC */ {
     @param data {Object} Optional data.  If passed, write.
     @returns {Object} the value of the named data
   */
-  data: function(elem, name, data) {
-    elem = (elem === window) ? "@window" : elem ;
-    var hash = SC.hashFor(elem) ; // get the hash key
-    
-    // Generate the data cache if needed
-    var cache = SC._data_cache ;
-    if (!cache) SC._data_cache = cache = {} ;
-    
-    // Now get cache for element
-    var elemCache = cache[hash] ;
-    if (name && !elemCache) cache[hash] = elemCache = {} ;
-    
-    // Write data if provided 
-    if (elemCache && (data !== undefined)) elemCache[name] = data ;
-    
-    return (name) ? elemCache[name] : elemCache ;
-  },
+  data: $.data,
   
   /**
     Removes data from the global cache.  This is used throughout the
@@ -136,31 +120,7 @@ SC.mixin(/** @lends SC */ {
     @param name {String} optional name to remove. 
     @returns {Object} the value or cache that was removed
   */
-  removeData: function(elem, name) {
-    elem = (elem === window) ? "@window" : elem ;
-    var hash = SC.hashFor(elem) ;
-    
-    // return undefined if no cache is defined
-    var cache = SC._data_cache ;
-    if (!cache) return undefined ;
-    
-    // return undefined if the elem cache is undefined
-    var elemCache = cache[hash] ;
-    if (!elemCache) return undefined;
-    
-    // get the return value
-    var ret = (name) ? elemCache[name] : elemCache ;
-    
-    // and delete as appropriate
-    if (name) {
-      delete elemCache[name] ;
-    } else {
-      delete cache[hash] ;
-    }
-    
-    return ret ;
-  },
-
+  removeData: $.removeData,
 
   // ..........................................................
   // LOCALIZATION SUPPORT

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/bind.js

@@ -51,23 +51,32 @@ sc_require('ext/handlebars');
         displayTemplate: fn,
         inverseTemplate: inverse,
         property: property,
-        previousContext: this
+        previousContext: this,
+        tagName: (options.hash.tagName || "span")
       });
 
+      var observer, invoker;
+
       view.get('childViews').push(bindView);
 
-      // Observe the given property on the context and
-      // tells the SC._BindableSpan to re-render.
-      this.addObserver(property, this, function observer() {
+      observer = function() {
         if (bindView.get('layer')) {
           bindView.rerender();
         } else {
           // If no layer can be found, we can assume somewhere
           // above it has been re-rendered, so remove the
           // observer.
-          this.removeObserver(property, this, observer);
+          this.removeObserver(property, invoker);
         }
-      });
+      };
+
+      invoker = function() {
+        this.invokeOnce(observer);
+      };
+
+      // Observe the given property on the context and
+      // tells the SC._BindableSpan to re-render.
+      this.addObserver(property, invoker);
 
       var context = bindView.renderContext(bindView.get('tagName'));
       bindView.renderToContext(context);
@@ -142,10 +151,9 @@ Handlebars.registerHelper('bindAttr', function(options) {
     var property = attrs[attr];
     var value = this.getPath(property);
 
-    // Add an observer to the view for when the property changes.
-    // When the observer fires, find the element using the
-    // unique data id and update the attribute to the new value.
-    this.addObserver(property, function observer() {
+    var observer, invoker;
+
+    observer = function observer() {
       var result = this.getPath(property);
       var elem = view.$("[data-handlebars-id='" + dataId + "']");
 
@@ -154,7 +162,7 @@ Handlebars.registerHelper('bindAttr', function(options) {
       // In that case, we can assume the template has been re-rendered
       // and we need to clean up the observer.
       if (elem.length === 0) {
-        this.removeObserver(property, observer);
+        this.removeObserver(property, invoker);
         return;
       }
 
@@ -170,7 +178,16 @@ Handlebars.registerHelper('bindAttr', function(options) {
       } else {
         elem.attr(attr, result);
       }
-    });
+    };
+
+    invoker = function() {
+      this.invokeOnce(observer);
+    };
+
+    // Add an observer to the view for when the property changes.
+    // When the observer fires, find the element using the
+    // unique data id and update the attribute to the new value.
+    this.addObserver(property, invoker);
 
     // Use the attribute's name as the value when it is YES
     if (value === YES) {
@@ -246,9 +263,11 @@ SC.Handlebars.bindClasses = function(context, classBindings, view, id) {
     // the property changes.
     var oldClass;
 
+    var observer, invoker;
+
     // Set up an observer on the context. If the property changes, toggle the
     // class name.
-    var observer = function() {
+    observer = function() {
       // Get the current value of the property
       newClass = classStringForProperty(property);
       elem = id ? view.$("[data-handlebars-id='" + id + "']") : view.$();
@@ -256,7 +275,7 @@ SC.Handlebars.bindClasses = function(context, classBindings, view, id) {
       // If we can't find the element anymore, a parent template has been
       // re-rendered and we've been nuked. Remove the observer.
       if (elem.length === 0) {
-        context.removeObserver(property, observer);
+        context.removeObserver(property, invoker);
       } else {
         // If we had previously added a class to the element, remove it.
         if (oldClass) {
@@ -274,7 +293,11 @@ SC.Handlebars.bindClasses = function(context, classBindings, view, id) {
       }
     };
 
-    context.addObserver(property, observer);
+    invoker = function() {
+      this.invokeOnce(observer);
+    };
+
+    context.addObserver(property, invoker);
 
     // We've already setup the observer; now we just need to figure out the correct
     // behavior right now on the first pass through.

data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/handlebars/collection.js

@@ -9,12 +9,14 @@ Handlebars.registerHelper('collection', function(path, options) {
   var hash = options.hash;
   var collectionClass, collectionObject;
 
-  collectionClass = path ? SC.objectForPropertyPath(path) : SC.TemplateCollectionView;
-  //@ if (debug)
+  collectionClass = path ? SC.getPath(this, path) || SC.getPath(path) :
+    SC.TemplateCollectionView;
+
+  // @if (debug)
   if (!collectionClass) {
     throw "%@ #collection: Could not find %@".fmt(data.view, path);
   }
-  //@ endif
+  // @endif
 
   var extensions = {};
 
@@ -51,7 +53,7 @@ Handlebars.registerHelper('collection', function(path, options) {
 });
 
 Handlebars.registerHelper('each', function(path, options) {
-  options.hash.contentBinding = SC.Binding.from('*'+path, this);
+  options.hash.contentBinding = SC.Binding.from('*'+path, this).oneWay();
   options.hash.itemContextProperty = 'content';
   return Handlebars.helpers.collection.call(this, null, options);
 });

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

@@ -167,7 +167,7 @@ SC.ResponderContext = {
     if (responder) responder.set('isFirstResponder', YES);
 
     this._notifyDidBecomeFirstResponder(responder, responder, common);
-
+    
     // now, tell everyone the good news!
     this.endPropertyChanges();
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/checkbox_support.js

@@ -15,8 +15,13 @@ SC.Checkbox = SC.TemplateView.extend(
   title: null,
   value: null,
 
+  displayTitle: function() {
+    var title = this.get('title');
+    return title ? SC.String.loc(title) : null;
+  }.property('title').cacheable(),
+
   classNames: ['sc-checkbox'],
-  template: SC.Handlebars.compile('<label><input type="checkbox">{{title}}</label>'),
+  template: SC.Handlebars.compile('<label><input type="checkbox">{{displayTitle}}</label>'),
 
   didCreateLayer: function() {
     var self = this;
@@ -27,14 +32,14 @@ SC.Checkbox = SC.TemplateView.extend(
   },
 
   domValueDidChange: function(node) {
-    this.set('value', !!$(node).attr('checked'));
+    this.set('value', $(node).prop('checked'));
   },
 
   value: function(key, value) {
     if (value !== undefined) {
-      this.$('input').attr('checked', value);
+      this.$('input').prop('checked', value);
     } else {
-      value = this.$('input').attr('checked');
+      value = this.$('input').prop('checked');
     }
 
     return value;
@@ -52,9 +57,9 @@ SC.CheckboxSupport = /** @scope SC.CheckboxSupport */{
 
   value: function(key, value) {
     if (value !== undefined) {
-      this.$('input').attr('checked', value);
+      this.$('input').prop('checked', value);
     } else {
-      value = this.$('input').attr('checked');
+      value = this.$('input').prop('checked');
     }
 
     return value;

data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/text_field_support.js

@@ -14,6 +14,15 @@ SC.TextField = SC.TemplateView.extend(
 
   classNames: ['sc-text-field'],
 
+  /**
+    If set to `YES` uses textarea tag instead of input to
+    accommodate multi-line strings.
+
+    @type Boolean
+    @default NO
+  */
+  isMultiline: NO,
+
   // we can't use bindAttr because of a race condition:
   //
   // when `value` is set, the bindAttr observer immediately calls
@@ -25,18 +34,30 @@ SC.TextField = SC.TemplateView.extend(
   // In short, because we need to be able to catch changes to the
   // DOM made directly, we cannot also rely on bindAttr to update
   // the property: a chicken-and-egg problem.
-  template: SC.Handlebars.compile('<input type="text">'),
+  template: function(){
+    return SC.Handlebars.compile(this.get('isMultiline') ? '<textarea></textarea>' : '<input type="text">');
+  }.property('isMultiline').cacheable(),
+
+  $input: function() {
+    tagName = this.get('isMultiline') ? 'textarea' : 'input';
+    return this.$(tagName);
+  },
 
   didCreateLayer: function() {
     var self = this;
 
-    var input = this.$('input');
+    var input = this.$input();
     input.val(this._value);
 
-    SC.Event.add(input, 'focus', this, this.focusIn);
-    SC.Event.add(input, 'blur', this, this.focusOut);
+    if (SC.browser.msie) {
+      SC.Event.add(input, 'focusin', this, this.focusIn);
+      SC.Event.add(input, 'focusout', this, this.focusOut);
+    } else {
+      SC.Event.add(input, 'focus', this, this.focusIn);
+      SC.Event.add(input, 'blur', this, this.focusOut);
+    }
 
-    this.$('input').bind('change', function() {
+    input.bind('change', function() {
       self.domValueDidChange(SC.$(this));
     });
   },
@@ -58,11 +79,15 @@ SC.TextField = SC.TemplateView.extend(
     the underlying DOM element is created.
   */
   value: function(key, value) {
-    var input = this.$('input');
+    var input = this.$input();
 
     if (value !== undefined) {
-      this._value = value;
-      input.val(value);
+      // We don't want to unnecessarily set the value.
+      // Doing that could cause the selection to be lost.
+      if (this._value !== value || input.val() !== value) {
+        this._value = value;
+        input.val(value);
+      }
     } else if (input.length) {
       this._value = value = input.val();
     } else {
@@ -91,16 +116,17 @@ SC.TextField = SC.TemplateView.extend(
   },
 
   keyUp: function(evt) {
-    this.domValueDidChange(this.$('input'));
+    this.domValueDidChange(this.$input());
 
-    if (evt.keyCode === 13) {
-      return this.insertNewline(evt);
-    } else if (evt.keyCode === 27) {
-      return this.cancel(evt);
+    if (evt.keyCode === SC.Event.KEY_RETURN) {
+      return this.tryToPerform('insertNewline', evt);
+    } else if (evt.keyCode === SC.Event.KEY_ESC) {
+      return this.tryToPerform('cancel', evt);
     }
 
     return true;
   }
+
 });
 
 SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
@@ -109,7 +135,7 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     Used internally to store value because the layer may not exist
   */
   _value: null,
-  
+
   /**
     @type String
     @default null
@@ -118,8 +144,12 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
     var input = this.$('input');
 
     if (value !== undefined) {
-      this._value = value;
-      input.val(value);
+      // We don't want to unnecessarily set the value.
+      // Doing that could cause the selection to be lost.
+      if (this._value !== value || input.val() !== value) {
+        this._value = value;
+        input.val(value);
+      }
     } else {
       if (input.length > 0) {
         value = this._value = input.val();
@@ -136,8 +166,13 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
 
     input.val(this._value);
 
-    SC.Event.add(input, 'focus', this, this.focusIn);
-    SC.Event.add(input, 'blur', this, this.focusOut);
+    if (SC.browser.msie) {
+      SC.Event.add(input, 'focusin', this, this.focusIn);
+      SC.Event.add(input, 'focusout', this, this.focusOut);
+    } else {
+      SC.Event.add(input, 'focus', this, this.focusIn);
+      SC.Event.add(input, 'blur', this, this.focusOut);
+    }
   },
 
   focusIn: function(event) {
@@ -162,9 +197,9 @@ SC.TextFieldSupport = /** @scope SC.TextFieldSupport */{
   },
 
   keyUp: function(event) {
-    if (event.keyCode === 13) {
+    if (event.keyCode === SC.Event.KEY_RETURN) {
       return this.tryToPerform('insertNewline', event);
-    } else if (event.keyCode === 27) {
+    } else if (event.keyCode === SC.Event.KEY_ESC) {
       return this.tryToPerform('cancel', event);
     }
   }