rasputin 0.11.1 → 0.11.3

data/vendor/assets/javascripts/ember-datetime.js

@@ -1,11 +1,11 @@
-(function() {
+
+(function(exports) {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
 var get = Ember.get, set = Ember.set;
 
 // simple copy op needed for just this code.
@@ -24,7 +24,7 @@ function copy(opts) {
   @constant
   @type Error
 */
-Ember.EmberANNER_OUT_OF_BOUNDS_ERROR = "Out of bounds.";
+Ember.SCANNER_OUT_OF_BOUNDS_ERROR = "Out of bounds.";
 
 /**
   Standard error thrown by `Ember.Scanner` when  you pass a value not an integer.
@@ -33,7 +33,7 @@ Ember.EmberANNER_OUT_OF_BOUNDS_ERROR = "Out of bounds.";
   @constant
   @type Error
 */
-Ember.EmberANNER_INT_ERROR = "Not an int.";
+Ember.SCANNER_INT_ERROR = "Not an int.";
 
 /**
   Standard error thrown by `Ember.Scanner` when it cannot find a string to skip.
@@ -42,7 +42,7 @@ Ember.EmberANNER_INT_ERROR = "Not an int.";
   @constant
   @type Error
 */
-Ember.EmberANNER_SKIP_ERROR = "Did not find the string to skip.";
+Ember.SCANNER_SKIP_ERROR = "Did not find the string to skip.";
 
 /**
   Standard error thrown by `Ember.Scanner` when it can any kind a string in the
@@ -52,7 +52,7 @@ Ember.EmberANNER_SKIP_ERROR = "Did not find the string to skip.";
   @constant
   @type Error
 */
-Ember.EmberANNER_EmberAN_ARRAY_ERROR = "Did not find any string of the given array to scan.";
+Ember.SCANNER_SCAN_ARRAY_ERROR = "Did not find any string of the given array to scan.";
 
 /**
   Standard error thrown when trying to compare two dates in different
@@ -87,7 +87,7 @@ Ember.DATETIME_ISO8601 = '%Y-%m-%dT%H:%M:%S%Z';
   Scanners are used by `DateTime` to convert strings into `DateTime` objects.
 
   @extends Ember.Object
-  @since SproutCore 1.0
+  @since Ember 0.9
   @author Martin Ottenwaelter
 */
 var Scanner = Ember.Object.extend({
@@ -115,12 +115,12 @@ var Scanner = Ember.Object.extend({
     accordingly.
 
     @param {Integer} len The amount of characters to read
-    @throws {Ember.EmberANNER_OUT_OF_BOUNDS_ERROR} If asked to read too many characters
+    @throws {Ember.SCANNER_OUT_OF_BOUNDS_ERROR} If asked to read too many characters
     @returns {String} The characters
   */
   scan: function(len) {
     if (this.scanLocation + len > this.length) {
-      throw new Error(Ember.EmberANNER_OUT_OF_BOUNDS_ERROR);
+      throw new Error(Ember.SCANNER_OUT_OF_BOUNDS_ERROR);
     }
     var str = this.string.substr(this.scanLocation, len);
     this.scanLocation += len;
@@ -132,7 +132,7 @@ var Scanner = Ember.Object.extend({
 
     @param {Integer} min_len The minimum amount of characters to read
     @param {Integer} [max_len] The maximum amount of characters to read (defaults to the minimum)
-    @throws {Ember.EmberANNER_INT_ERROR} If asked to read non numeric characters
+    @throws {Ember.SCANNER_INT_ERROR} If asked to read non numeric characters
     @returns {Integer} The scanned integer
   */
   scanInt: function(min_len, max_len) {
@@ -140,7 +140,7 @@ var Scanner = Ember.Object.extend({
     var str = this.scan(max_len);
     var re = new RegExp("^\\d{" + min_len + "," + max_len + "}");
     var match = str.match(re);
-    if (!match) throw new Error(Ember.EmberANNER_INT_ERROR);
+    if (!match) throw new Error(Ember.SCANNER_INT_ERROR);
     if (match[0].length < max_len) {
       this.scanLocation += match[0].length - max_len;
     }
@@ -151,12 +151,12 @@ var Scanner = Ember.Object.extend({
     Attempts to skip a given string.
 
     @param {String} str The string to skip
-    @throws {Ember.EmberANNER_SKIP_ERROR} If the given string could not be scanned
+    @throws {Ember.SCANNER_SKIP_ERROR} If the given string could not be scanned
     @returns {Boolean} YES if the given string was successfully scanned, NO otherwise
   */
   skipString: function(str) {
     if (this.scan(str.length) !== str) {
-      throw new Error(Ember.EmberANNER_SKIP_ERROR);
+      throw new Error(Ember.SCANNER_SKIP_ERROR);
     }
     
     return YES;
@@ -166,7 +166,7 @@ var Scanner = Ember.Object.extend({
     Attempts to scan any string in a given array.
 
     @param {Array} ary the array of strings to scan
-    @throws {Ember.EmberANNER_EmberAN_ARRAY_ERROR} If no string of the given array is found
+    @throws {Ember.SCANNER_SCAN_ARRAY_ERROR} If no string of the given array is found
     @returns {Integer} The index of the scanned string of the given array
   */
   scanArray: function(ary) {
@@ -176,7 +176,7 @@ var Scanner = Ember.Object.extend({
       }
       this.scanLocation -= ary[i].length;
     }
-    throw new Error(Ember.EmberANNER_EmberAN_ARRAY_ERROR);
+    throw new Error(Ember.SCANNER_SCAN_ARRAY_ERROR);
   }
 
 });
@@ -218,7 +218,7 @@ var Scanner = Ember.Object.extend({
   @author Martin Ottenwaelter
   @author Jonathan Lewis
   @author Josh Holt
-  @since SproutCore 1.0
+  @since Ember 1.0
 */
 Ember.DateTime = Ember.Object.extend(Ember.Freezable, Ember.Copyable,
 /** @scope Ember.DateTime.prototype */ {
@@ -1175,12 +1175,13 @@ Ember.Binding.dateTime = function(format) {
 };
 
 
-})();
-(function() {
+})({});
+
+
+(function(exports) {
 // ==========================================================================
-// Project:   SproutCore DateTime
+// Project:   Ember DateTime
 // Copyright: ©2010 Strobe Inc. and contributors
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
-})();
+})({});

data/vendor/assets/javascripts/ember.js

@@ -1608,7 +1608,7 @@ if ('undefined' === typeof Ember) {
 /**
   @namespace
   @name Ember
-  @version 0.9
+  @version 0.9.3
 
   All Ember methods and functions are defined inside of this namespace.
   You generally should not add new properties to this namespace as it may be
@@ -1625,7 +1625,10 @@ if ('undefined' === typeof Ember) {
   The core Runtime framework is based on the jQuery API with a number of
   performance optimizations.
 */
-Ember = {};
+
+// Create core object. Make it act like an instance of Ember.Namespace so that
+// objects assigned to it are given a sane string representation.
+Ember = { isNamespace: true, toString: function() { return "Ember"; } };
 
 // aliases needed to keep minifiers from removing the global context
 if ('undefined' !== typeof window) {
@@ -1637,10 +1640,10 @@ if ('undefined' !== typeof window) {
 /**
   @static
   @type String
-  @default '0.9'
+  @default '0.9.3'
   @constant
 */
-Ember.VERSION = '0.9';
+Ember.VERSION = '0.9.3';
 
 /**
   @static
@@ -1692,7 +1695,7 @@ Ember.K = function() { return this; };
     will be executed.  If the function returns false an exception will be
     thrown.
 */
-window.ember_assert = function ember_assert(desc, test) {
+window.ember_assert = window.sc_assert = function ember_assert(desc, test) {
   if ('function' === typeof test) test = test()!==false;
   if (!test) throw new Error("assertion failed: "+desc);
 };
@@ -2542,8 +2545,7 @@ Ember.trySetPath = function(root, path, value) {
 */
 Ember.isGlobalPath = function(path) {
   return !HAS_THIS.test(path) && IS_GLOBAL.test(path);
-}
-
+};
 
 })({});
 
@@ -2632,7 +2634,7 @@ var array_Slice = Array.prototype.slice;
 var ObserverSet = function(iterateable) {
   this.set = {};
   if (iterateable) { this.array = []; }
-}
+};
 
 ObserverSet.prototype.add = function(target, name) {
   var set = this.set, guid = Ember.guidFor(target), array;
@@ -2707,11 +2709,11 @@ Ember.endPropertyChanges = function() {
 Ember.changeProperties = function(cb){
   Ember.beginPropertyChanges();
   try {
-    cb()
+    cb();
   } finally {
     Ember.endPropertyChanges();
   }
-}
+};
 
 function changeEvent(keyName) {
   return keyName+AFTER_OBSERVERS;
@@ -2736,7 +2738,7 @@ function xformForArgs(args) {
     if (method.length>2) val = Ember.getPath(obj, keyName);
     copy_args.unshift(obj, keyName, val);
     method.apply(target, copy_args);
-  }
+  };
 }
 
 var xformChange = xformForArgs([]);
@@ -3825,13 +3827,16 @@ var RunLoop = function(prev) {
   self.onceTimers = {};
 
   return self;
-}
+};
 
 K.prototype = RunLoop.prototype;
 
 RunLoop.prototype = {
   end: function() {
     this.flush();
+  },
+
+  prev: function() {
     return this._prev;
   },
 
@@ -3968,7 +3973,12 @@ Ember.run.begin = function() {
 */
 Ember.run.end = function() {
   ember_assert('must have a current run loop', run.currentRunLoop);
-  run.currentRunLoop = run.currentRunLoop.end();
+  try {
+    run.currentRunLoop.end();
+  }
+  finally {
+    run.currentRunLoop = run.currentRunLoop.prev();
+  }
 };
 
 /**
@@ -4973,7 +4983,7 @@ function mixinProperties(to, from) {
       to[key] = from[key];
     }
   }
-};
+}
 
 mixinProperties(Binding, {
 
@@ -5119,7 +5129,7 @@ Ember.bind = function(obj, to, from) {
 
 Ember.oneWay = function(obj, to, from) {
   return new Ember.Binding(to, from).oneWay().connect(obj);
-}
+};
 
 })({});
 
@@ -5459,7 +5469,7 @@ function invokeEvents(targetSet, params) {
     for(var methodGuid in actionSet) {
       if (SKIP_PROPERTIES[methodGuid]) { continue; }
 
-      var action = actionSet[methodGuid]
+      var action = actionSet[methodGuid];
       if (!action) { continue; }
 
       // Extract target and method for each action
@@ -5988,6 +5998,7 @@ Mixin.prototype.keys = function() {
 /** @private - make Mixin's have nice displayNames */
 
 var NAME_KEY = Ember.GUID_KEY+'_name';
+var get = Ember.get;
 
 function processNames(paths, root, seen) {
   var idx = paths.length;
@@ -5998,7 +6009,7 @@ function processNames(paths, root, seen) {
 
     if (obj && obj.toString === classToString) {
       obj[NAME_KEY] = paths.join('.');
-    } else if (key==='Ember' || (Ember.Namespace && obj instanceof Ember.Namespace)) {
+    } else if (obj && get(obj, 'isNamespace')) {
       if (seen[Ember.guidFor(obj)]) continue;
       seen[Ember.guidFor(obj)] = true;
       processNames(paths, obj, seen);
@@ -6019,7 +6030,7 @@ function findNamespaces() {
 
     obj = window[prop];
 
-    if (obj && obj instanceof Namespace) {
+    if (obj && get(obj, 'isNamespace')) {
       obj[NAME_KEY] = prop;
     }
   }
@@ -6030,12 +6041,12 @@ Ember.identifyNamespaces = findNamespaces;
 superClassString = function(mixin) {
   var superclass = mixin.superclass;
   if (superclass) {
-    if (superclass[NAME_KEY]) { return superclass[NAME_KEY] }
+    if (superclass[NAME_KEY]) { return superclass[NAME_KEY]; }
     else { return superClassString(superclass); }
   } else {
     return;
   }
-}
+};
 
 classToString = function() {
   var Namespace = Ember.Namespace, namespace;
@@ -8484,6 +8495,7 @@ Ember.Error = function() {
   for (var p in tmp) {
     if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
   }
+  this.message = tmp.message;
 };
 
 Ember.Error.prototype = Ember.create(Error.prototype);
@@ -9670,6 +9682,8 @@ Ember.TargetActionSupport = Ember.Mixin.create({
 
 */
 Ember.Namespace = Ember.Object.extend({
+  isNamespace: true,
+
   init: function() {
     Ember.Namespace.NAMESPACES.push(this);
     Ember.Namespace.PROCESSED = false;
@@ -9688,8 +9702,8 @@ Ember.Namespace = Ember.Object.extend({
   }
 });
 
-Ember.Namespace.NAMESPACES = [];
-Ember.Namespace.PROCESSED = true;
+Ember.Namespace.NAMESPACES = [Ember];
+Ember.Namespace.PROCESSED = false;
 
 })({});
 
@@ -10520,7 +10534,7 @@ Ember.EventDispatcher = Ember.Object.extend(
     ember_assert('You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application', !rootElement.closest('.ember-application').length);
     ember_assert('You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application', !rootElement.find('.ember-application').length);
 
-    rootElement.addClass('ember-application')
+    rootElement.addClass('ember-application');
 
     for (event in events) {
       if (events.hasOwnProperty(event)) {
@@ -11339,6 +11353,28 @@ Ember.View = Ember.Object.extend(
     return this;
   },
 
+  /**
+    Replaces the view's element to the specified parent element.
+    If the view does not have an HTML representation yet, `createElement()`
+    will be called automatically.
+    If the parent element already has some content, it will be removed.
+
+    Note that this method just schedules the view to be appended; the DOM
+    element will not be appended to the given element until all bindings have
+    finished synchronizing
+
+    @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
+    @returns {Ember.View} received
+  */
+  replaceIn: function(target) {
+    this._insertElementLater(function() {
+      Ember.$(target).empty();
+      this.$().appendTo(target);
+    });
+
+    return this;
+  },
+
   /**
     @private
 
@@ -11390,7 +11426,9 @@ Ember.View = Ember.Object.extend(
     // In the interim, we will just re-render if that happens. It is more
     // important than elements get garbage collected.
     this.destroyElement();
-    this.clearRenderedChildren();
+    this.invokeRecursively(function(view) {
+      view.clearRenderedChildren();
+    });
   },
 
   /**
@@ -12086,8 +12124,8 @@ Ember.View.states.preRender = {
   // a view leaves the preRender state once its element has been
   // created (createElement).
   insertElement: function(view, fn) {
-    view._notifyWillInsertElement(true);
     view.createElement();
+    view._notifyWillInsertElement(true);
     // after createElement, the view will be in the hasElement state.
     fn.call(view);
     view.transitionTo('inDOM');
@@ -12523,7 +12561,7 @@ Ember.ContainerView.states = {
 
 Ember.ContainerView.states.inDOM = {
   parentState: Ember.ContainerView.states.hasElement
-}
+};
 
 Ember.ContainerView.reopen({
   states: Ember.ContainerView.states
@@ -12673,7 +12711,7 @@ Ember.CollectionView = Ember.ContainerView.extend(
       var emptyView = get(this, 'emptyView');
       if (!emptyView) { return; }
 
-      emptyView = this.createChildView(emptyView)
+      emptyView = this.createChildView(emptyView);
       addedViews.push(emptyView);
       set(this, 'emptyView', emptyView);
     }
@@ -12803,6 +12841,27 @@ Ember.StateManager = Ember.State.extend({
 
   currentState: null,
 
+  /**
+    If the current state is a view state or the descendent of a view state,
+    this property will be the view associated with it. If there is no
+    view state active in this state manager, this value will be null.
+  */
+  currentView: SC.computed(function() {
+    var currentState = get(this, 'currentState'),
+        view;
+
+    while (currentState) {
+      if (get(currentState, 'isViewState')) {
+        view = get(currentState, 'view');
+        if (view) { return view; }
+      }
+
+      currentState = get(currentState, 'parentState');
+    }
+
+    return null;
+  }).property('currentState').cacheable(),
+
   send: function(event, context) {
     this.sendRecursively(event, get(this, 'currentState'), context);
   },
@@ -12832,9 +12891,9 @@ Ember.StateManager = Ember.State.extend({
     if (!newState) {
       while (state && !newState) {
         exitStates[Ember.guidFor(state)] = state;
-        exitStates.push(state)
+        exitStates.push(state);
 
-        state = get(state, 'parentState')
+        state = get(state, 'parentState');
         if (!state) {
           state = get(this, 'states');
         }
@@ -12872,7 +12931,7 @@ Ember.StateManager = Ember.State.extend({
       resume: function() {
         self.asyncEach(tail, callback, doneCallback);
       }
-    }
+    };
 
     callback.call(this, head, transition);
 
@@ -12927,6 +12986,8 @@ Ember.StateManager = Ember.State.extend({
 var get = Ember.get, set = Ember.set;
 
 Ember.ViewState = Ember.State.extend({
+  isViewState: true,
+
   enter: function(stateManager) {
     var view = get(this, 'view');
 
@@ -13005,7 +13066,7 @@ Ember.ViewState = Ember.State.extend({
 
   K.prototype = Metamorph.prototype;
 
-  var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, startTagFunc, endTagFunc;
+  var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
 
   outerHTMLFunc = function() {
     return this.startTag() + this.innerHTML + this.endTag();
@@ -13062,7 +13123,7 @@ Ember.ViewState = Ember.State.extend({
       // create a new document fragment for the HTML
       var fragment = range.createContextualFragment(html);
 
-      // inser the fragment into the range
+      // insert the fragment into the range
       range.insertNode(fragment);
     };
 
@@ -13082,6 +13143,29 @@ Ember.ViewState = Ember.State.extend({
       var frag = range.createContextualFragment(this.outerHTML());
       node.appendChild(frag);
     };
+
+    afterFunc = function(html) {
+      var range = document.createRange();
+      var after = document.getElementById(this.end);
+
+      range.setStartAfter(after);
+      range.setEndAfter(after);
+
+      var fragment = range.createContextualFragment(html);
+      range.insertNode(fragment);
+    };
+
+    prependFunc = function(html) {
+      var range = document.createRange();
+      var start = document.getElementById(this.start);
+
+      range.setStartAfter(start);
+      range.setEndAfter(start);
+
+      var fragment = range.createContextualFragment(html);
+      range.insertNode(fragment);
+    };
+
   } else {
     /**
      * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
@@ -13266,6 +13350,43 @@ Ember.ViewState = Ember.State.extend({
         node = nextSibling;
       }
     };
+
+    afterFunc = function(html) {
+      // get the real starting node. see realNode for details.
+      var end = document.getElementById(this.end);
+      var parentNode = end.parentNode;
+      var nextSibling;
+      var node;
+
+      // get the first node for the HTML string, even in cases like
+      // tables and lists where a simple innerHTML on a div would
+      // swallow some of the content.
+      node = firstNodeFor(parentNode, html);
+
+      // copy the nodes for the HTML between the starting and ending
+      // placeholder.
+      while (node) {
+        nextSibling = node.nextSibling;
+        parentNode.insertBefore(node, end.nextSibling);
+        node = nextSibling;
+      }
+    };
+
+    prependFunc = function(html) {
+      var start = document.getElementById(this.start);
+      var parentNode = start.parentNode;
+      var nextSibling;
+      var node;
+
+      node = firstNodeFor(parentNode, html);
+      var insertBefore = start.nextSibling;
+
+      while (node) {
+        nextSibling = node.nextSibling;
+        parentNode.insertBefore(node, insertBefore);
+        node = nextSibling;
+      }
+    }
   }
 
   Metamorph.prototype.html = function(html) {
@@ -13285,6 +13406,8 @@ Ember.ViewState = Ember.State.extend({
   Metamorph.prototype.remove = removeFunc;
   Metamorph.prototype.outerHTML = outerHTMLFunc;
   Metamorph.prototype.appendTo = appendToFunc;
+  Metamorph.prototype.after = afterFunc;
+  Metamorph.prototype.prepend = prependFunc;
   Metamorph.prototype.startTag = startTagFunc;
   Metamorph.prototype.endTag = endTagFunc;
 
@@ -13675,6 +13798,48 @@ Ember.TextArea = Ember.View.extend(Ember.TextSupport, {
 })({});
 
 
+(function(exports) {
+Ember.TabContainerView = Ember.View.extend();
+
+})({});
+
+
+(function(exports) {
+var get = Ember.get, getPath = Ember.getPath;
+
+Ember.TabPaneView = Ember.View.extend({
+  tabsContainer: SC.computed(function() {
+    return this.nearestInstanceOf(Ember.TabContainerView);
+  }).property(),
+
+  isVisible: SC.computed(function() {
+    return get(this, 'viewName') === getPath(this, 'tabsContainer.currentView');
+  }).property('tabsContainer.currentView')
+});
+
+})({});
+
+
+(function(exports) {
+var get = Ember.get, setPath = Ember.setPath;
+
+Ember.TabView = Ember.View.extend({
+  tabsContainer: SC.computed(function() {
+    return this.nearestInstanceOf(Ember.TabContainerView);
+  }).property(),
+
+  mouseUp: function() {
+    setPath(this, 'tabsContainer.currentView', get(this, 'value'));
+  }
+});
+
+})({});
+
+
+(function(exports) {
+})({});
+
+
 (function(exports) {
 // ==========================================================================
 // Project:   Ember Handlebar Views
@@ -13724,8 +13889,7 @@ Ember.Metamorph = Ember.Mixin.create({
 
       childView._insertElementLater(function() {
         var morph = get(view, 'morph');
-        var script = Ember.$("#" + morph.start);
-        script.after(get(childView, 'outerHTML'));
+        morph.prepend(get(childView, 'outerHTML'));
         childView.set('outerHTML', null);
       });
     },
@@ -13735,8 +13899,7 @@ Ember.Metamorph = Ember.Mixin.create({
 
       nextView._insertElementLater(function() {
         var morph = get(view, 'morph');
-        var script = Ember.$("#" + morph.end);
-        script.after(get(nextView, 'outerHTML'));
+        morph.after(get(nextView, 'outerHTML'));
         nextView.set('outerHTML', null);
       });
     },
@@ -14141,7 +14304,7 @@ Ember.Handlebars.registerHelper('bindAttr', function(options) {
 
       ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), result == null || typeof result === 'number' || typeof result === 'string' || typeof result === 'boolean');
 
-      var elem = view.$("[data-handlebars-id='" + dataId + "']");
+      var elem = view.$("[data-bindAttr-" + dataId + "='" + dataId + "']");
 
       // If we aren't able to find the element, it means the element
       // to which we were bound has been removed from the view.
@@ -14190,7 +14353,7 @@ Ember.Handlebars.registerHelper('bindAttr', function(options) {
   }, this);
 
   // Add the unique identifier
-  ret.push('data-handlebars-id="' + dataId + '"');
+  ret.push('data-bindAttr-' + dataId + '="' + dataId + '"');
   return new Ember.Handlebars.SafeString(ret.join(' '));
 });
 
@@ -14215,12 +14378,12 @@ Ember.Handlebars.registerHelper('bindAttr', function(options) {
   @param {Ember.View} view
     The view in which observers should look for the element to update
 
-  @param {String} id 
-    Optional id use to lookup elements
+  @param {Srting} bindAttrId
+    Optional bindAttr id used to lookup elements
 
   @returns {Array} An array of class names to add
 */
-Ember.Handlebars.bindClasses = function(context, classBindings, view, id) {
+Ember.Handlebars.bindClasses = function(context, classBindings, view, bindAttrId) {
   var ret = [], newClass, value, elem;
 
   // Helper method to retrieve the property from the context and
@@ -14272,7 +14435,7 @@ Ember.Handlebars.bindClasses = function(context, classBindings, view, id) {
     observer = function() {
       // Get the current value of the property
       newClass = classStringForProperty(binding);
-      elem = id ? view.$("[data-handlebars-id='" + id + "']") : view.$();
+      elem = bindAttrId ? view.$("[data-bindAttr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
 
       // If we can't find the element anymore, a parent template has been
       // re-rendered and we've been nuked. Remove the observer.
@@ -14377,14 +14540,10 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
       if (Ember.IS_BINDING.test(prop)) {
         path = options[prop];
         if (!Ember.isGlobalPath(path)) {
-
-          // Deprecation warning for users of beta 2 and lower, where
-          // this facility was not available. The workaround was to bind
-          // to parentViews; since this is no longer necessary, issue
-          // a notice.
-          if (PARENT_VIEW_PATH.test(path)) {
-            Ember.Logger.warn("As of SproutCore 2.0 beta 3, it is no longer necessary to bind to parentViews. Instead, please provide binding paths relative to the current Handlebars context.");
-          } else {
+          // Binding to parentViews was previously deprecated. In most cases it shouldn't be necessary, but since
+          // there are a few valid use cases and most people have broken the parentView habit, we're no longer
+          // providing a warning about it.
+          if (!PARENT_VIEW_PATH.test(path)) {
             if (path === 'this') {
               options[prop] = 'bindingContext';
             } else {
@@ -14687,16 +14846,24 @@ Ember.Handlebars.registerHelper('template', function(name, options) {
 // Find templates stored in the head tag as script tags and make them available
 // to Ember.CoreView in the global Ember.TEMPLATES object. This will be run as as
 // jQuery DOM-ready callback.
+//
+// Script tags with type="text/html" or "text/x-handlebars" will be compiled
+// with Ember's Handlebars and are suitable for use as a view's template.
+// Those with type="text/x-raw-handlebars" will be compiled with regular
+// Handlebars and are suitable for use in views' computed properties.
 Ember.Handlebars.bootstrap = function() {
-  Ember.$('script[type="text/html"], script[type="text/x-handlebars"]')
+  Ember.$('script[type="text/html"], script[type="text/x-handlebars"], script[type="text/x-raw-handlebars"]')
     .each(function() {
     // Get a reference to the script tag
     var script = Ember.$(this),
+      compile = (script.attr('type') === 'text/x-raw-handlebars') ?
+                  Ember.$.proxy(Handlebars.compile, Handlebars) :
+                  Ember.$.proxy(Ember.Handlebars.compile, Ember.Handlebars),
       // Get the name of the script, used by Ember.View's templateName property.
       // First look for data-template-name attribute, then fall back to its
       // id if no name is found.
       templateName = script.attr('data-template-name') || script.attr('id'),
-      template = Ember.Handlebars.compile(script.html()),
+      template = compile(script.html()),
       view, viewPath;
 
     if (templateName) {