- Ember.View.create({
+ Ember.View.extend({
attributeBindings: ['enabled'],
enabled: true
});
@@ -16956,14 +17923,6 @@ Ember.View = Ember.CoreView.extend(
Ember.assert("Only arrays are allowed for 'classNames'", Ember.typeOf(this.classNames) === 'array');
this.classNames = Ember.A(this.classNames.slice());
-
- var viewController = get(this, 'viewController');
- if (viewController) {
- viewController = get(viewController);
- if (viewController) {
- set(viewController, 'view', this);
- }
- }
},
appendChild: function(view, options) {
@@ -17074,7 +18033,7 @@ Ember.View = Ember.CoreView.extend(
act as a child of the parent.
@method createChildView
- @param {Class} viewClass
+ @param {Class|String} viewClass
@param {Hash} [attrs] Attributes to add
@return {Ember.View} new instance
*/
@@ -17085,11 +18044,11 @@ Ember.View = Ember.CoreView.extend(
attrs = attrs || {};
attrs._parentView = this;
- attrs.container = this.container;
if (Ember.CoreView.detect(view)) {
attrs.templateData = attrs.templateData || get(this, 'templateData');
+ attrs.container = this.container;
view = view.create(attrs);
// don't set the property on a virtual view, as they are invisible to
@@ -17097,14 +18056,24 @@ Ember.View = Ember.CoreView.extend(
if (view.viewName) {
set(get(this, 'concreteView'), view.viewName, view);
}
+ } else if ('string' === typeof view) {
+ var fullName = 'view:' + view;
+ var View = this.container.lookupFactory(fullName);
+
+ Ember.assert("Could not find view: '" + fullName + "'", !!View);
+
+ attrs.templateData = get(this, 'templateData');
+ view = View.create(attrs);
} else {
Ember.assert('You must pass instance or subclass of View', view.isView);
-
- Ember.setProperties(view, attrs);
+ attrs.container = this.container;
if (!get(view, 'templateData')) {
- set(view, 'templateData', get(this, 'templateData'));
+ attrs.templateData = get(this, 'templateData');
}
+
+ Ember.setProperties(view, attrs);
+
}
return view;
@@ -17218,7 +18187,7 @@ Ember.View = Ember.CoreView.extend(
}
var view = this,
- stateCheckedObserver = function(){
+ stateCheckedObserver = function() {
view.currentState.invokeObserver(this, observer);
},
scheduledObserver = function() {
@@ -17452,7 +18421,7 @@ Ember.View.applyAttributeBindings = function(elem, name, value) {
}
} else if (name === 'value' || type === 'boolean') {
// We can't set properties to undefined or null
- if (!value) { value = ''; }
+ if (Ember.isNone(value)) { value = ''; }
if (value !== elem.prop(name)) {
// value and booleans should always be properties
@@ -18152,7 +19121,10 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, {
initializeViews: function(views, parentView, templateData) {
forEach(views, function(view) {
set(view, '_parentView', parentView);
- set(view, 'container', parentView && parentView.container);
+
+ if (!view.container && parentView) {
+ set(view, 'container', parentView.container);
+ }
if (!get(view, 'templateData')) {
set(view, 'templateData', templateData);
@@ -18479,7 +19451,7 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
var content = get(this, 'content');
if (content) {
- Ember.assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), Ember.Array.detect(content));
+ this._assertArrayLike(content);
content.addArrayObserver(this);
}
@@ -18487,6 +19459,10 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
this.arrayDidChange(content, 0, null, len);
}, 'content'),
+ _assertArrayLike: function(content) {
+ Ember.assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), Ember.Array.detect(content));
+ },
+
destroy: function() {
if (!this._super()) { return; }
@@ -18545,17 +19521,20 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
@param {Number} added number of object added to content
*/
arrayDidChange: function(content, start, removed, added) {
- var itemViewClass = get(this, 'itemViewClass'),
- addedViews = [], view, item, idx, len;
-
- if ('string' === typeof itemViewClass) {
- itemViewClass = get(itemViewClass);
- }
-
- Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@", [itemViewClass]), Ember.View.detect(itemViewClass));
+ var addedViews = [], view, item, idx, len, itemViewClass,
+ emptyView;
len = content ? get(content, 'length') : 0;
+
if (len) {
+ itemViewClass = get(this, 'itemViewClass');
+
+ if ('string' === typeof itemViewClass) {
+ itemViewClass = get(itemViewClass) || itemViewClass;
+ }
+
+ Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@", [itemViewClass]), 'string' === typeof itemViewClass || Ember.View.detect(itemViewClass));
+
for (idx = start; idx < start+added; idx++) {
item = content.objectAt(idx);
@@ -18567,17 +19546,23 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
addedViews.push(view);
}
} else {
- var emptyView = get(this, 'emptyView');
+ emptyView = get(this, 'emptyView');
+
if (!emptyView) { return; }
- var isClass = Ember.CoreView.detect(emptyView);
+ if ('string' === typeof emptyView) {
+ emptyView = get(emptyView) || emptyView;
+ }
emptyView = this.createChildView(emptyView);
addedViews.push(emptyView);
set(this, 'emptyView', emptyView);
- if (isClass) { this._createdEmptyView = emptyView; }
+ if (Ember.CoreView.detect(emptyView)) {
+ this._createdEmptyView = emptyView;
+ }
}
+
this.replace(start, 0, addedViews);
},
@@ -18585,9 +19570,11 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
view = this._super(view, attrs);
var itemTagName = get(view, 'tagName');
- var tagName = (itemTagName === null || itemTagName === undefined) ? Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')] : itemTagName;
- set(view, 'tagName', tagName);
+ if (itemTagName === null || itemTagName === undefined) {
+ itemTagName = Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')];
+ set(view, 'tagName', itemTagName);
+ }
return view;
}
@@ -18619,6 +19606,8 @@ Ember.CollectionView.CONTAINER_MAP = {
(function() {
+var get = Ember.get, set = Ember.set, isNone = Ember.isNone;
+
/**
@module ember
@submodule ember-views
@@ -18634,9 +19623,9 @@ Ember.CollectionView.CONTAINER_MAP = {
The easiest way to create an `Ember.Component` is via
a template. If you name a template
- `controls/my-foo`, you will be able to use
+ `components/my-foo`, you will be able to use
`{{my-foo}}` in other templates, which will make
- an instance of the isolated control.
+ an instance of the isolated component.
```html
{{app-profile person=currentUser}}
@@ -18653,25 +19642,24 @@ Ember.CollectionView.CONTAINER_MAP = {
include the **contents** of the custom tag:
```html
- {{#my-profile person=currentUser}}
-
Admin mode
- {{/my-profile}}
+ {{#app-profile person=currentUser}}
+
Admin mode
+ {{/app-profile}}
```
```html
-
{{person.title}}
{{yield}}
```
- If you want to customize the control, in order to
+ If you want to customize the component, in order to
handle events or actions, you implement a subclass
of `Ember.Component` named after the name of the
- control.
+ component.
For example, you could implement the action
- `hello` for the `app-profile` control:
+ `hello` for the `app-profile` component:
```js
App.AppProfileComponent = Ember.Component.extend({
@@ -18681,7 +19669,7 @@ Ember.CollectionView.CONTAINER_MAP = {
});
```
- And then use it in the control's template:
+ And then use it in the component's template:
```html
@@ -18703,11 +19691,117 @@ Ember.CollectionView.CONTAINER_MAP = {
@namespace Ember
@extends Ember.View
*/
-Ember.Component = Ember.View.extend({
+Ember.Component = Ember.View.extend(Ember.TargetActionSupport, {
init: function() {
this._super();
- this.set('context', this);
- this.set('controller', this);
+ set(this, 'context', this);
+ set(this, 'controller', this);
+ },
+
+ // during render, isolate keywords
+ cloneKeywords: function() {
+ return {
+ view: this,
+ controller: this
+ };
+ },
+
+ _yield: function(context, options) {
+ var view = options.data.view,
+ parentView = this._parentView,
+ template = get(this, 'template');
+
+ if (template) {
+ Ember.assert("A Component must have a parent view in order to yield.", parentView);
+
+ view.appendChild(Ember.View, {
+ isVirtual: true,
+ tagName: '',
+ template: get(this, 'template'),
+ context: get(parentView, 'context'),
+ controller: get(parentView, 'controller'),
+ templateData: { keywords: parentView.cloneKeywords() }
+ });
+ }
+ },
+
+ targetObject: Ember.computed(function(key) {
+ var parentView = get(this, '_parentView');
+ return parentView ? get(parentView, 'controller') : null;
+ }).property('_parentView'),
+
+ /**
+ Sends an action to component's controller. A component inherits its
+ controller from the context in which it is used.
+
+ By default, calling `sendAction()` will send an action with the name
+ of the component's `action` property.
+
+ For example, if the component had a property `action` with the value
+ `"addItem"`, calling `sendAction()` would send the `addItem` action
+ to the component's controller.
+
+ If you provide the `action` argument to `sendAction()`, that key will
+ be used to look up the action name.
+
+ For example, if the component had a property `playing` with the value
+ `didStartPlaying`, calling `sendAction('playing')` would send the
+ `didStartPlaying` action to the component's controller.
+
+ Whether or not you are using the default action or a named action, if
+ the action name is not defined on the component, calling `sendAction()`
+ does not have any effect.
+
+ For example, if you call `sendAction()` on a component that does not have
+ an `action` property defined, no action will be sent to the controller,
+ nor will an exception be raised.
+
+ You can send a context object with the action by supplying the `context`
+ argument. The context will be supplied as the first argument in the
+ target's action method. Example:
+
+ ```javascript
+ App.MyTree = Ember.Component.extend({
+ click: function() {
+ this.sendAction('didClickTreeNode', this.get('node'));
+ }
+ });
+
+ App.CategoriesController = Ember.Controller.extend({
+ didClickCategory: function(category) {
+ //Do something with the node/category that was clicked
+ }
+ });
+ ```
+
+ ```handlebars
+ {{! categories.hbs}}
+ {{my-tree didClickTreeNode='didClickCategory'}}
+ ```
+
+ @method sendAction
+ @param [action] {String} the action to trigger
+ @param [context] {*} a context to send with the action
+ */
+ sendAction: function(action, context) {
+ var actionName;
+
+ // Send the default action
+ if (action === undefined) {
+ actionName = get(this, 'action');
+ Ember.assert("The default action was triggered on the component " + this.toString() + ", but the action name (" + actionName + ") was not a string.", isNone(actionName) || typeof actionName === 'string');
+ } else {
+ actionName = get(this, action);
+ Ember.assert("The " + action + " action was triggered on the component " + this.toString() + ", but the action name (" + actionName + ") was not a string.", isNone(actionName) || typeof actionName === 'string');
+ }
+
+ // If no action name for that action could be found, just abort.
+ if (actionName === undefined) { return; }
+
+ this.triggerAction({
+ action: actionName,
+ actionContext: context
+ });
}
});
@@ -18738,7 +19832,7 @@ For example:
```javascript
App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
action: 'save',
- click: function(){
+ click: function() {
this.triggerAction(); // Sends the `save` action, along with the current context
// to the current controller
}
@@ -18750,7 +19844,7 @@ to `triggerAction` as well.
```javascript
App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
- click: function(){
+ click: function() {
this.triggerAction({
action: 'save'
}); // Sends the `save` action, along with the current context
@@ -18806,17 +19900,18 @@ define("metamorph",
// Copyright: ©2011 My Company Inc. All rights reserved.
// ==========================================================================
- var K = function(){},
+ var K = function() {},
guid = 0,
document = this.document,
+ disableRange = ('undefined' === typeof ENV ? {} : ENV).DISABLE_RANGE_API,
// Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
- supportsRange = document && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+ supportsRange = (!disableRange) && document && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
// Internet Explorer prior to 9 does not allow setting innerHTML if the first element
// is a "zero-scope" element. This problem can be worked around by making
// the first node an invisible text node. We, like Modernizr, use
- needsShy = document && (function(){
+ needsShy = document && (function() {
var testEl = document.createElement('div');
testEl.innerHTML = "
";
testEl.firstChild.innerHTML = "";
@@ -19272,12 +20367,12 @@ var objectCreate = Object.create || function(parent) {
};
var Handlebars = this.Handlebars || (Ember.imports && Ember.imports.Handlebars);
-if(!Handlebars && typeof require === 'function') {
+if (!Handlebars && typeof require === 'function') {
Handlebars = require('handlebars');
}
-Ember.assert("Ember Handlebars requires Handlebars version 1.0.0-rc.4. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars)
-Ember.assert("Ember Handlebars requires Handlebars version 1.0.0-rc.4, COMPILER_REVISION expected: 3, got: " + Handlebars.COMPILER_REVISION + " – Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 3);
+Ember.assert("Ember Handlebars requires Handlebars version 1.0.0. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars);
+Ember.assert("Ember Handlebars requires Handlebars version 1.0.0, COMPILER_REVISION expected: 4, got: " + Handlebars.COMPILER_REVISION + " - Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 4);
/**
Prepares the Handlebars templating library for use inside Ember's view
@@ -19334,7 +20429,7 @@ function makeBindings(options) {
## Custom view helper example
- Assuming a view subclass named `App.CalenderView` were defined, a helper
+ Assuming a view subclass named `App.CalendarView` were defined, a helper
for rendering instances of this view could be registered as follows:
```javascript
@@ -19376,14 +20471,14 @@ Ember.Handlebars.helper = function(name, value) {
if (Ember.View.detect(value)) {
Ember.Handlebars.registerHelper(name, function(options) {
- Ember.assert("You can only pass attributes as parameters (not values) to a application-defined helper", arguments.length < 2);
+ Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View", arguments.length < 2);
makeBindings(options);
return Ember.Handlebars.helpers.view.call(this, value, options);
});
} else {
Ember.Handlebars.registerBoundHelper.apply(null, arguments);
}
-}
+};
/**
@class helpers
@@ -19464,12 +20559,12 @@ Ember.Handlebars.Compiler.prototype.mustache = function(mustache) {
} else if (mustache.params.length || mustache.hash) {
// no changes required
} else {
- var id = new Handlebars.AST.IdNode(['_triageMustache']);
+ var id = new Handlebars.AST.IdNode([{ part: '_triageMustache' }]);
// Update the mustache node to include a hash value indicating whether the original node
// was escaped. This will allow us to properly escape values when the underlying value
// changes and we need to re-render the value.
- if(!mustache.escaped) {
+ if (!mustache.escaped) {
mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
}
@@ -19527,7 +20622,10 @@ if (Handlebars.compile) {
var environment = new Ember.Handlebars.Compiler().compile(ast, options);
var templateSpec = new Ember.Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
- return Ember.Handlebars.template(templateSpec);
+ var template = Ember.Handlebars.template(templateSpec);
+ template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+ return template;
};
}
@@ -19667,7 +20765,7 @@ Ember.Handlebars.registerHelper('helperMissing', function(path, options) {
var error, view = "";
error = "%@ Handlebars error: Could not find property '%@' on object %@.";
- if (options.data){
+ if (options.data) {
view = options.data.view;
}
throw new Ember.Error(Ember.String.fmt(error, [view, path, this]));
@@ -19704,7 +20802,7 @@ Ember.Handlebars.registerHelper('helperMissing', function(path, options) {
Ember.Handlebars.registerBoundHelper('repeat', function(value, options) {
var count = options.hash.count;
var a = [];
- while(a.length < count){
+ while(a.length < count) {
a.push(value);
}
return a.join('');
@@ -19748,7 +20846,7 @@ Ember.Handlebars.registerHelper('helperMissing', function(path, options) {
```javascript
Ember.Handlebars.registerBoundHelper('concatenate', function() {
- var values = arguments[arguments.length - 1];
+ var values = Array.prototype.slice.call(arguments, 0, -1);
return values.join('||');
});
```
@@ -19795,7 +20893,7 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) {
view = data.view,
currentContext = (options.contexts && options.contexts[0]) || this,
normalized,
- pathRoot, path,
+ pathRoot, path, prefixPathForDependentKeys = '',
loc, hashOption;
Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
@@ -19846,8 +20944,11 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) {
view.registerObserver(pathRoot, path, bindView, bindView.rerender);
+ if(!Ember.isEmpty(path)) {
+ prefixPathForDependentKeys = path + '.';
+ }
for (var i=0, l=dependentKeys.length; i
someString