rasputin 0.10.2 → 0.10.3

data/vendor/assets/javascripts/sproutcore.js

@@ -9537,6 +9537,43 @@ SC.Comparable = SC.Mixin.create( /** @scope SC.Comparable.prototype */{
 })({});
 
 
+(function(exports) {
+var get = SC.get, set = SC.set;
+
+SC.TargetActionSupport = SC.Mixin.create({
+  target: null,
+  action: null,
+
+  targetObject: function() {
+    var target = get(this, 'target');
+
+    if (SC.typeOf(target) === "string") {
+      return SC.getPath(this, target);
+    } else {
+      return target;
+    }
+  }.property('target').cacheable(),
+
+  triggerAction: function() {
+    var action = get(this, 'action'),
+        target = get(this, 'targetObject');
+
+    if (target && action) {
+      if (typeof target.send === 'function') {
+        target.send(action, this);
+      } else {
+        if (typeof action === 'string') {
+          action = target[action];
+        }
+        action.call(target, this);
+      }
+    }
+  }
+});
+
+})({});
+
+
 (function(exports) {
 // ==========================================================================
 // Project:  SproutCore Runtime
@@ -11064,11 +11101,11 @@ SC.View = SC.Object.extend(
 
         type = typeof attributeValue;
 
-        if ((type === 'string' || type === 'number') && attributeValue !== currentValue) {
+        if ((type === 'string' || (type === 'number' && !isNaN(attributeValue))) && attributeValue !== currentValue) {
           elem.attr(attribute, attributeValue);
         } else if (attributeValue && type === 'boolean') {
           elem.attr(attribute, attribute);
-        } else if (attributeValue === NO) {
+        } else if (!attributeValue) {
           elem.removeAttr(attribute);
         }
       };
@@ -11948,7 +11985,7 @@ SC.View.reopen({
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 SC.View.states.preRender = {
-  parentState: SC.View.states.default,
+  parentState: SC.View.states['default'],
 
   // a view leaves the preRender state once its element has been
   // created (createElement).
@@ -11992,7 +12029,7 @@ SC.View.states.preRender = {
 var get = SC.get, set = SC.set, meta = SC.meta;
 
 SC.View.states.inBuffer = {
-  parentState: SC.View.states.default,
+  parentState: SC.View.states['default'],
 
   $: function(view, sel) {
     // if we don't have an element yet, someone calling this.$() is
@@ -12069,7 +12106,7 @@ SC.View.states.inBuffer = {
 var get = SC.get, set = SC.set, meta = SC.meta;
 
 SC.View.states.hasElement = {
-  parentState: SC.View.states.default,
+  parentState: SC.View.states['default'],
 
   $: function(view, sel) {
     var elem = get(view, 'element');
@@ -12137,7 +12174,7 @@ SC.View.states.inDOM = {
 var destroyedError = "You can't call %@ on a destroyed view", fmt = SC.String.fmt;
 
 SC.View.states.destroyed = {
-  parentState: SC.View.states.default,
+  parentState: SC.View.states['default'],
 
   appendChild: function() {
     throw fmt(destroyedError, ['appendChild']);
@@ -12452,7 +12489,7 @@ SC.CollectionView = SC.ContainerView.extend(
     var content = get(this, 'content');
 
     if (content) {
-      sc_assert(fmt("an ArrayController's content must implement SC.Array. You passed %@", [content]), content.addArrayObserver != null);
+      sc_assert(fmt("an SC.CollectionView's content must implement SC.Array. You passed %@", [content]), content.addArrayObserver != null);
       content.addArrayObserver(this);
     }
 
@@ -13102,21 +13139,17 @@ SC.Checkbox = SC.View.extend({
 
 var get = SC.get, set = SC.set;
 
-SC.TextField = SC.View.extend(
-  /** @scope SC.TextField.prototype */ {
+SC.TextSupport = SC.Mixin.create({
 
-  classNames: ['sc-text-field'],
-
-  insertNewline: SC.K,
-  cancel: SC.K,
-
-  tagName: "input",
-  attributeBindings: ['type', 'placeholder', 'value', 'disabled'],
-  type: "text",
   value: "",
+
+  attributeBindings: ['placeholder', 'disabled'],
   placeholder: null,
   disabled: false,
 
+  insertNewline: SC.K,
+  cancel: SC.K,
+
   focusOut: function(event) {
     this._elementValueDidChange();
     return false;
@@ -13136,28 +13169,24 @@ SC.TextField = SC.View.extend(
     @private
   */
   interpretKeyEvents: function(event) {
-    var map = SC.TextField.KEY_EVENTS;
+    var map = SC.TextSupport.KEY_EVENTS;
     var method = map[event.keyCode];
 
+    this._elementValueDidChange();
     if (method) { return this[method](event); }
-    else { this._elementValueDidChange(); }
   },
 
   _elementValueDidChange: function() {
-    set(this, 'value', this.$().val());
-  },
-
-  _updateElementValue: function() {
-    this.$().val(get(this, 'value'));
+    set(this, 'value', this.$().val() || null);
   }
+
 });
 
-SC.TextField.KEY_EVENTS = {
+SC.TextSupport.KEY_EVENTS = {
   13: 'insertNewline',
   27: 'cancel'
 };
 
-
 })({});
 
 
@@ -13167,10 +13196,40 @@ SC.TextField.KEY_EVENTS = {
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/** @class */
+
+var get = SC.get, set = SC.set;
+
+SC.TextField = SC.View.extend(SC.TextSupport,
+  /** @scope SC.TextField.prototype */ {
+
+  classNames: ['sc-text-field'],
+
+  tagName: "input",
+  attributeBindings: ['type', 'value'],
+  type: "text",
+
+  /**
+    @private
+  */
+  _updateElementValue: function() {
+    this.$().val(get(this, 'value'));
+  }
+
+});
+
+})({});
+
 
+(function(exports) {
+// ==========================================================================
+// Project:   SproutCore Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
 var get = SC.get, set = SC.set;
 
-SC.Button = SC.View.extend({
+SC.Button = SC.View.extend(SC.TargetActionSupport, {
   classNames: ['sc-button'],
   classNameBindings: ['isActive'],
 
@@ -13179,15 +13238,6 @@ SC.Button = SC.View.extend({
   type: 'button',
   disabled: false,
 
-  targetObject: function() {
-    var target = get(this, 'target');
-
-    if (SC.typeOf(target) === "string") {
-      return SC.getPath(this, target);
-    } else {
-      return target;
-    }
-  }.property('target').cacheable(),
 
   mouseDown: function() {
     set(this, 'isActive', true);
@@ -13211,16 +13261,10 @@ SC.Button = SC.View.extend({
 
   mouseUp: function(event) {
     if (get(this, 'isActive')) {
-      var action = get(this, 'action'),
-          target = get(this, 'targetObject');
-
-      if (target && action) {
-        if (typeof action === 'string') {
-          action = target[action];
-        }
-        action.call(target, this);
-      }
 
+      // Actually invoke the button's target and action.
+      // This method comes from the SC.TargetActionSupport mixin.
+      this.triggerAction();
       set(this, 'isActive', false);
     }
 
@@ -13254,33 +13298,11 @@ SC.Button = SC.View.extend({
 
 var get = SC.get, set = SC.set;
 
-SC.TextArea = SC.View.extend({
+SC.TextArea = SC.View.extend(SC.TextSupport, {
 
   classNames: ['sc-text-area'],
 
   tagName: "textarea",
-  value: "",
-  attributeBindings: ['placeholder', 'disabled'],
-  placeholder: null,
-  disabled: false,
-
-  insertNewline: SC.K,
-  cancel: SC.K,
-  
-  focusOut: function(event) {
-    this._elementValueDidChange();
-    return false;
-  },
-
-  change: function(event) {
-    this._elementValueDidChange();
-    return false;
-  },
-
-  keyUp: function(event) {
-    this.interpretKeyEvents(event);
-    return false;
-  },
 
   /**
     @private
@@ -13289,27 +13311,11 @@ SC.TextArea = SC.View.extend({
     this._updateElementValue();
   },
 
-  interpretKeyEvents: function(event) {
-    var map = SC.TextArea.KEY_EVENTS;
-    var method = map[event.keyCode];
-
-    this._elementValueDidChange();
-    if (method) { return this[method](event); }
-  },
-
-  _elementValueDidChange: function() {
-    set(this, 'value', this.$().val() || null);
-  },
-
   _updateElementValue: function() {
     this.$().val(get(this, 'value'));
   }.observes('value')
-});
 
-SC.TextArea.KEY_EVENTS = {
-  13: 'insertNewline',
-  27: 'cancel'
-};
+});
 
 })({});
 
@@ -13389,6 +13395,7 @@ SC.Metamorph = SC.Mixin.create({
       var buffer = view.renderToBuffer();
 
       SC.run.schedule('render', this, function() {
+        if (get(view, 'isDestroyed')) { return; }
         view._notifyWillInsertElement();
         morph.replaceWith(buffer.string());
         view.transitionTo('inDOM');
@@ -13557,13 +13564,6 @@ SC._BindableSpanView = SC.View.extend(SC.Metamorph,
     }
 
     return this._super(buffer);
-  },
-
-  destroy: function() {
-    var removeObserver = get(this, 'removeObserver');
-    removeObserver();
-
-    this._super();
   }
 });
 
@@ -13606,23 +13606,27 @@ var get = SC.get, getPath = SC.getPath, set = SC.set, fmt = SC.String.fmt;
 
       view.appendChild(bindView);
 
-      var observer = function() {
-        SC.run.once(function() {
-          // Double check since sometimes the view gets destroyed after this observer is already queued
-          if (!get(bindView, 'isDestroyed')) { bindView.rerender(); }
-        });
+      var observer, invoker;
+
+      observer = function(){
+        // Double check since sometimes the view gets destroyed after this observer is already queued
+        if (!get(bindView, 'isDestroyed')) { bindView.rerender(); }
       };
 
-      set(bindView, 'removeObserver', function() {
-        SC.removeObserver(ctx, property, observer);
-      });
+      invoker = function() {
+        SC.run.once(observer);
+      };
 
       // Observes the given property on the context and
       // tells the SC._BindableSpan to re-render. If property
       // is an empty string, we are printing the current context
       // object ({{this}}) so updating it is not our responsibility.
       if (property !== '') {
-        SC.addObserver(ctx, property, observer);
+        set(bindView, 'removeObserver', function() {
+          SC.removeObserver(ctx, property, invoker);
+        });
+
+        SC.addObserver(ctx, property, invoker);
       }
     } else {
       // The object is not observable, so just render it out and
@@ -13756,7 +13760,7 @@ SC.Handlebars.registerHelper('bindAttr', function(options) {
   // Generate a unique id for this element. This will be added as a
   // data attribute to the element so it can be looked up when
   // the bound property changes.
-  var dataId = jQuery.uuid++;
+  var dataId = ++jQuery.uuid;
 
   // Handle classes differently, as we can bind multiple classes
   var classBindings = attrs['class'];

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rasputin
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000 Z
+date: 2011-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70338105728980 !ruby/object:Gem::Requirement
+  requirement: &70095015952600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70338105728980
+  version_requirements: *70095015952600
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70338105727020 !ruby/object:Gem::Requirement
+  requirement: &70095015950600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70338105727020
+  version_requirements: *70095015950600
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70338105725060 !ruby/object:Gem::Requirement
+  requirement: &70095015949940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,18 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70338105725060
+  version_requirements: *70095015949940
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &70095015965180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70095015965180
 description: SproutCore 2.0 for the Rails asset pipeline.
 email:
 - paul@chavard.net
@@ -66,6 +77,7 @@ files:
 - vendor/assets/javascripts/TransformJS.js
 - vendor/assets/javascripts/modernizr.js
 - vendor/assets/javascripts/sproutcore-datastore.js
+- vendor/assets/javascripts/sproutcore-datetime.js
 - vendor/assets/javascripts/sproutcore-i18n.js
 - vendor/assets/javascripts/sproutcore-routing.js
 - vendor/assets/javascripts/sproutcore-statechart.js