@@ -38270,18 +39948,8 @@ define("ember-views/views/collection_view",
// Loop through child views that correspond with the removed items.
// Note that we loop from the end of the array to the beginning because
// we are mutating it as we go.
- var childViews = this._childViews, childView, idx, len;
-
- len = this._childViews.length;
-
- var removingAll = removedCount === len;
-
- if (removingAll) {
- this.currentState.empty(this);
- this.invokeRecursively(function(view) {
- view.removedFromDOM = true;
- }, false);
- }
+ var childViews = this._childViews;
+ var childView, idx;
for (idx = start + removedCount - 1; idx >= start; idx--) {
childView = childViews[idx];
@@ -38304,21 +39972,14 @@ define("ember-views/views/collection_view",
@param {Number} added number of object added to content
*/
arrayDidChange: function(content, start, removed, added) {
- var addedViews = [], view, item, idx, len, itemViewClass,
- emptyView;
+ var addedViews = [];
+ var view, item, idx, len, itemViewClass, emptyView;
len = content ? get(content, 'length') : 0;
if (len) {
itemViewClass = get(this, 'itemViewClass');
-
- if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
- itemViewClass = get(itemViewClass) || itemViewClass;
- }
-
- Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@",
- [itemViewClass]),
- 'string' === typeof itemViewClass || View.detect(itemViewClass));
+ itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
for (idx = start; idx < start+added; idx++) {
item = content.objectAt(idx);
@@ -38403,7 +40064,7 @@ define("ember-views/views/collection_view",
__exports__["default"] = CollectionView;
});
-define("ember-views/views/component",
+enifed("ember-views/views/component",
["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -38553,8 +40214,8 @@ define("ember-views/views/component",
template: computed(function(key, value) {
if (value !== undefined) { return value; }
- var templateName = get(this, 'templateName'),
- template = this.templateForName(templateName, 'template');
+ var templateName = get(this, 'templateName');
+ var template = this.templateForName(templateName, 'template');
Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
@@ -38579,9 +40240,9 @@ define("ember-views/views/component",
},
_yield: function(context, options) {
- var view = options.data.view,
- parentView = this._parentView,
- template = get(this, 'template');
+ var view = options.data.view;
+ var parentView = this._parentView;
+ var template = get(this, 'template');
if (template) {
Ember.assert("A Component must have a parent view in order to yield.", parentView);
@@ -38692,8 +40353,8 @@ define("ember-views/views/component",
@param [context] {*} a context to send with the action
*/
sendAction: function(action) {
- var actionName,
- contexts = a_slice.call(arguments, 1);
+ var actionName;
+ var contexts = a_slice.call(arguments, 1);
// Send the default action
if (action === undefined) {
@@ -38721,9 +40382,9 @@ define("ember-views/views/component",
__exports__["default"] = Component;
});
-define("ember-views/views/container_view",
- ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+enifed("ember-views/views/container_view",
+ ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
"use strict";
var Ember = __dependency1__["default"];
// Ember.assert, Ember.K
@@ -38734,22 +40395,21 @@ define("ember-views/views/container_view",
var set = __dependency5__.set;
var View = __dependency6__["default"];
- var ViewCollection = __dependency7__["default"];
- var cloneStates = __dependency8__.cloneStates;
- var EmberViewStates = __dependency8__.states;
+ var cloneStates = __dependency7__.cloneStates;
+ var EmberViewStates = __dependency7__.states;
- var EmberError = __dependency9__["default"];
+ var EmberError = __dependency8__["default"];
- var forEach = __dependency10__.forEach;
+ var forEach = __dependency9__.forEach;
- var computed = __dependency11__.computed;
- var run = __dependency12__["default"];
- var defineProperty = __dependency13__.defineProperty;
- var renderBuffer = __dependency14__["default"];
- var observer = __dependency15__.observer;
- var beforeObserver = __dependency15__.beforeObserver;
- var emberA = __dependency16__.A;
+ var computed = __dependency10__.computed;
+ var run = __dependency11__["default"];
+ var defineProperty = __dependency12__.defineProperty;
+ var renderBuffer = __dependency13__["default"];
+ var observer = __dependency14__.observer;
+ var beforeObserver = __dependency14__.beforeObserver;
+ var emberA = __dependency15__.A;
/**
@module ember
@@ -38909,6 +40569,7 @@ define("ember-views/views/container_view",
@extends Ember.View
*/
var ContainerView = View.extend(MutableArray, {
+ isContainer: true,
_states: states,
willWatchProperty: function(prop){
@@ -38987,9 +40648,6 @@ define("ember-views/views/container_view",
@param {Ember.RenderBuffer} buffer the buffer to render to
*/
render: function(buffer) {
- this.forEachChildView(function(view) {
- view.renderToBuffer(buffer);
- });
},
instrumentName: 'container',
@@ -39108,69 +40766,40 @@ define("ember-views/views/container_view",
},
ensureChildrenAreInDOM: function(view) {
- var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+ var childViews = view._childViews;
+ var renderer = view._renderer;
+ var i, len, childView;
for (i = 0, len = childViews.length; i < len; i++) {
childView = childViews[i];
-
- if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
-
- if (childView.renderToBufferIfNeeded(buffer)) {
- viewCollection.push(childView);
- } else if (viewCollection.length) {
- insertViewCollection(view, viewCollection, previous, buffer);
- buffer = null;
- previous = childView;
- viewCollection.clear();
- } else {
- previous = childView;
+ if (!childView._elementCreated) {
+ renderer.renderTree(childView, view, i);
}
}
-
- if (viewCollection.length) {
- insertViewCollection(view, viewCollection, previous, buffer);
- }
}
});
- function insertViewCollection(view, viewCollection, previous, buffer) {
- viewCollection.triggerRecursively('willInsertElement');
-
- if (previous) {
- previous.domManager.after(previous, buffer.string());
- } else {
- view.domManager.prepend(view, buffer.string());
- }
-
- viewCollection.forEach(function(v) {
- v._transitionTo('inDOM');
- v.propertyDidChange('element');
- v.triggerRecursively('didInsertElement');
- });
- }
-
-
__exports__["default"] = ContainerView;
});
-define("ember-views/views/core_view",
- ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+enifed("ember-views/views/core_view",
+ ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
"use strict";
- var cloneStates = __dependency1__.cloneStates;
- var states = __dependency1__.states;
- var EmberObject = __dependency2__["default"];
- var Evented = __dependency3__["default"];
- var ActionHandler = __dependency4__["default"];
+ var Rerender = __dependency1__["default"];
- var get = __dependency5__.get;
- var computed = __dependency6__.computed;
+ var cloneStates = __dependency2__.cloneStates;
+ var states = __dependency2__.states;
+ var EmberObject = __dependency3__["default"];
+ var Evented = __dependency4__["default"];
+ var ActionHandler = __dependency5__["default"];
- var typeOf = __dependency7__.typeOf;
+ var get = __dependency6__.get;
+ var set = __dependency7__.set;
+ var computed = __dependency8__.computed;
- var instrument = __dependency8__.instrument;
+ var typeOf = __dependency9__.typeOf;
-
- var renderBuffer = __dependency9__["default"];
+ var instrument = __dependency10__.instrument;
/**
`Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -39189,6 +40818,8 @@ define("ember-views/views/core_view",
*/
var CoreView = EmberObject.extend(Evented, ActionHandler, {
isView: true,
+ isVirtual: false,
+ isContainer: false,
_states: cloneStates(states),
@@ -39234,55 +40865,6 @@ define("ember-views/views/core_view",
hash.view = this;
},
- /**
- Invoked by the view system when this view needs to produce an HTML
- representation. This method will create a new render buffer, if needed,
- then apply any default attributes, such as class names and visibility.
- Finally, the `render()` method is invoked, which is responsible for
- doing the bulk of the rendering.
-
- You should not need to override this method; instead, implement the
- `template` property, or if you need more control, override the `render`
- method.
-
- @method renderToBuffer
- @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
- passed, a default buffer, using the current view's `tagName`, will
- be used.
- @private
- */
- renderToBuffer: function(buffer) {
- var name = 'render.' + this.instrumentName,
- details = {};
-
- this.instrumentDetails(details);
-
- return instrument(name, details, function instrumentRenderToBuffer() {
- return this._renderToBuffer(buffer);
- }, this);
- },
-
- _renderToBuffer: function(_buffer) {
- // If this is the top-most view, start a new buffer. Otherwise,
- // create a new buffer relative to the original using the
- // provided buffer operation (for example, `insertAfter` will
- // insert a new buffer after the "parent buffer").
- var tagName = this.tagName;
-
- if (tagName === null || tagName === undefined) {
- tagName = 'div';
- }
-
- var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
- this._transitionTo('inBuffer', false);
-
- this.beforeRender(buffer);
- this.render(buffer);
- this.afterRender(buffer);
-
- return buffer;
- },
-
/**
Override the default event firing from `Ember.Evented` to
also call methods with the given name.
@@ -39305,18 +40887,6 @@ define("ember-views/views/core_view",
}
},
- deprecatedSendHandles: function(actionName) {
- return !!this[actionName];
- },
-
- deprecatedSend: function(actionName) {
- var args = [].slice.call(arguments, 1);
- Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
- Ember.deprecate('Action handlers implemented directly on views are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
- this[actionName].apply(this, args);
- return;
- },
-
has: function(name) {
return typeOf(this[name]) === 'function' || this._super(name);
},
@@ -39326,9 +40896,12 @@ define("ember-views/views/core_view",
if (!this._super()) { return; }
+
// destroy the element -- this will avoid each child view destroying
// the element over and over again...
- if (!this.removedFromDOM) { this.destroyElement(); }
+ if (!this.removedFromDOM && this._renderer) {
+ this._renderer.remove(this, true);
+ }
// remove from parent if found. Don't call removeFromParent,
// as removeFromParent will try to remove the element from
@@ -39341,15 +40914,17 @@ define("ember-views/views/core_view",
},
clearRenderedChildren: Ember.K,
- triggerRecursively: Ember.K,
- invokeRecursively: Ember.K,
_transitionTo: Ember.K,
destroyElement: Ember.K
});
+ CoreView.reopenClass({
+ renderer: new Rerender()
+ });
+
__exports__["default"] = CoreView;
});
-define("ember-views/views/states",
+enifed("ember-views/views/states",
["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -39390,7 +40965,7 @@ define("ember-views/views/states",
};
__exports__.states = states;
});
-define("ember-views/views/states/default",
+enifed("ember-views/views/states/default",
["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -39425,23 +41000,16 @@ define("ember-views/views/states/default",
},
destroyElement: function(view) {
- set(view, 'element', null);
- if (view._scheduledInsert) {
- run.cancel(view._scheduledInsert);
- view._scheduledInsert = null;
- }
+ if (view._renderer)
+ view._renderer.remove(view, false);
return view;
},
- renderToBufferIfNeeded: function () {
- return false;
- },
-
rerender: Ember.K,
invokeObserver: Ember.K
};
});
-define("ember-views/views/states/destroying",
+enifed("ember-views/views/states/destroying",
["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -39468,27 +41036,12 @@ define("ember-views/views/states/destroying",
},
destroyElement: function() {
throw new EmberError(fmt(destroyingError, ['destroyElement']));
- },
- empty: function() {
- throw new EmberError(fmt(destroyingError, ['empty']));
- },
-
- setElement: function() {
- throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
- },
-
- renderToBufferIfNeeded: function() {
- return false;
- },
-
- // Since element insertion is scheduled, don't do anything if
- // the view has been destroyed between scheduling and execution
- insertElement: Ember.K
+ }
});
__exports__["default"] = destroying;
});
-define("ember-views/views/states/has_element",
+enifed("ember-views/views/states/has_element",
["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -39511,7 +41064,7 @@ define("ember-views/views/states/has_element",
merge(hasElement, {
$: function(view, sel) {
- var elem = get(view, 'element');
+ var elem = view.get('concreteView').element;
return sel ? jQuery(sel, elem) : jQuery(elem);
},
@@ -39522,25 +41075,17 @@ define("ember-views/views/states/has_element",
return jQuery("#" + get(view, 'elementId'))[0];
},
- setElement: function(view, value) {
- if (value === null) {
- view._transitionTo('preRender');
- } else {
- throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
- }
-
- return value;
- },
-
// once the view has been inserted into the DOM, rerendering is
// deferred to allow bindings to synchronize.
rerender: function(view) {
- view.triggerRecursively('willClearRender');
-
- view.clearRenderedChildren();
-
- view.domManager.replace(view);
- return view;
+ if (view._root._morph && !view._elementInserted) {
+ throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+ }
+ // TODO: should be scheduled with renderer
+ run.scheduleOnce('render', function () {
+ if (view.isDestroying) return;
+ view._renderer.renderTree(view, view._parentView);
+ });
},
// once the view is already in the DOM, destroying it removes it
@@ -39548,27 +41093,10 @@ define("ember-views/views/states/has_element",
// preRender state if inDOM.
destroyElement: function(view) {
- view._notifyWillDestroyElement();
- view.domManager.remove(view);
- set(view, 'element', null);
- if (view._scheduledInsert) {
- run.cancel(view._scheduledInsert);
- view._scheduledInsert = null;
- }
+ view._renderer.remove(view, false);
return view;
},
- empty: function(view) {
- var _childViews = view._childViews, len, idx;
- if (_childViews) {
- len = _childViews.length;
- for (idx = 0; idx < len; idx++) {
- _childViews[idx]._notifyWillDestroyElement();
- }
- }
- view.domManager.empty(view);
- },
-
// Handle events from `Ember.EventDispatcher`
handleEvent: function(view, eventName, evt) {
if (view.has(eventName)) {
@@ -39587,7 +41115,7 @@ define("ember-views/views/states/has_element",
__exports__["default"] = hasElement;
});
-define("ember-views/views/states/in_buffer",
+enifed("ember-views/views/states/in_buffer",
["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -39626,58 +41154,22 @@ define("ember-views/views/states/in_buffer",
// view will render that view and append the resulting
// buffer into its buffer.
appendChild: function(view, childView, options) {
- var buffer = view.buffer, _childViews = view._childViews;
+ var buffer = view.buffer;
+ var _childViews = view._childViews;
childView = view.createChildView(childView, options);
if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
_childViews.push(childView);
- childView.renderToBuffer(buffer);
+ if (!childView._morph) {
+ buffer.pushChildView(childView);
+ }
view.propertyDidChange('childViews');
return childView;
},
- // when a view is rendered in a buffer, destroying the
- // element will simply destroy the buffer and put the
- // state back into the preRender state.
- destroyElement: function(view) {
- view.clearBuffer();
- var viewCollection = view._notifyWillDestroyElement();
- viewCollection.transitionTo('preRender', false);
-
- return view;
- },
-
- empty: function() {
- Ember.assert("Emptying a view in the inBuffer state is not allowed and " +
- "should not happen under normal circumstances. Most likely " +
- "there is a bug in your application. This may be due to " +
- "excessive property change notifications.");
- },
-
- renderToBufferIfNeeded: function (view, buffer) {
- return false;
- },
-
- // It should be impossible for a rendered view to be scheduled for
- // insertion.
- insertElement: function() {
- throw new EmberError("You can't insert an element that has already been rendered");
- },
-
- setElement: function(view, value) {
- if (value === null) {
- view._transitionTo('preRender');
- } else {
- view.clearBuffer();
- view._transitionTo('hasElement');
- }
-
- return value;
- },
-
invokeObserver: function(target, observer) {
observer.call(target);
}
@@ -39685,7 +41177,7 @@ define("ember-views/views/states/in_buffer",
__exports__["default"] = inBuffer;
});
-define("ember-views/views/states/in_dom",
+enifed("ember-views/views/states/in_dom",
["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -39725,21 +41217,15 @@ define("ember-views/views/states/in_dom",
if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
if (!this.isVirtual) delete View.views[view.elementId];
- },
-
- insertElement: function(view, fn) {
- throw new EmberError("You can't insert an element into the DOM that has already been inserted");
}
});
__exports__["default"] = inDOM;
});
-define("ember-views/views/states/pre_render",
+enifed("ember-views/views/states/pre_render",
["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
"use strict";
- /* global Node */
-
var _default = __dependency1__["default"];
var create = __dependency2__.create;
var merge = __dependency3__["default"];
@@ -39751,44 +41237,10 @@ define("ember-views/views/states/pre_render",
*/
var preRender = create(_default);
- merge(preRender, {
- // a view leaves the preRender state once its element has been
- // created (createElement).
- insertElement: function(view, fn) {
- view.createElement();
- var viewCollection = view.viewHierarchyCollection();
-
- viewCollection.trigger('willInsertElement');
-
- fn.call(view);
-
- // We transition to `inDOM` if the element exists in the DOM
- var element = view.get('element');
- if (jQuery.contains(document.body, element)) {
- viewCollection.transitionTo('inDOM', false);
- viewCollection.trigger('didInsertElement');
- }
- },
-
- renderToBufferIfNeeded: function(view, buffer) {
- view.renderToBuffer(buffer);
- return true;
- },
-
- empty: Ember.K,
-
- setElement: function(view, value) {
- if (value !== null) {
- view._transitionTo('hasElement');
- }
- return value;
- }
- });
-
__exports__["default"] = preRender;
});
-define("ember-views/views/view",
- ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
+enifed("ember-views/views/view",
+ ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
"use strict";
// Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -39818,47 +41270,36 @@ define("ember-views/views/view",
var isArray = __dependency11__.isArray;
var isNone = __dependency14__.isNone;
var Mixin = __dependency13__.Mixin;
- var deprecateProperty = __dependency10__.deprecateProperty;
- var emberA = __dependency15__.A;
+ var deprecateProperty = __dependency15__.deprecateProperty;
+ var emberA = __dependency16__.A;
- var dasherize = __dependency16__.dasherize;
+ var dasherize = __dependency17__.dasherize;
// ES6TODO: functions on EnumerableUtils should get their own export
- var forEach = __dependency17__.forEach;
- var addObject = __dependency17__.addObject;
- var removeObject = __dependency17__.removeObject;
+ var forEach = __dependency18__.forEach;
+ var addObject = __dependency18__.addObject;
+ var removeObject = __dependency18__.removeObject;
var beforeObserver = __dependency13__.beforeObserver;
- var copy = __dependency18__["default"];
- var isGlobalPath = __dependency19__.isGlobalPath;
+ var copy = __dependency19__["default"];
+ var isGlobalPath = __dependency20__.isGlobalPath;
- var propertyWillChange = __dependency20__.propertyWillChange;
- var propertyDidChange = __dependency20__.propertyDidChange;
+ var propertyWillChange = __dependency21__.propertyWillChange;
+ var propertyDidChange = __dependency21__.propertyDidChange;
- var jQuery = __dependency21__["default"];
+ var jQuery = __dependency22__["default"];
// for the side effect of extending Ember.run.queues
- var CoreView = __dependency23__["default"];
- var ViewCollection = __dependency24__["default"];
+ var CoreView = __dependency24__["default"];
/**
@module ember
@submodule ember-views
*/
-
- var ContainerView;
-
- function nullViewsBuffer(view) {
- view.buffer = null;
-
- }
-
- function clearCachedElement(view) {
- meta(view).cache.element = undefined;
- }
-
var childViewsProperty = computed(function() {
- var childViews = this._childViews, ret = emberA(), view = this;
+ var childViews = this._childViews;
+ var ret = emberA();
+ var view = this;
forEach(childViews, function(view) {
var currentChildViews;
@@ -39872,12 +41313,6 @@ define("ember-views/views/view",
});
ret.replace = function (idx, removedCount, addedViews) {
- if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
-
- if (view instanceof ContainerView) {
- Ember.deprecate("Manipulating an Ember.ContainerView through its childViews property is deprecated. Please use the ContainerView instance itself as an Ember.MutableArray.");
- return view.replace(idx, removedCount, addedViews);
- }
throw new EmberError("childViews is immutable");
};
@@ -40396,8 +41831,9 @@ define("ember-views/views/view",
on the descendent.
```javascript
- OuterView = Ember.View.extend({
- template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+ var App = Ember.Application.create();
+ App.OuterView = Ember.View.extend({
+ template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
eventManager: Ember.Object.create({
mouseEnter: function(event, view) {
// view might be instance of either
@@ -40407,7 +41843,7 @@ define("ember-views/views/view",
})
});
- InnerView = Ember.View.extend({
+ App.InnerView = Ember.View.extend({
click: function(event) {
// will be called if rendered inside
// an OuterView because OuterView's
@@ -40551,8 +41987,8 @@ define("ember-views/views/view",
template: computed('templateName', function(key, value) {
if (value !== undefined) { return value; }
- var templateName = get(this, 'templateName'),
- template = this.templateForName(templateName, 'template');
+ var templateName = get(this, 'templateName');
+ var template = this.templateForName(templateName, 'template');
Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
@@ -40586,8 +42022,8 @@ define("ember-views/views/view",
@type Function
*/
layout: computed(function(key) {
- var layoutName = get(this, 'layoutName'),
- layout = this.templateForName(layoutName, 'layout');
+ var layoutName = get(this, 'layoutName');
+ var layout = this.templateForName(layoutName, 'layout');
Ember.assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || layout);
@@ -40746,8 +42182,8 @@ define("ember-views/views/view",
@return Ember.View
*/
nearestOfType: function(klass) {
- var view = get(this, 'parentView'),
- isOfType = klass instanceof Mixin ?
+ var view = get(this, 'parentView');
+ var isOfType = klass instanceof Mixin ?
function(view) { return klass.detect(view); } :
function(view) { return klass.detect(view.constructor); };
@@ -40893,21 +42329,6 @@ define("ember-views/views/view",
return this.currentState.rerender(this);
},
- clearRenderedChildren: function() {
- var lengthBefore = this.lengthBeforeRender,
- lengthAfter = this.lengthAfterRender;
-
- // If there were child views created during the last call to render(),
- // remove them under the assumption that they will be re-created when
- // we re-render.
-
- // VIEW-TODO: Unit test this path.
- var childViews = this._childViews;
- for (var i=lengthAfter-1; i>=lengthBefore; i--) {
- if (childViews[i]) { childViews[i].destroy(); }
- }
- },
-
/**
Iterates over the view's `classNameBindings` array, inserts the value
of the specified property into the `classNames` array, then creates an
@@ -40918,8 +42339,8 @@ define("ember-views/views/view",
@private
*/
_applyClassNameBindings: function(classBindings) {
- var classNames = this.classNames,
- elem, newClass, dasherizedClass;
+ var classNames = this.classNames;
+ var elem, newClass, dasherizedClass;
// Loop through all of the configured bindings. These will be either
// property names ('isUrgent') or property paths relative to the view
@@ -40998,13 +42419,15 @@ define("ember-views/views/view",
@private
*/
_applyAttributeBindings: function(buffer, attributeBindings) {
- var attributeValue,
- unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+ var attributeValue;
+ var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
forEach(attributeBindings, function(binding) {
- var split = binding.split(':'),
- property = split[0],
- attributeName = split[1] || property;
+ var split = binding.split(':');
+ var property = split[0];
+ var attributeName = split[1] || property;
+
+ Ember.assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attributeName !== 'class');
if (property in this) {
this._setupAttributeBindingObservation(property, attributeName);
@@ -41094,13 +42517,7 @@ define("ember-views/views/view",
@property element
@type DOMElement
*/
- element: computed('_parentView', function(key, value) {
- if (value !== undefined) {
- return this.currentState.setElement(this, value);
- } else {
- return this.currentState.getElement(this);
- }
- }),
+ element: null,
/**
Returns a jQuery object for this view's element. If you pass in a selector
@@ -41119,9 +42536,9 @@ define("ember-views/views/view",
},
mutateChildViews: function(callback) {
- var childViews = this._childViews,
- idx = childViews.length,
- view;
+ var childViews = this._childViews;
+ var idx = childViews.length;
+ var view;
while(--idx >= 0) {
view = childViews[idx];
@@ -41136,8 +42553,8 @@ define("ember-views/views/view",
if (!childViews) { return this; }
- var len = childViews.length,
- view, idx;
+ var len = childViews.length;
+ var view, idx;
for (idx = 0; idx < len; idx++) {
view = childViews[idx];
@@ -41167,14 +42584,13 @@ define("ember-views/views/view",
@param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
@return {Ember.View} receiver
*/
- appendTo: function(target) {
- // Schedule the DOM element to be created and appended to the given
- // element after bindings have synchronized.
- this._insertElementLater(function() {
- Ember.assert("You tried to append to (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
- Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
- this.$().appendTo(target);
- });
+ appendTo: function(selector) {
+ var target = jQuery(selector);
+
+ Ember.assert("You tried to append to (" + selector + ") but that isn't in the DOM", target.length > 0);
+ Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
+
+ this.constructor.renderer.appendTo(this, target[0]);
return this;
},
@@ -41192,49 +42608,17 @@ define("ember-views/views/view",
@param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
@return {Ember.View} received
*/
- replaceIn: function(target) {
- Ember.assert("You tried to replace in (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
- Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
+ replaceIn: function(selector) {
+ var target = jQuery(selector);
- this._insertElementLater(function() {
- jQuery(target).empty();
- this.$().appendTo(target);
- });
+ Ember.assert("You tried to replace in (" + selector + ") but that isn't in the DOM", target.length > 0);
+ Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
+
+ this.constructor.renderer.replaceIn(this, target[0]);
return this;
},
- /**
- Schedules a DOM operation to occur during the next render phase. This
- ensures that all bindings have finished synchronizing before the view is
- rendered.
-
- To use, pass a function that performs a DOM operation.
-
- Before your function is called, this view and all child views will receive
- the `willInsertElement` event. After your function is invoked, this view
- and all of its child views will receive the `didInsertElement` event.
-
- ```javascript
- view._insertElementLater(function() {
- this.createElement();
- this.$().appendTo('body');
- });
- ```
-
- @method _insertElementLater
- @param {Function} fn the function that inserts the element into the DOM
- @private
- */
- _insertElementLater: function(fn) {
- this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
- },
-
- _insertElement: function (fn) {
- this._scheduledInsert = null;
- this.currentState.insertElement(this, fn);
- },
-
/**
Appends the view's element to the document body. If the view does
not have an HTML representation yet, `createElement()` will be called
@@ -41268,9 +42652,6 @@ define("ember-views/views/view",
// In the interim, we will just re-render if that happens. It is more
// important than elements get garbage collected.
if (!this.removedFromDOM) { this.destroyElement(); }
- this.invokeRecursively(function(view) {
- if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
- });
},
elementId: null,
@@ -41292,20 +42673,20 @@ define("ember-views/views/view",
},
/**
- Creates a DOM representation of the view and all of its
- child views by recursively calling the `render()` method.
+ Creates a DOM representation of the view and all of its child views by
+ recursively calling the `render()` method.
- After the element has been created, `didInsertElement` will
+ After the element has been inserted into the DOM, `didInsertElement` will
be called on this view and all of its child views.
@method createElement
@return {Ember.View} receiver
*/
createElement: function() {
- if (get(this, 'element')) { return this; }
+ if (this.element) { return this; }
- var buffer = this.renderToBuffer();
- set(this, 'element', buffer.element());
+ this._didCreateElementWithoutMorph = true;
+ this.constructor.renderer.renderTree(this);
return this;
},
@@ -41322,6 +42703,9 @@ define("ember-views/views/view",
or after the view was re-rendered. Override this function to do any
set up that requires an element in the document body.
+ When a view has children, didInsertElement will be called on the
+ child view(s) first, bubbling upwards through the hierarchy.
+
@event didInsertElement
*/
didInsertElement: Ember.K,
@@ -41335,65 +42719,6 @@ define("ember-views/views/view",
*/
willClearRender: Ember.K,
- /**
- Run this callback on the current view (unless includeSelf is false) and recursively on child views.
-
- @method invokeRecursively
- @param fn {Function}
- @param includeSelf {Boolean} Includes itself if true.
- @private
- */
- invokeRecursively: function(fn, includeSelf) {
- var childViews = (includeSelf === false) ? this._childViews : [this];
- var currentViews, view, currentChildViews;
-
- while (childViews.length) {
- currentViews = childViews.slice();
- childViews = [];
-
- for (var i=0, l=currentViews.length; i
=0; i--) {
- childViews[i].removedFromDOM = true;
- }
-
// remove from non-virtual parent view if viewName was specified
if (viewName && nonVirtualParentView) {
nonVirtualParentView.set(viewName, null);
}
- childLen = childViews.length;
- for (i=childLen-1; i>=0; i--) {
- childViews[i].destroy();
- }
-
return this;
},
@@ -41840,16 +43113,18 @@ define("ember-views/views/view",
_toggleVisibility: function() {
var $el = this.$();
- if (!$el) { return; }
-
var isVisible = get(this, 'isVisible');
if (this._isVisible === isVisible) { return ; }
- $el.toggle(isVisible);
-
+ // It's important to keep these in sync, even if we don't yet have
+ // an element in the DOM to manipulate:
this._isVisible = isVisible;
+ if (!$el) { return; }
+
+ $el.toggle(isVisible);
+
if (this._isAncestorHidden()) { return; }
if (isVisible) {
@@ -41893,10 +43168,6 @@ define("ember-views/views/view",
return false;
},
-
- clearBuffer: function() {
- this.invokeRecursively(nullViewsBuffer);
- },
transitionTo: function(state, children) {
Ember.deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
this._transitionTo(state, children);
@@ -41904,18 +43175,10 @@ define("ember-views/views/view",
_transitionTo: function(state, children) {
var priorState = this.currentState;
var currentState = this.currentState = this._states[state];
-
this._state = state;
if (priorState && priorState.exit) { priorState.exit(this); }
if (currentState.enter) { currentState.enter(this); }
- if (state === 'inDOM') { meta(this).cache.element = undefined; }
-
- if (children !== false) {
- this.forEachChildView(function(view) {
- view._transitionTo(state);
- });
- }
},
// .......................................................
@@ -41944,13 +43207,13 @@ define("ember-views/views/view",
return;
}
- var view = this,
- stateCheckedObserver = function() {
- view.currentState.invokeObserver(this, observer);
- },
- scheduledObserver = function() {
- run.scheduleOnce('render', this, stateCheckedObserver);
- };
+ var view = this;
+ var stateCheckedObserver = function() {
+ view.currentState.invokeObserver(this, observer);
+ };
+ var scheduledObserver = function() {
+ run.scheduleOnce('render', this, stateCheckedObserver);
+ };
addObserver(root, path, target, scheduledObserver);
@@ -41994,48 +43257,6 @@ define("ember-views/views/view",
run.once(View, 'notifyMutationListeners');
}
- var DOMManager = {
- prepend: function(view, html) {
- view.$().prepend(html);
- notifyMutationListeners();
- },
-
- after: function(view, html) {
- view.$().after(html);
- notifyMutationListeners();
- },
-
- html: function(view, html) {
- view.$().html(html);
- notifyMutationListeners();
- },
-
- replace: function(view) {
- var element = get(view, 'element');
-
- set(view, 'element', null);
-
- view._insertElementLater(function() {
- jQuery(element).replaceWith(get(view, 'element'));
- notifyMutationListeners();
- });
- },
-
- remove: function(view) {
- view.$().remove();
- notifyMutationListeners();
- },
-
- empty: function(view) {
- view.$().empty();
- notifyMutationListeners();
- }
- };
-
- View.reopen({
- domManager: DOMManager
- });
-
View.reopenClass({
/**
@@ -42058,11 +43279,10 @@ define("ember-views/views/view",
@private
*/
_parsePropertyPath: function(path) {
- var split = path.split(':'),
- propertyPath = split[0],
- classNames = "",
- className,
- falsyClassName;
+ var split = path.split(':');
+ var propertyPath = split[0];
+ var classNames = "";
+ var className, falsyClassName;
// check if the property is defined as prop:class or prop:trueClass:falseClass
if (split.length > 1) {
@@ -42146,7 +43366,7 @@ define("ember-views/views/view",
});
var mutation = EmberObject.extend(Evented).create();
-
+ // TODO MOVE TO RENDERER HOOKS
View.addMutationListener = function(callback) {
mutation.on('change', callback);
};
@@ -42204,82 +43424,11 @@ define("ember-views/views/view",
__exports__["default"] = View;
});
-define("ember-views/views/view_collection",
- ["ember-metal/enumerable_utils","exports"],
- function(__dependency1__, __exports__) {
- "use strict";
- var forEach = __dependency1__.forEach;
-
- function ViewCollection(initialViews) {
- var views = this.views = initialViews || [];
- this.length = views.length;
- }
-
- ViewCollection.prototype = {
- length: 0,
-
- trigger: function(eventName) {
- var views = this.views, view;
- for (var i = 0, l = views.length; i < l; i++) {
- view = views[i];
- if (view.trigger) { view.trigger(eventName); }
- }
- },
-
- triggerRecursively: function(eventName) {
- var views = this.views;
- for (var i = 0, l = views.length; i < l; i++) {
- views[i].triggerRecursively(eventName);
- }
- },
-
- invokeRecursively: function(fn) {
- var views = this.views, view;
-
- for (var i = 0, l = views.length; i < l; i++) {
- view = views[i];
- fn(view);
- }
- },
-
- transitionTo: function(state, children) {
- var views = this.views;
- for (var i = 0, l = views.length; i < l; i++) {
- views[i]._transitionTo(state, children);
- }
- },
-
- push: function() {
- this.length += arguments.length;
- var views = this.views;
- return views.push.apply(views, arguments);
- },
-
- objectAt: function(idx) {
- return this.views[idx];
- },
-
- forEach: function(callback) {
- var views = this.views;
- return forEach(views, callback);
- },
-
- clear: function() {
- this.length = 0;
- this.views.length = 0;
- }
- };
-
- __exports__["default"] = ViewCollection;
- });
-define("ember",
+enifed("ember",
["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
- // Remove "use strict"; from transpiled module until
- // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
- //
- // REMOVE_USE_STRICT: true
-
+ "use strict";
+ /* global navigator */
// require the main entry points for each of these packages
// this is so that the global exports occur properly
@@ -42295,521 +43444,831 @@ define("ember",
@module ember
*/
- function throwWithMessage(msg) {
- return function() {
- throw new Ember.Error(msg);
- };
- }
-
- function generateRemovedClass(className) {
- var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
-
- return {
- extend: throwWithMessage(className + msg),
- create: throwWithMessage(className + msg)
- };
- }
-
- Ember.StateManager = generateRemovedClass("Ember.StateManager");
-
- /**
- This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
- @class StateManager
- @namespace Ember
- */
-
- Ember.State = generateRemovedClass("Ember.State");
-
- /**
- This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
- @class State
- @namespace Ember
- */
+ Ember.deprecate('Usage of Ember is deprecated for Internet Explorer 6 and 7, support will be removed in the next major version.', !navigator.userAgent.match(/MSIE [67]/));
});
-define("metamorph",
- [],
- function() {
+enifed("morph",
+ ["./morph/morph","./morph/dom-helper","exports"],
+ function(__dependency1__, __dependency2__, __exports__) {
"use strict";
- // ==========================================================================
- // Project: metamorph
- // Copyright: ©2014 Tilde, Inc. All rights reserved.
- // ==========================================================================
+ var Morph = __dependency1__["default"];
+ var Morph;
+ __exports__.Morph = Morph;
+ var DOMHelper = __dependency2__["default"];
+ var DOMHelper;
+ __exports__.DOMHelper = DOMHelper;
+ });
+enifed("morph/dom-helper",
+ ["../morph/morph","./dom-helper/build-html-dom","exports"],
+ function(__dependency1__, __dependency2__, __exports__) {
+ "use strict";
+ var Morph = __dependency1__["default"];
+ var buildHTMLDOM = __dependency2__.buildHTMLDOM;
+ var svgNamespace = __dependency2__.svgNamespace;
+ var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
- var K = function() {},
- guid = 0,
- disableRange = (function(){
- if ('undefined' !== typeof MetamorphENV) {
- return MetamorphENV.DISABLE_RANGE_API;
- } else if ('undefined' !== ENV) {
- return ENV.DISABLE_RANGE_API;
- } else {
- return false;
- }
- })(),
+ var deletesBlankTextNodes = (function(){
+ var element = document.createElement('div');
+ element.appendChild( document.createTextNode('') );
+ var clonedElement = element.cloneNode(true);
+ return clonedElement.childNodes.length === 0;
+ })();
- // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
- supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+ var ignoresCheckedAttribute = (function(){
+ var element = document.createElement('input');
+ element.setAttribute('checked', 'checked');
+ var clonedElement = element.cloneNode(false);
+ return !clonedElement.checked;
+ })();
- // 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 = typeof document !== 'undefined' && (function() {
- var testEl = document.createElement('div');
- testEl.innerHTML = "";
- testEl.firstChild.innerHTML = "";
- return testEl.firstChild.innerHTML === '';
- })(),
+ function isSVG(ns){
+ return ns === svgNamespace;
+ }
-
- // IE 8 (and likely earlier) likes to move whitespace preceeding
- // a script tag to appear after it. This means that we can
- // accidentally remove whitespace when updating a morph.
- movesWhitespace = document && (function() {
- var testEl = document.createElement('div');
- testEl.innerHTML = "Test: Value";
- return testEl.childNodes[0].nodeValue === 'Test:' &&
- testEl.childNodes[2].nodeValue === ' Value';
- })();
-
- // Constructor that supports either Metamorph('foo') or new
- // Metamorph('foo');
- //
- // Takes a string of HTML as the argument.
-
- var Metamorph = function(html) {
- var self;
-
- if (this instanceof Metamorph) {
- self = this;
+ // This is not the namespace of the element, but of
+ // the elements inside that elements.
+ function interiorNamespace(element){
+ if (
+ element &&
+ element.namespaceURI === svgNamespace &&
+ !svgHTMLIntegrationPoints[element.tagName]
+ ) {
+ return svgNamespace;
} else {
- self = new K();
+ return null;
}
+ }
- self.innerHTML = html;
- var myGuid = 'metamorph-'+(guid++);
- self.start = myGuid + '-start';
- self.end = myGuid + '-end';
+ // The HTML spec allows for "omitted start tags". These tags are optional
+ // when their intended child is the first thing in the parent tag. For
+ // example, this is a tbody start tag:
+ //
+ //
+ //
+ //
+ //
+ // The tbody may be omitted, and the browser will accept and render:
+ //
+ //
+ //
+ //
+ // However, the omitted start tag will still be added to the DOM. Here
+ // we test the string and context to see if the browser is about to
+ // perform this cleanup.
+ //
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+ // describes which tags are omittable. The spec for tbody and colgroup
+ // explains this behavior:
+ //
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+ //
- return self;
+ var omittedStartTagChildTest = /<([\w:]+)/;
+ function detectOmittedStartTag(string, contextualElement){
+ // Omitted start tags are only inside table tags.
+ if (contextualElement.tagName === 'TABLE') {
+ var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+ if (omittedStartTagChildMatch) {
+ var omittedStartTagChild = omittedStartTagChildMatch[1];
+ // It is already asserted that the contextual element is a table
+ // and not the proper start tag. Just see if a tag was omitted.
+ return omittedStartTagChild === 'tr' ||
+ omittedStartTagChild === 'col';
+ }
+ }
+ }
+
+ function buildSVGDOM(html, dom){
+ var div = dom.document.createElement('div');
+ div.innerHTML = '';
+ return div.firstChild.childNodes;
+ }
+
+ /*
+ * A class wrapping DOM functions to address environment compatibility,
+ * namespaces, contextual elements for morph un-escaped content
+ * insertion.
+ *
+ * When entering a template, a DOMHelper should be passed:
+ *
+ * template(context, { hooks: hooks, dom: new DOMHelper() });
+ *
+ * TODO: support foreignObject as a passed contextual element. It has
+ * a namespace (svg) that does not match its internal namespace
+ * (xhtml).
+ *
+ * @class DOMHelper
+ * @constructor
+ * @param {HTMLDocument} _document The document DOM methods are proxied to
+ */
+ function DOMHelper(_document){
+ this.document = _document || window.document;
+ this.namespace = null;
+ }
+
+ var prototype = DOMHelper.prototype;
+ prototype.constructor = DOMHelper;
+
+ prototype.insertBefore = function(element, childElement, referenceChild) {
+ return element.insertBefore(childElement, referenceChild);
};
- K.prototype = Metamorph.prototype;
-
- var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
-
- outerHTMLFunc = function() {
- return this.startTag() + this.innerHTML + this.endTag();
+ prototype.appendChild = function(element, childElement) {
+ return element.appendChild(childElement);
};
- startTagFunc = function() {
- /*
- * We replace chevron by its hex code in order to prevent escaping problems.
- * Check this thread for more explaination:
- * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
- */
- return "
| hi |
";
- * div.firstChild.firstChild.tagName //=> ""
- *
- * If our script markers are inside such a node, we need to find that
- * node and use *it* as the marker.
- */
- var realNode = function(start) {
- while (start.parentNode.tagName === "") {
- start = start.parentNode;
- }
-
- return start;
- };
-
- /*
- * When automatically adding a tbody, Internet Explorer inserts the
- * tbody immediately before the first
. Other browsers create it
- * before the first node, no matter what.
- *
- * This means the the following code:
- *
- * div = document.createElement("div");
- * div.innerHTML = "
- *
- * Generates the following DOM in IE:
- *
- * + div
- * + table
- * - script id='first'
- * + tbody
- * + tr
- * + td
- * - "hi"
- * - script id='last'
- *
- * Which means that the two script tags, even though they were
- * inserted at the same point in the hierarchy in the original
- * HTML, now have different parents.
- *
- * This code reparents the first script tag by making it the tbody's
- * first child.
- *
- */
- var fixParentage = function(start, end) {
- if (start.parentNode !== end.parentNode) {
- end.parentNode.insertBefore(start, end.parentNode.firstChild);
- }
- };
-
- htmlFunc = function(html, outerToo) {
- // get the real starting node. see realNode for details.
- var start = realNode(document.getElementById(this.start));
- var end = document.getElementById(this.end);
- var parentNode = end.parentNode;
- var node, nextSibling, last;
-
- // make sure that the start and end nodes share the same
- // parent. If not, fix it.
- fixParentage(start, end);
-
- // remove all of the nodes after the starting placeholder and
- // before the ending placeholder.
- node = start.nextSibling;
- while (node) {
- nextSibling = node.nextSibling;
- last = node === end;
-
- // if this is the last node, and we want to remove it as well,
- // set the `end` node to the next sibling. This is because
- // for the rest of the function, we insert the new nodes
- // before the end (note that insertBefore(node, null) is
- // the same as appendChild(node)).
- //
- // if we do not want to remove it, just break.
- if (last) {
- if (outerToo) { end = node.nextSibling; } else { break; }
- }
-
- node.parentNode.removeChild(node);
-
- // if this is the last node and we didn't break before
- // (because we wanted to remove the outer nodes), break
- // now.
- if (last) { break; }
-
- node = nextSibling;
- }
-
- // 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(start.parentNode, html);
-
- if (outerToo) {
- start.parentNode.removeChild(start);
- }
-
- // copy the nodes for the HTML between the starting and ending
- // placeholder.
- while (node) {
- nextSibling = node.nextSibling;
- parentNode.insertBefore(node, end);
- node = nextSibling;
- }
- };
-
- // remove the nodes in the DOM representing this metamorph.
- //
- // this includes the starting and ending placeholders.
- removeFunc = function() {
- var start = realNode(document.getElementById(this.start));
- var end = document.getElementById(this.end);
-
- this.html('');
- start.parentNode.removeChild(start);
- end.parentNode.removeChild(end);
- };
-
- appendToFunc = function(parentNode) {
- var node = firstNodeFor(parentNode, this.outerHTML());
- var nextSibling;
-
- while (node) {
- nextSibling = node.nextSibling;
- parentNode.appendChild(node);
- node = nextSibling;
- }
- };
-
- afterFunc = function(html) {
- // get the real starting node. see realNode for details.
- var end = document.getElementById(this.end);
- var insertBefore = end.nextSibling;
- 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, insertBefore);
- 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;
- }
+ prototype.createElement = function(tagName) {
+ return this.document.createElement(tagName);
};
}
- Metamorph.prototype.html = function(html) {
- this.checkRemoved();
- if (html === undefined) { return this.innerHTML; }
-
- htmlFunc.call(this, html);
-
- this.innerHTML = html;
+ prototype.setNamespace = function(ns) {
+ this.namespace = ns;
};
- Metamorph.prototype.replaceWith = function(html) {
- this.checkRemoved();
- htmlFunc.call(this, html, true);
+ prototype.detectNamespace = function(element) {
+ this.namespace = interiorNamespace(element);
};
- 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;
-
- Metamorph.prototype.isRemoved = function() {
- var before = document.getElementById(this.start);
- var after = document.getElementById(this.end);
-
- return !before || !after;
+ prototype.createDocumentFragment = function(){
+ return this.document.createDocumentFragment();
};
- Metamorph.prototype.checkRemoved = function() {
- if (this.isRemoved()) {
- throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+ prototype.createTextNode = function(text){
+ return this.document.createTextNode(text);
+ };
+
+ prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
+ if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
+ for (var i=0, len=blankChildTextNodes.length;i]*selected/;
+ detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+ return select.selectedIndex === 0 &&
+ !detectAutoSelectedOptionRegex.test(html);
+ };
+ } else {
+ detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+ var selectedAttribute = option.getAttribute('selected');
+ return select.selectedIndex === 0 && (
+ selectedAttribute === null ||
+ ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
+ );
+ };
+ }
+
+ // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
+ // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
+ // them to an initial list of corrected tags.
+ //
+ // Here we are only dealing with the ones which can have child nodes.
+ //
+ var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
+ var tableInnerHTMLTestElement = document.createElement('table');
+ try {
+ tableInnerHTMLTestElement.innerHTML = '';
+ } catch (e) {
+ } finally {
+ tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
+ }
+ if (tableNeedsInnerHTMLFix) {
+ tagNamesRequiringInnerHTMLFix = {
+ colgroup: ['table'],
+ table: [],
+ tbody: ['table'],
+ tfoot: ['table'],
+ thead: ['table'],
+ tr: ['table', 'tbody']
+ };
+ }
+
+ // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
+ // add it to the list of corrected tags.
+ //
+ var selectInnerHTMLTestElement = document.createElement('select');
+ selectInnerHTMLTestElement.innerHTML = '';
+ if (selectInnerHTMLTestElement) {
+ tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
+ tagNamesRequiringInnerHTMLFix.select = [];
+ }
+
+ function scriptSafeInnerHTML(element, html) {
+ // without a leading text node, IE will drop a leading script tag.
+ html = ''+html;
+
+ element.innerHTML = html;
+
+ var nodes = element.childNodes;
+
+ // Look for to remove it.
+ var shyElement = nodes[0];
+ while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+ shyElement = shyElement.firstChild;
+ }
+ // At this point it's the actual unicode character.
+ if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+ var newValue = shyElement.nodeValue.slice(1);
+ if (newValue.length) {
+ shyElement.nodeValue = shyElement.nodeValue.slice(1);
+ } else {
+ shyElement.parentNode.removeChild(shyElement);
+ }
+ }
+
+ return nodes;
+ }
+
+ function buildDOMWithFix(html, contextualElement){
+ var tagName = contextualElement.tagName;
+
+ // Firefox versions < 11 do not have support for element.outerHTML.
+ var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
+ if (!outerHTML) {
+ throw "Can't set innerHTML on "+tagName+" in this browser";
+ }
+
+ var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
+ var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
+ var endTag = '';
+
+ var wrappedHTML = [startTag, html, endTag];
+
+ var i = wrappingTags.length;
+ var wrappedDepth = 1 + i;
+ while(i--) {
+ wrappedHTML.unshift('<'+wrappingTags[i]+'>');
+ wrappedHTML.push('');
+ }
+
+ var wrapper = document.createElement('div');
+ scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
+ var element = wrapper;
+ while (wrappedDepth--) {
+ element = element.firstChild;
+ while (element && element.nodeType !== 1) {
+ element = element.nextSibling;
+ }
+ }
+ while (element && element.tagName !== tagName) {
+ element = element.nextSibling;
+ }
+ return element ? element.childNodes : [];
+ }
+
+ var buildDOM;
+ if (needsShy) {
+ buildDOM = function buildDOM(html, contextualElement, dom){
+ contextualElement = dom.cloneNode(contextualElement, false);
+ scriptSafeInnerHTML(contextualElement, html);
+ return contextualElement.childNodes;
+ };
+ } else {
+ buildDOM = function buildDOM(html, contextualElement, dom){
+ contextualElement = dom.cloneNode(contextualElement, false);
+ contextualElement.innerHTML = html;
+ return contextualElement.childNodes;
+ };
+ }
+
+ var buildIESafeDOM;
+ if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
+ buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
+ // Make a list of the leading text on script nodes. Include
+ // script tags without any whitespace for easier processing later.
+ var spacesBefore = [];
+ var spacesAfter = [];
+ html = html.replace(/(\s*)()(\s*)/g, function(match, tag, spaces) {
+ spacesAfter.push(spaces);
+ return tag;
+ });
+
+ // Fetch nodes
+ var nodes;
+ if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
+ // buildDOMWithFix uses string wrappers for problematic innerHTML.
+ nodes = buildDOMWithFix(html, contextualElement);
+ } else {
+ nodes = buildDOM(html, contextualElement, dom);
+ }
+
+ // Build a list of script tags, the nodes themselves will be
+ // mutated as we add test nodes.
+ var i, j, node, nodeScriptNodes;
+ var scriptNodes = [];
+ for (i=0;node=nodes[i];i++) {
+ if (node.nodeType !== 1) {
+ continue;
+ }
+ if (node.tagName === 'SCRIPT') {
+ scriptNodes.push(node);
+ } else {
+ nodeScriptNodes = node.getElementsByTagName('script');
+ for (j=0;j 0) {
+ textNode = dom.document.createTextNode(spaceBefore);
+ scriptNode.parentNode.insertBefore(textNode, scriptNode);
+ }
+
+ spaceAfter = spacesAfter[i];
+ if (spaceAfter && spaceAfter.length > 0) {
+ textNode = dom.document.createTextNode(spaceAfter);
+ scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
+ }
+ }
+
+ return nodes;
+ };
+ } else {
+ buildIESafeDOM = buildDOM;
+ }
+
+ // When parsing innerHTML, the browser may set up DOM with some things
+ // not desired. For example, with a select element context and option
+ // innerHTML the first option will be marked selected.
+ //
+ // This method cleans up some of that, resetting those values back to
+ // their defaults.
+ //
+ function buildSafeDOM(html, contextualElement, dom) {
+ var childNodes = buildIESafeDOM(html, contextualElement, dom);
+
+ if (contextualElement.tagName === 'SELECT') {
+ // Walk child nodes
+ for (var i = 0; childNodes[i]; i++) {
+ // Find and process the first option child node
+ if (childNodes[i].tagName === 'OPTION') {
+ if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
+ // If the first node is selected but does not have an attribute,
+ // presume it is not really selected.
+ childNodes[i].parentNode.selectedIndex = -1;
+ }
+ break;
+ }
+ }
+ }
+
+ return childNodes;
+ }
+
+ var buildHTMLDOM;
+ if (needsIntegrationPointFix) {
+ buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
+ if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
+ return buildSafeDOM(html, document.createElement('div'), dom);
+ } else {
+ return buildSafeDOM(html, contextualElement, dom);
+ }
+ };
+ } else {
+ buildHTMLDOM = buildSafeDOM;
+ }
+
+ __exports__.buildHTMLDOM = buildHTMLDOM;
+ });
+enifed("morph/morph",
+ ["exports"],
+ function(__exports__) {
+ "use strict";
+ var splice = Array.prototype.splice;
+
+ function ensureStartEnd(start, end) {
+ if (start === null || end === null) {
+ throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
+ }
+ }
+
+ function ensureContext(contextualElement) {
+ if (!contextualElement || contextualElement.nodeType !== 1) {
+ throw new Error('An element node must be provided for a contextualElement, you provided ' +
+ (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
+ }
+ }
+
+ // TODO: this is an internal API, this should be an assert
+ function Morph(parent, start, end, domHelper, contextualElement) {
+ if (parent.nodeType === 11) {
+ ensureStartEnd(start, end);
+ this.element = null;
+ } else {
+ this.element = parent;
+ }
+ this._parent = parent;
+ this.start = start;
+ this.end = end;
+ this.domHelper = domHelper;
+ ensureContext(contextualElement);
+ this.contextualElement = contextualElement;
+ this.reset();
+ }
+
+ Morph.prototype.reset = function() {
+ this.text = null;
+ this.owner = null;
+ this.morphs = null;
+ this.before = null;
+ this.after = null;
+ this.escaped = true;
+ };
+
+ Morph.prototype.parent = function () {
+ if (!this.element) {
+ var parent = this.start.parentNode;
+ if (this._parent !== parent) {
+ this.element = this._parent = parent;
+ }
+ }
+ return this._parent;
+ };
+
+ Morph.prototype.destroy = function () {
+ if (this.owner) {
+ this.owner.removeMorph(this);
+ } else {
+ clear(this.element || this.parent(), this.start, this.end);
+ }
+ };
+
+ Morph.prototype.removeMorph = function (morph) {
+ var morphs = this.morphs;
+ for (var i=0, l=morphs.length; i 0 ? morphs[index-1] : null;
+ var after = index < morphs.length ? morphs[index] : null;
+ var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+ var end = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+ var morph = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+
+ morph.owner = this;
+ morph._update(parent, node);
+
+ if (before !== null) {
+ morph.before = before;
+ before.end = start.nextSibling;
+ before.after = morph;
+ }
+
+ if (after !== null) {
+ morph.after = after;
+ after.before = morph;
+ after.start = end.previousSibling;
+ }
+
+ this.morphs.splice(index, 0, morph);
+ return morph;
+ };
+
+ Morph.prototype.replace = function (index, removedLength, addedNodes) {
+ if (this.morphs === null) this.morphs = [];
+ var parent = this.element || this.parent();
+ var morphs = this.morphs;
+ var before = index > 0 ? morphs[index-1] : null;
+ var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
+ var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+ var end = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+ var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
+ var args, i, current;
+
+ if (removedLength > 0) {
+ clear(parent, start, end);
+ }
+
+ if (addedLength === 0) {
+ if (before !== null) {
+ before.after = after;
+ before.end = end;
+ }
+ if (after !== null) {
+ after.before = before;
+ after.start = start;
+ }
+ morphs.splice(index, removedLength);
+ return;
+ }
+
+ args = new Array(addedLength+2);
+ if (addedLength > 0) {
+ for (i=0; i this.lengthBeforeRender) {
- this.clearRenderedChildren();
- this._childViews.length = this.lengthBeforeRender; // triage bug in ember
- }
-
- if (context) {
- buffer = Ember.RenderBuffer();
- buffer = this.renderToBuffer(buffer);
-
- // check again for childViews, since rendering may have added some
- hasChildViews = this._childViews.length > 0;
-
- if (hasChildViews) {
- this.invokeRecursively(willInsertElementIfNeeded, false);
- }
-
- element.innerHTML = buffer.innerString ? buffer.innerString() : backportedInnerString(buffer);
-
- set(this, 'element', element);
-
- var transitionTo = this._transitionTo ? this._transitionTo : this.transitionTo;
-
- transitionTo.call(this, 'inDOM');
-
- if (hasChildViews) {
- this.invokeRecursively(didInsertElementIfNeeded, false);
- }
- } else {
- element.innerHTML = ''; // when there is no context, this view should be completely empty
- }
- }
-
/**
The `Ember.ListItemView` view class renders a
[div](https://developer.mozilla.org/en/HTML/Element/div) HTML element
@@ -261,6 +188,7 @@ define("list-view/list_item_view",
__exports__["default"] = Ember.View.extend(ListItemViewMixin, {
updateContext: function(newContext){
var context = get(this, 'context');
+
Ember.instrument('view.updateContext.render', this, function() {
if (context !== newContext) {
set(this, 'context', newContext);
@@ -270,10 +198,19 @@ define("list-view/list_item_view",
}
}, this);
},
+
rerender: function () {
- Ember.run.scheduleOnce('render', this, rerender);
+ // todo: work around for tests. investigate a real fix.
+ if(get(this, 'isDestroying') || get(this, 'isDestroyed')) {
+ return;
+ }
+
+ return this._super.apply(this, arguments);
},
- _contextDidChange: Ember.observer(rerender, 'context', 'controller')
+
+ _contextDidChange: Ember.observer(function () {
+ Ember.run.once(this, this.rerender);
+ }, 'context', 'controller')
});
});
define("list-view/list_item_view_mixin",
@@ -282,7 +219,7 @@ define("list-view/list_item_view_mixin",
"use strict";
// jshint validthis: true
- var get = Ember.get, set = Ember.set;
+ var get = Ember.get;
function samePosition(a, b) {
return a && b && a.x === b.x && a.y === b.y;
@@ -296,28 +233,41 @@ define("list-view/list_item_view_mixin",
position = this.position;
_position = this._position;
- if (!position || !element) { return; }
+ if (!position || !element) {
+ return;
+ }
- // TODO: avoid needing this by avoiding unnecessary
- // calls to this method in the first place
- if (samePosition(position, _position)) { return; }
- Ember.run.schedule('render', this, this._parentView.applyTransform, element, position.x, position.y);
+ // // TODO: avoid needing this by avoiding unnecessary
+ // // calls to this method in the first place
+ if (samePosition(position, _position)) {
+ return;
+ }
+
+ Ember.run.schedule('render', this, this._parentView.applyTransform, this, position.x, position.y);
this._position = position;
}, this);
}
- __exports__["default"] = Ember.Mixin.create({
+ var TransformMixin = Ember.Mixin.create({
+ style: '',
+ attributeBindings: ['style'],
+ });
+ __exports__.TransformMixin = TransformMixin;
+ __exports__["default"] = Ember.Mixin.create(TransformMixin, {
+ _position: null,
+ classNames: ['ember-list-item-view'],
+ _positionElement: positionElement,
+
init: function(){
this._super();
+
this.one('didInsertElement', positionElement);
},
- classNames: ['ember-list-item-view'],
- _position: null,
+
updatePosition: function(position) {
this.position = position;
this._positionElement();
- },
- _positionElement: positionElement
+ }
});
});
define("list-view/list_view",
@@ -500,24 +450,45 @@ define("list-view/list_view_helper",
"use strict";
// TODO - remove this!
var el = document.createElement('div'), style = el.style;
+ var set = Ember.set;
- var propPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
-
- function testProp(prop) {
- if (prop in style) return prop;
+ function testProp (prop) {
var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1);
- for (var i=0; i');
+ buffer.push('');
this._super(buffer);
- buffer.push('');
+ },
+
+ createChildViewsMorph: function (element) {
+ var children = element.children;
+ element = children[0];
+ this._childViewsMorph = this._renderer._dom.createMorph(element, children[children.length - 1], null);
+ return element;
},
willInsertElement: function() {
@@ -1435,7 +1402,9 @@ define("list-view/list_view_mixin",
},
destroy: function () {
- if (!this._super()) { return; }
+ if (!this._super()) {
+ return;
+ }
if (this._createdEmptyView) {
this._createdEmptyView.destroy();
@@ -1548,7 +1517,9 @@ define("list-view/virtual_list_scroller_events",
} else {
startEvent = 'mousedown';
handleStart = function (e) {
- if (e.which !== 1) return;
+ if (e.which !== 1) {
+ return;
+ }
var target = e.target;
// avoid e.preventDefault() on fields
if (target && fieldRegex.test(target.tagName)) {
@@ -1569,7 +1540,9 @@ define("list-view/virtual_list_scroller_events",
};
cancelEvent = 'mouseout';
handleCancel = function (e) {
- if (e.relatedTarget) return;
+ if (e.relatedTarget) {
+ return;
+ }
unbindWindow(this.scrollerEventHandlers);
this.endScroll(e.timeStamp);
};
@@ -1647,16 +1620,17 @@ define("list-view/virtual_list_scroller_events",
}
});
define("list-view/virtual_list_view",
- ["list-view/list_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+ ["list-view/list_view_mixin","list-view/list_item_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
"use strict";
/*
global Scroller
*/
var ListViewMixin = __dependency1__["default"];
- var ListViewHelper = __dependency2__["default"];
- var VirtualListScrollerEvents = __dependency3__["default"];
+ var TransformMixin = __dependency2__.TransformMixin;
+ var ListViewHelper = __dependency3__["default"];
+ var VirtualListScrollerEvents = __dependency4__["default"];
var max = Math.max, get = Ember.get, set = Ember.set;
@@ -1704,7 +1678,9 @@ define("list-view/virtual_list_view",
// Support old and new Ember versions
var state = view._state || view.state;
- if (state !== 'inDOM') { return; }
+ if (state !== 'inDOM') {
+ return;
+ }
if (view.listContainerElement) {
view._scrollerTop = top;
@@ -1722,17 +1698,23 @@ define("list-view/virtual_list_view",
updateScrollerDimensions(view);
},
setupPullToRefresh: function() {
- if (!this.pullToRefreshViewClass) { return; }
+ if (!this.pullToRefreshViewClass) {
+ return;
+ }
+
this._insertPullToRefreshView();
this._activateScrollerPullToRefresh();
},
_insertPullToRefreshView: function(){
- this.pullToRefreshView = this.createChildView(this.pullToRefreshViewClass);
+ var pulldownClass = this.pullToRefreshViewClass.extend(TransformMixin);
+ this.pullToRefreshView = this.createChildView(pulldownClass);
this.insertAt(0, this.pullToRefreshView);
+
var view = this;
+
this.pullToRefreshView.on('didInsertElement', function(){
Ember.run.schedule('afterRender', this, function(){
- view.applyTransform(this.get('element'), 0, -1 * view.pullToRefreshViewHeight);
+ view.applyTransform(this, 0, -1 * view.pullToRefreshViewHeight);
});
});
},
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index 8a0ea9c7c..91d071be0 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -5,24 +5,24 @@
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version 1.7.1
+ * @version 1.8.1
*/
(function() {
-var define, requireModule, require, requirejs, Ember;
+var enifed, requireModule, eriuqer, requirejs, Ember;
(function() {
Ember = this.Ember = this.Ember || {};
- if (typeof Ember === 'undefined') { Ember = {} };
+ if (typeof Ember === 'undefined') { Ember = {}; };
if (typeof Ember.__loader === 'undefined') {
var registry = {}, seen = {};
- define = function(name, deps, callback) {
+ enifed = function(name, deps, callback) {
registry[name] = { deps: deps, callback: callback };
};
- requirejs = require = requireModule = function(name) {
+ requirejs = eriuqer = requireModule = function(name) {
if (seen.hasOwnProperty(name)) { return seen[name]; }
seen[name] = {};
@@ -30,11 +30,11 @@ var define, requireModule, require, requirejs, Ember;
throw new Error("Could not find module " + name);
}
- var mod = registry[name],
- deps = mod.deps,
- callback = mod.callback,
- reified = [],
- exports;
+ var mod = registry[name];
+ var deps = mod.deps;
+ var callback = mod.callback;
+ var reified = [];
+ var exports;
for (var i=0, l=deps.length; i 3 ? slice.call(arguments, 3) : undefined;
+ var stack = this.DEBUG ? new Error() : undefined;
+ var length = arguments.length;
+ var args;
+
+ if (length > 3) {
+ args = new Array(length - 3);
+ for (var i = 3; i < length; i++) {
+ args[i-3] = arguments[i];
+ }
+ } else {
+ args = undefined;
+ }
+
if (!this.currentInstance) { createAutorun(this); }
return this.currentInstance.schedule(queueName, target, method, args, false, stack);
},
@@ -231,15 +230,34 @@ define("backburner",
method = target[method];
}
- var stack = this.DEBUG ? new Error() : undefined,
- args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
- if (!this.currentInstance) { createAutorun(this); }
+ var stack = this.DEBUG ? new Error() : undefined;
+ var length = arguments.length;
+ var args;
+
+ if (length > 3) {
+ args = new Array(length - 3);
+ for (var i = 3; i < length; i++) {
+ args[i-3] = arguments[i];
+ }
+ } else {
+ args = undefined;
+ }
+
+ if (!this.currentInstance) {
+ createAutorun(this);
+ }
return this.currentInstance.schedule(queueName, target, method, args, true, stack);
},
setTimeout: function() {
- var args = slice.call(arguments),
- length = args.length,
+ var l = arguments.length;
+ var args = new Array(l);
+
+ for (var x = 0; x < l; x++) {
+ args[x] = arguments[x];
+ }
+
+ var length = args.length,
method, wait, target,
methodOrTarget, methodOrWait, methodOrArgs;
@@ -285,7 +303,7 @@ define("backburner",
}
}
- var executeAt = (+new Date()) + parseInt(wait, 10);
+ var executeAt = now() + parseInt(wait, 10);
if (isString(method)) {
method = target[method];
@@ -306,9 +324,9 @@ define("backburner",
}
// find position to insert
- var i = searchTimer(executeAt, timers);
+ var i = searchTimer(executeAt, this._timers);
- timers.splice(i, 0, executeAt, fn);
+ this._timers.splice(i, 0, executeAt, fn);
updateLaterTimer(this, executeAt, wait);
@@ -316,13 +334,10 @@ define("backburner",
},
throttle: function(target, method /* , args, wait, [immediate] */) {
- var self = this,
- args = arguments,
- immediate = pop.call(args),
- wait,
- throttler,
- index,
- timer;
+ var backburner = this;
+ var args = arguments;
+ var immediate = pop.call(args);
+ var wait, throttler, index, timer;
if (isNumber(immediate) || isString(immediate)) {
wait = immediate;
@@ -338,16 +353,16 @@ define("backburner",
timer = global.setTimeout(function() {
if (!immediate) {
- self.run.apply(self, args);
+ backburner.run.apply(backburner, args);
}
- var index = findThrottler(target, method, self._throttlers);
+ var index = findThrottler(target, method, backburner._throttlers);
if (index > -1) {
- self._throttlers.splice(index, 1);
+ backburner._throttlers.splice(index, 1);
}
}, wait);
if (immediate) {
- self.run.apply(self, args);
+ this.run.apply(this, args);
}
throttler = [target, method, timer];
@@ -358,13 +373,10 @@ define("backburner",
},
debounce: function(target, method /* , args, wait, [immediate] */) {
- var self = this,
- args = arguments,
- immediate = pop.call(args),
- wait,
- index,
- debouncee,
- timer;
+ var backburner = this;
+ var args = arguments;
+ var immediate = pop.call(args);
+ var wait, index, debouncee, timer;
if (isNumber(immediate) || isString(immediate)) {
wait = immediate;
@@ -385,21 +397,25 @@ define("backburner",
timer = global.setTimeout(function() {
if (!immediate) {
- self.run.apply(self, args);
+ backburner.run.apply(backburner, args);
}
- var index = findDebouncee(target, method, self._debouncees);
+ var index = findDebouncee(target, method, backburner._debouncees);
if (index > -1) {
- self._debouncees.splice(index, 1);
+ backburner._debouncees.splice(index, 1);
}
}, wait);
if (immediate && index === -1) {
- self.run.apply(self, args);
+ backburner.run.apply(backburner, args);
}
- debouncee = [target, method, timer];
+ debouncee = [
+ target,
+ method,
+ timer
+ ];
- self._debouncees.push(debouncee);
+ backburner._debouncees.push(debouncee);
return debouncee;
},
@@ -419,7 +435,7 @@ define("backburner",
clearTimeout(this._laterTimer);
this._laterTimer = null;
}
- timers = [];
+ this._timers = [];
if (this._autorun) {
clearTimeout(this._autorun);
@@ -428,7 +444,7 @@ define("backburner",
},
hasTimers: function() {
- return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+ return !!this._timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
},
cancel: function(timer) {
@@ -437,9 +453,18 @@ define("backburner",
if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
return timer.queue.cancel(timer);
} else if (timerType === 'function') { // we're cancelling a setTimeout
- for (var i = 0, l = timers.length; i < l; i += 2) {
- if (timers[i + 1] === timer) {
- timers.splice(i, 2); // remove the two elements
+ for (var i = 0, l = this._timers.length; i < l; i += 2) {
+ if (this._timers[i + 1] === timer) {
+ this._timers.splice(i, 2); // remove the two elements
+ if (i === 0) {
+ if (this._laterTimer) { // Active timer? Then clear timer and reset for future timer
+ clearTimeout(this._laterTimer);
+ this._laterTimer = null;
+ }
+ if (this._timers.length > 0) { // Update to next available timer when available
+ updateLaterTimer(this, this._timers[0], this._timers[0] - now());
+ }
+ }
return true;
}
}
@@ -452,18 +477,17 @@ define("backburner",
},
_cancelItem: function(findMethod, array, timer){
- var item,
- index;
+ var item, index;
if (timer.length < 3) { return false; }
index = findMethod(timer[0], timer[1], array);
- if(index > -1) {
+ if (index > -1) {
item = array[index];
- if(item[2] === timer[2]){
+ if (item[2] === timer[2]) {
array.splice(index, 1);
clearTimeout(timer[2]);
return true;
@@ -486,21 +510,10 @@ define("backburner",
Backburner.prototype.end = wrapInTryCatch(originalEnd);
}
- function wrapInTryCatch(func) {
- return function () {
- try {
- return func.apply(this, arguments);
- } catch (e) {
- throw e;
- }
- };
- }
-
function getOnError(options) {
return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
}
-
function createAutorun(backburner) {
backburner.begin();
backburner._autorun = global.setTimeout(function() {
@@ -509,33 +522,48 @@ define("backburner",
});
}
- function updateLaterTimer(self, executeAt, wait) {
- if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
- self._laterTimer = global.setTimeout(function() {
- self._laterTimer = null;
- self._laterTimerExpiresAt = null;
- executeTimers(self);
+ function updateLaterTimer(backburner, executeAt, wait) {
+ var n = now();
+ if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
+
+ if (backburner._laterTimer) {
+ // Clear when:
+ // - Already expired
+ // - New timer is earlier
+ clearTimeout(backburner._laterTimer);
+
+ if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
+ // Calculate the left-over wait-time
+ wait = Math.max(0, executeAt - n);
+ }
+ }
+
+ backburner._laterTimer = global.setTimeout(function() {
+ backburner._laterTimer = null;
+ backburner._laterTimerExpiresAt = null;
+ executeTimers(backburner);
}, wait);
- self._laterTimerExpiresAt = executeAt;
+
+ backburner._laterTimerExpiresAt = n + wait;
}
}
- function executeTimers(self) {
- var now = +new Date(),
- time, fns, i, l;
+ function executeTimers(backburner) {
+ var n = now();
+ var fns, i, l;
- self.run(function() {
- i = searchTimer(now, timers);
+ backburner.run(function() {
+ i = searchTimer(n, backburner._timers);
- fns = timers.splice(0, i);
+ fns = backburner._timers.splice(0, i);
for (i = 1, l = fns.length; i < l; i += 2) {
- self.schedule(self.options.defaultQueue, null, fns[i]);
+ backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
}
});
- if (timers.length) {
- updateLaterTimer(self, timers[0], timers[0] - now);
+ if (backburner._timers.length) {
+ updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
}
}
@@ -548,8 +576,8 @@ define("backburner",
}
function findItem(target, method, collection) {
- var item,
- index = -1;
+ var item;
+ var index = -1;
for (var i = 0, l = collection.length; i < l; i++) {
item = collection[i];
@@ -562,10 +590,31 @@ define("backburner",
return index;
}
- function searchTimer(time, timers) {
- var start = 0,
- end = timers.length - 2,
- middle, l;
+ __exports__["default"] = Backburner;
+ });
+enifed("backburner.umd",
+ ["./backburner"],
+ function(__dependency1__) {
+ "use strict";
+ var Backburner = __dependency1__["default"];
+
+ /* global define:true module:true window: true */
+ if (typeof enifed === 'function' && enifed.amd) {
+ enifed(function() { return Backburner; });
+ } else if (typeof module !== 'undefined' && module.exports) {
+ module.exports = Backburner;
+ } else if (typeof this !== 'undefined') {
+ this['Backburner'] = Backburner;
+ }
+ });
+enifed("backburner/binary-search",
+ ["exports"],
+ function(__exports__) {
+ "use strict";
+ __exports__["default"] = function binarySearch(time, timers) {
+ var start = 0;
+ var end = timers.length - 2;
+ var middle, l;
while (start < end) {
// since timers is an array of pairs 'l' will always
@@ -585,18 +634,14 @@ define("backburner",
return (time >= timers[start]) ? start + 2 : start;
}
-
- __exports__.Backburner = Backburner;
});
-define("backburner/deferred_action_queues",
- ["backburner/utils","backburner/queue","exports"],
+enifed("backburner/deferred-action-queues",
+ ["./utils","./queue","exports"],
function(__dependency1__, __dependency2__, __exports__) {
"use strict";
- var Utils = __dependency1__["default"];
- var Queue = __dependency2__.Queue;
-
- var each = Utils.each,
- isString = Utils.isString;
+ var each = __dependency1__.each;
+ var isString = __dependency1__.isString;
+ var Queue = __dependency2__["default"];
function DeferredActionQueues(queueNames, options) {
var queues = this.queues = {};
@@ -605,20 +650,20 @@ define("backburner/deferred_action_queues",
this.options = options;
each(queueNames, function(queueName) {
- queues[queueName] = new Queue(this, queueName, options);
+ queues[queueName] = new Queue(queueName, options[queueName], options);
});
}
+ function noSuchQueue(name) {
+ throw new Error("You attempted to schedule an action in a queue (" + name + ") that doesn't exist");
+ }
+
DeferredActionQueues.prototype = {
- queueNames: null,
- queues: null,
- options: null,
+ schedule: function(name, target, method, args, onceFlag, stack) {
+ var queues = this.queues;
+ var queue = queues[name];
- schedule: function(queueName, target, method, args, onceFlag, stack) {
- var queues = this.queues,
- queue = queues[queueName];
-
- if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
+ if (!queue) { noSuchQueue(name); }
if (onceFlag) {
return queue.pushUnique(target, method, args, stack);
@@ -627,7 +672,7 @@ define("backburner/deferred_action_queues",
}
},
- invoke: function(target, method, args, _) {
+ invoke: function(target, method, args, _, _errorRecordedForStack) {
if (args && args.length > 0) {
method.apply(target, args);
} else {
@@ -635,7 +680,7 @@ define("backburner/deferred_action_queues",
}
},
- invokeWithOnError: function(target, method, args, onError) {
+ invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
try {
if (args && args.length > 0) {
method.apply(target, args);
@@ -643,59 +688,80 @@ define("backburner/deferred_action_queues",
method.call(target);
}
} catch(error) {
- onError(error);
+ onError(error, errorRecordedForStack);
}
},
flush: function() {
- var queues = this.queues,
- queueNames = this.queueNames,
- queueName, queue, queueItems, priorQueueNameIndex,
- queueNameIndex = 0, numberOfQueues = queueNames.length,
- options = this.options,
- onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
- invoke = onError ? this.invokeWithOnError : this.invoke;
+ var queues = this.queues;
+ var queueNames = this.queueNames;
+ var queueName, queue, queueItems, priorQueueNameIndex;
+ var queueNameIndex = 0;
+ var numberOfQueues = queueNames.length;
+ var options = this.options;
+ var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+ var invoke = onError ? this.invokeWithOnError : this.invoke;
- outerloop:
while (queueNameIndex < numberOfQueues) {
queueName = queueNames[queueNameIndex];
queue = queues[queueName];
queueItems = queue._queueBeingFlushed = queue._queue.slice();
queue._queue = [];
+ queue.targetQueues = Object.create(null);
- var queueOptions = queue.options, // TODO: write a test for this
- before = queueOptions && queueOptions.before,
- after = queueOptions && queueOptions.after,
- target, method, args, stack,
- queueIndex = 0, numberOfQueueItems = queueItems.length;
+ var queueOptions = queue.options; // TODO: write a test for this
+ var before = queueOptions && queueOptions.before;
+ var after = queueOptions && queueOptions.after;
+ var target, method, args, errorRecordedForStack;
+ var queueIndex = 0;
+ var numberOfQueueItems = queueItems.length;
- if (numberOfQueueItems && before) { before(); }
+ if (numberOfQueueItems && before) {
+ before();
+ }
while (queueIndex < numberOfQueueItems) {
- target = queueItems[queueIndex];
- method = queueItems[queueIndex+1];
- args = queueItems[queueIndex+2];
- stack = queueItems[queueIndex+3]; // Debugging assistance
+ target = queueItems[queueIndex];
+ method = queueItems[queueIndex+1];
+ args = queueItems[queueIndex+2];
+ errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
- if (isString(method)) { method = target[method]; }
+ //
+
+ if (isString(method)) {
+ method = target[method];
+ }
// method could have been nullified / canceled during flush
if (method) {
- invoke(target, method, args, onError);
+ //
+ // ** Attention intrepid developer **
+ //
+ // To find out the stack of this task when it was scheduled onto
+ // the run loop, add the following to your app.js:
+ //
+ // Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+ //
+ // Once that is in place, when you are at a breakpoint and navigate
+ // here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+ // which will be the captured stack when this job was scheduled.
+ //
+ invoke(target, method, args, onError, errorRecordedForStack);
}
queueIndex += 4;
}
queue._queueBeingFlushed = null;
- if (numberOfQueueItems && after) { after(); }
+ if (numberOfQueueItems && after) {
+ after();
+ }
if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
queueNameIndex = priorQueueNameIndex;
- continue outerloop;
+ } else {
+ queueNameIndex++;
}
-
- queueNameIndex++;
}
}
};
@@ -712,60 +778,134 @@ define("backburner/deferred_action_queues",
return -1;
}
- __exports__.DeferredActionQueues = DeferredActionQueues;
+ __exports__["default"] = DeferredActionQueues;
});
-define("backburner/queue",
+enifed("backburner/platform",
["exports"],
function(__exports__) {
"use strict";
- function Queue(daq, name, options) {
- this.daq = daq;
+ // In IE 6-8, try/finally doesn't work without a catch.
+ // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+ // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+ var needsIETryCatchFix = (function(e,x){
+ try{ x(); }
+ catch(e) { } // jshint ignore:line
+ return !!e;
+ })();
+ __exports__.needsIETryCatchFix = needsIETryCatchFix;
+ });
+enifed("backburner/queue",
+ ["exports"],
+ function(__exports__) {
+ "use strict";
+ function Queue(name, options, globalOptions) {
this.name = name;
- this.globalOptions = options;
- this.options = options[name];
+ this.globalOptions = globalOptions || {};
+ this.options = options;
this._queue = [];
+ this.targetQueues = Object.create(null);
+ this._queueBeingFlushed = undefined;
}
Queue.prototype = {
- daq: null,
- name: null,
- options: null,
- onError: null,
- _queue: null,
-
push: function(target, method, args, stack) {
var queue = this._queue;
queue.push(target, method, args, stack);
- return {queue: this, target: target, method: method};
+
+ return {
+ queue: this,
+ target: target,
+ method: method
+ };
},
- pushUnique: function(target, method, args, stack) {
- var queue = this._queue, currentTarget, currentMethod, i, l;
+ pushUniqueWithoutGuid: function(target, method, args, stack) {
+ var queue = this._queue;
- for (i = 0, l = queue.length; i < l; i += 4) {
- currentTarget = queue[i];
- currentMethod = queue[i+1];
+ for (var i = 0, l = queue.length; i < l; i += 4) {
+ var currentTarget = queue[i];
+ var currentMethod = queue[i+1];
if (currentTarget === target && currentMethod === method) {
- queue[i+2] = args; // replace args
+ queue[i+2] = args; // replace args
queue[i+3] = stack; // replace stack
- return {queue: this, target: target, method: method};
+ return;
}
}
queue.push(target, method, args, stack);
- return {queue: this, target: target, method: method};
+ },
+
+ targetQueue: function(targetQueue, target, method, args, stack) {
+ var queue = this._queue;
+
+ for (var i = 0, l = targetQueue.length; i < l; i += 4) {
+ var currentMethod = targetQueue[i];
+ var currentIndex = targetQueue[i + 1];
+
+ if (currentMethod === method) {
+ queue[currentIndex + 2] = args; // replace args
+ queue[currentIndex + 3] = stack; // replace stack
+ return;
+ }
+ }
+
+ targetQueue.push(
+ method,
+ queue.push(target, method, args, stack) - 4
+ );
+ },
+
+ pushUniqueWithGuid: function(guid, target, method, args, stack) {
+ var hasLocalQueue = this.targetQueues[guid];
+
+ if (hasLocalQueue) {
+ this.targetQueue(hasLocalQueue, target, method, args, stack);
+ } else {
+ this.targetQueues[guid] = [
+ method,
+ this._queue.push(target, method, args, stack) - 4
+ ];
+ }
+
+ return {
+ queue: this,
+ target: target,
+ method: method
+ };
+ },
+
+ pushUnique: function(target, method, args, stack) {
+ var queue = this._queue, currentTarget, currentMethod, i, l;
+ var KEY = this.globalOptions.GUID_KEY;
+
+ if (target && KEY) {
+ var guid = target[KEY];
+ if (guid) {
+ return this.pushUniqueWithGuid(guid, target, method, args, stack);
+ }
+ }
+
+ this.pushUniqueWithoutGuid(target, method, args, stack);
+
+ return {
+ queue: this,
+ target: target,
+ method: method
+ };
},
// TODO: remove me, only being used for Ember.run.sync
flush: function() {
- var queue = this._queue,
- globalOptions = this.globalOptions,
- options = this.options,
- before = options && options.before,
- after = options && options.after,
- onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
- target, method, args, stack, i, l = queue.length;
+ var queue = this._queue;
+ var globalOptions = this.globalOptions;
+ var options = this.options;
+ var before = options && options.before;
+ var after = options && options.after;
+ var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+ var target, method, args, stack, i, l = queue.length;
+
+ this.targetQueues = Object.create(null);
if (l && before) { before(); }
for (i = 0; i < l; i += 4) {
@@ -810,12 +950,28 @@ define("backburner/queue",
cancel: function(actionToCancel) {
var queue = this._queue, currentTarget, currentMethod, i, l;
+ var target = actionToCancel.target;
+ var method = actionToCancel.method;
+ var GUID_KEY = this.globalOptions.GUID_KEY;
+
+ if (GUID_KEY && this.targetQueues && target) {
+ var targetQueue = this.targetQueues[target[GUID_KEY]];
+
+ if (targetQueue) {
+ for (i = 0, l = targetQueue.length; i < l; i++) {
+ if (targetQueue[i] === method) {
+ targetQueue.splice(i, 1);
+ }
+ }
+ }
+ }
for (i = 0, l = queue.length; i < l; i += 4) {
currentTarget = queue[i];
currentMethod = queue[i+1];
- if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+ if (currentTarget === target &&
+ currentMethod === method) {
queue.splice(i, 4);
return true;
}
@@ -831,7 +987,8 @@ define("backburner/queue",
currentTarget = queue[i];
currentMethod = queue[i+1];
- if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+ if (currentTarget === target &&
+ currentMethod === method) {
// don't mess with array during flush
// just nullify the method
queue[i+1] = null;
@@ -841,44 +998,63 @@ define("backburner/queue",
}
};
- __exports__.Queue = Queue;
+ __exports__["default"] = Queue;
});
-define("backburner/utils",
+enifed("backburner/utils",
["exports"],
function(__exports__) {
"use strict";
- __exports__["default"] = {
- each: function(collection, callback) {
- for (var i = 0; i < collection.length; i++) {
- callback(collection[i]);
- }
- },
+ var NUMBER = /\d+/;
- isString: function(suspect) {
- return typeof suspect === 'string';
- },
-
- isFunction: function(suspect) {
- return typeof suspect === 'function';
- },
-
- isNumber: function(suspect) {
- return typeof suspect === 'number';
+ function each(collection, callback) {
+ for (var i = 0; i < collection.length; i++) {
+ callback(collection[i]);
}
- };
- });
+ }
-define("calculateVersion",
+ __exports__.each = each;// Date.now is not available in browsers < IE9
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+ var now = Date.now || function() { return new Date().getTime(); };
+ __exports__.now = now;
+ function isString(suspect) {
+ return typeof suspect === 'string';
+ }
+
+ __exports__.isString = isString;function isFunction(suspect) {
+ return typeof suspect === 'function';
+ }
+
+ __exports__.isFunction = isFunction;function isNumber(suspect) {
+ return typeof suspect === 'number';
+ }
+
+ __exports__.isNumber = isNumber;function isCoercableNumber(number) {
+ return isNumber(number) || NUMBER.test(number);
+ }
+
+ __exports__.isCoercableNumber = isCoercableNumber;function wrapInTryCatch(func) {
+ return function () {
+ try {
+ return func.apply(this, arguments);
+ } catch (e) {
+ throw e;
+ }
+ };
+ }
+
+ __exports__.wrapInTryCatch = wrapInTryCatch;
+ });
+enifed("calculateVersion",
[],
function() {
"use strict";
'use strict';
- var fs = require('fs');
- var path = require('path');
+ var fs = eriuqer('fs');
+ var path = eriuqer('path');
module.exports = function () {
- var packageVersion = require('../package.json').version;
+ var packageVersion = eriuqer('../package.json').version;
var output = [packageVersion];
var gitPath = path.join(__dirname,'..','.git');
var headFilePath = path.join(gitPath, 'HEAD');
@@ -909,7 +1085,7 @@ define("calculateVersion",
}
};
});
-define("container",
+enifed("container",
["container/container","exports"],
function(__dependency1__, __exports__) {
"use strict";
@@ -936,13 +1112,14 @@ define("container",
__exports__["default"] = Container;
});
-define("container/container",
- ["container/inheriting_dict","ember-metal/core","exports"],
- function(__dependency1__, __dependency2__, __exports__) {
+enifed("container/container",
+ ["ember-metal/core","ember-metal/keys","ember-metal/dictionary","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
"use strict";
- var InheritingDict = __dependency1__["default"];
- var Ember = __dependency2__["default"];
+ var Ember = __dependency1__["default"];
// Ember.assert
+ var emberKeys = __dependency2__["default"];
+ var dictionary = __dependency3__["default"];
// A lightweight container that helps to assemble and decouple components.
// Public api for the container is still in flux.
@@ -953,18 +1130,19 @@ define("container/container",
this.resolver = parent && parent.resolver || function() {};
- this.registry = new InheritingDict(parent && parent.registry);
- this.cache = new InheritingDict(parent && parent.cache);
- this.factoryCache = new InheritingDict(parent && parent.factoryCache);
- this.resolveCache = new InheritingDict(parent && parent.resolveCache);
- this.typeInjections = new InheritingDict(parent && parent.typeInjections);
- this.injections = {};
+ this.registry = dictionary(parent ? parent.registry : null);
+ this.cache = dictionary(parent ? parent.cache : null);
+ this.factoryCache = dictionary(parent ? parent.factoryCache : null);
+ this.resolveCache = dictionary(parent ? parent.resolveCache : null);
+ this.typeInjections = dictionary(parent ? parent.typeInjections : null);
+ this.injections = dictionary(null);
+ this.normalizeCache = dictionary(null);
- this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
- this.factoryInjections = {};
+ this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
+ this.factoryInjections = dictionary(null);
- this._options = new InheritingDict(parent && parent._options);
- this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+ this._options = dictionary(parent ? parent._options : null);
+ this._typeOptions = dictionary(parent ? parent._typeOptions : null);
}
Container.prototype = {
@@ -1084,12 +1262,12 @@ define("container/container",
var normalizedName = this.normalize(fullName);
- if (this.cache.has(normalizedName)) {
+ if (normalizedName in this.cache) {
throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
}
- this.registry.set(normalizedName, factory);
- this._options.set(normalizedName, options || {});
+ this.registry[normalizedName] = factory;
+ this._options[normalizedName] = (options || {});
},
/**
@@ -1112,11 +1290,11 @@ define("container/container",
var normalizedName = this.normalize(fullName);
- this.registry.remove(normalizedName);
- this.cache.remove(normalizedName);
- this.factoryCache.remove(normalizedName);
- this.resolveCache.remove(normalizedName);
- this._options.remove(normalizedName);
+ delete this.registry[normalizedName];
+ delete this.cache[normalizedName];
+ delete this.factoryCache[normalizedName];
+ delete this.resolveCache[normalizedName];
+ delete this._options[normalizedName];
},
/**
@@ -1174,12 +1352,25 @@ define("container/container",
/**
A hook to enable custom fullName normalization behaviour
+ @method normalizeFullName
+ @param {String} fullName
+ @return {string} normalized fullName
+ */
+ normalizeFullName: function(fullName) {
+ return fullName;
+ },
+
+ /**
+ normalize a fullName based on the applications conventions
+
@method normalize
@param {String} fullName
@return {string} normalized fullName
*/
normalize: function(fullName) {
- return fullName;
+ return this.normalizeCache[fullName] || (
+ this.normalizeCache[fullName] = this.normalizeFullName(fullName)
+ );
},
/**
@@ -1289,7 +1480,7 @@ define("container/container",
optionsForType: function(type, options) {
if (this.parent) { illegalChildOperation('optionsForType'); }
- this._typeOptions.set(type, options);
+ this._typeOptions[type] = options;
},
/**
@@ -1337,12 +1528,14 @@ define("container/container",
@param {String} fullName
*/
typeInjection: function(type, property, fullName) {
- if (this.parent) { illegalChildOperation('typeInjection'); }
+
+ if (this.parent) { illegalChildOperation('typeInjection'); }
var fullNameType = fullName.split(':')[0];
- if(fullNameType === type) {
+ if (fullNameType === type) {
throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
}
+
addTypeInjection(this.typeInjections, type, property, fullName);
},
@@ -1402,7 +1595,7 @@ define("container/container",
var normalizedName = this.normalize(fullName);
- if (this.cache.has(normalizedName)) {
+ if (this.cache[normalizedName]) {
throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
}
addInjection(this.injections, normalizedName, property, normalizedInjectionName);
@@ -1506,7 +1699,7 @@ define("container/container",
}
- if (this.factoryCache.has(normalizedName)) {
+ if (this.factoryCache[normalizedName]) {
throw new Error('Attempted to register a factoryInjection for a type that has already ' +
'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
}
@@ -1548,17 +1741,17 @@ define("container/container",
};
function resolve(container, normalizedName) {
- var cached = container.resolveCache.get(normalizedName);
+ var cached = container.resolveCache[normalizedName];
if (cached) { return cached; }
- var resolved = container.resolver(normalizedName) || container.registry.get(normalizedName);
- container.resolveCache.set(normalizedName, resolved);
+ var resolved = container.resolver(normalizedName) || container.registry[normalizedName];
+ container.resolveCache[normalizedName] = resolved;
return resolved;
}
function has(container, fullName){
- if (container.cache.has(fullName)) {
+ if (container.cache[fullName]) {
return true;
}
@@ -1568,8 +1761,8 @@ define("container/container",
function lookup(container, fullName, options) {
options = options || {};
- if (container.cache.has(fullName) && options.singleton !== false) {
- return container.cache.get(fullName);
+ if (container.cache[fullName] && options.singleton !== false) {
+ return container.cache[fullName];
}
var value = instantiate(container, fullName);
@@ -1577,7 +1770,7 @@ define("container/container",
if (value === undefined) { return; }
if (isSingleton(container, fullName) && options.singleton !== false) {
- container.cache.set(fullName, value);
+ container.cache[fullName] = value;
}
return value;
@@ -1615,14 +1808,14 @@ define("container/container",
}
function option(container, fullName, optionName) {
- var options = container._options.get(fullName);
+ var options = container._options[fullName];
if (options && options[optionName] !== undefined) {
return options[optionName];
}
var type = fullName.split(':')[0];
- options = container._typeOptions.get(type);
+ options = container._typeOptions[type];
if (options) {
return options[optionName];
@@ -1631,8 +1824,8 @@ define("container/container",
function factoryFor(container, fullName) {
var cache = container.factoryCache;
- if (cache.has(fullName)) {
- return cache.get(fullName);
+ if (cache[fullName]) {
+ return cache[fullName];
}
var factory = container.resolve(fullName);
if (factory === undefined) { return; }
@@ -1641,6 +1834,7 @@ define("container/container",
if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
// TODO: think about a 'safe' merge style extension
// for now just fallback to create time injection
+ cache[fullName] = factory;
return factory;
} else {
var injections = injectionsFor(container, fullName);
@@ -1651,18 +1845,18 @@ define("container/container",
var injectedFactory = factory.extend(injections);
injectedFactory.reopenClass(factoryInjections);
- cache.set(fullName, injectedFactory);
+ cache[fullName] = injectedFactory;
return injectedFactory;
}
}
function injectionsFor(container, fullName) {
- var splitName = fullName.split(':'),
- type = splitName[0],
- injections = [];
+ var splitName = fullName.split(':');
+ var type = splitName[0];
+ var injections = [];
- injections = injections.concat(container.typeInjections.get(type) || []);
+ injections = injections.concat(container.typeInjections[type] || []);
injections = injections.concat(container.injections[fullName] || []);
injections = buildInjections(container, injections);
@@ -1673,11 +1867,11 @@ define("container/container",
}
function factoryInjectionsFor(container, fullName) {
- var splitName = fullName.split(':'),
- type = splitName[0],
- factoryInjections = [];
+ var splitName = fullName.split(':');
+ var type = splitName[0];
+ var factoryInjections = [];
- factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+ factoryInjections = factoryInjections.concat(container.factoryTypeInjections[type] || []);
factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
factoryInjections = buildInjections(container, factoryInjections);
@@ -1712,26 +1906,34 @@ define("container/container",
}
function eachDestroyable(container, callback) {
- container.cache.eachLocal(function(key, value) {
- if (option(container, key, 'instantiate') === false) { return; }
- callback(value);
- });
+ var cache = container.cache;
+ var keys = emberKeys(cache);
+ var key, value;
+
+ for (var i = 0, l = keys.length; i < l; i++) {
+ key = keys[i];
+ value = cache[key];
+
+ if (option(container, key, 'instantiate') !== false) {
+ callback(value);
+ }
+ }
}
function resetCache(container) {
- container.cache.eachLocal(function(key, value) {
- if (option(container, key, 'instantiate') === false) { return; }
+ eachDestroyable(container, function(value) {
value.destroy();
});
- container.cache.dict = {};
+
+ container.cache.dict = dictionary(null);
}
function addTypeInjection(rules, type, property, fullName) {
- var injections = rules.get(type);
+ var injections = rules[type];
if (!injections) {
injections = [];
- rules.set(type, injections);
+ rules[type] = injections;
}
injections.push({
@@ -1750,126 +1952,15 @@ define("container/container",
function addInjection(rules, factoryName, property, injectionName) {
var injections = rules[factoryName] = rules[factoryName] || [];
- injections.push({ property: property, fullName: injectionName });
+ injections.push({
+ property: property,
+ fullName: injectionName
+ });
}
__exports__["default"] = Container;
});
-define("container/inheriting_dict",
- ["exports"],
- function(__exports__) {
- "use strict";
- // A safe and simple inheriting object.
- function InheritingDict(parent) {
- this.parent = parent;
- this.dict = {};
- }
-
- InheritingDict.prototype = {
-
- /**
- @property parent
- @type InheritingDict
- @default null
- */
-
- parent: null,
-
- /**
- Object used to store the current nodes data.
-
- @property dict
- @type Object
- @default Object
- */
- dict: null,
-
- /**
- Retrieve the value given a key, if the value is present at the current
- level use it, otherwise walk up the parent hierarchy and try again. If
- no matching key is found, return undefined.
-
- @method get
- @param {String} key
- @return {any}
- */
- get: function(key) {
- var dict = this.dict;
-
- if (dict.hasOwnProperty(key)) {
- return dict[key];
- }
-
- if (this.parent) {
- return this.parent.get(key);
- }
- },
-
- /**
- Set the given value for the given key, at the current level.
-
- @method set
- @param {String} key
- @param {Any} value
- */
- set: function(key, value) {
- this.dict[key] = value;
- },
-
- /**
- Delete the given key
-
- @method remove
- @param {String} key
- */
- remove: function(key) {
- delete this.dict[key];
- },
-
- /**
- Check for the existence of given a key, if the key is present at the current
- level return true, otherwise walk up the parent hierarchy and try again. If
- no matching key is found, return false.
-
- @method has
- @param {String} key
- @return {Boolean}
- */
- has: function(key) {
- var dict = this.dict;
-
- if (dict.hasOwnProperty(key)) {
- return true;
- }
-
- if (this.parent) {
- return this.parent.has(key);
- }
-
- return false;
- },
-
- /**
- Iterate and invoke a callback for each local key-value pair.
-
- @method eachLocal
- @param {Function} callback
- @param {Object} binding
- */
- eachLocal: function(callback, binding) {
- var dict = this.dict;
-
- for (var prop in dict) {
- if (dict.hasOwnProperty(prop)) {
- callback.call(binding, prop, dict[prop]);
- }
- }
- }
- };
-
- __exports__["default"] = InheritingDict;
- });
-define("ember-application",
+enifed("ember-application",
["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
"use strict";
@@ -1897,7 +1988,7 @@ define("ember-application",
runLoadHooks('Ember.Application', Application);
});
-define("ember-application/ext/controller",
+enifed("ember-application/ext/controller",
["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/mixins/controller","ember-routing/system/controller_for","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -1918,7 +2009,8 @@ define("ember-application/ext/controller",
var controllerFor = __dependency8__["default"];
function verifyNeedsDependencies(controller, container, needs) {
- var dependency, i, l, missing = [];
+ var dependency, i, l;
+ var missing = [];
for (i=0, l=needs.length; i -1) {
- result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+ result = result.replace(/\.(.)/g, function(m) {
+ return m.charAt(1).toUpperCase();
+ });
}
if (name.indexOf('_') > -1) {
- result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+ result = result.replace(/_(.)/g, function(m) {
+ return m.charAt(1).toUpperCase();
+ });
}
return type + ':' + result;
@@ -3430,9 +3561,9 @@ define("ember-application/system/resolver",
@return {Object} the resolved factory
*/
resolve: function(fullName) {
- var parsedName = this.parseName(fullName),
- resolveMethodName = parsedName.resolveMethodName,
- resolved;
+ var parsedName = this.parseName(fullName);
+ var resolveMethodName = parsedName.resolveMethodName;
+ var resolved;
if (!(parsedName.name && parsedName.type)) {
throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
@@ -3461,12 +3592,19 @@ define("ember-application/system/resolver",
@param {String} fullName the lookup string
@method parseName
*/
+
parseName: function(fullName) {
- var nameParts = fullName.split(':'),
- type = nameParts[0], fullNameWithoutType = nameParts[1],
- name = fullNameWithoutType,
- namespace = get(this, 'namespace'),
- root = namespace;
+ return this._parseNameCache[fullName] || (
+ this._parseNameCache[fullName] = this._parseName(fullName)
+ );
+ },
+
+ _parseName: function(fullName) {
+ var nameParts = fullName.split(':');
+ var type = nameParts[0], fullNameWithoutType = nameParts[1];
+ var name = fullNameWithoutType;
+ var namespace = get(this, 'namespace');
+ var root = namespace;
if (type !== 'template' && name.indexOf('/') !== -1) {
var parts = name.split('/');
@@ -3504,7 +3642,10 @@ define("ember-application/system/resolver",
}
var description = parsedName.root + '.' + classify(parsedName.name);
- if (parsedName.type !== 'model') { description += classify(parsedName.type); }
+
+ if (parsedName.type !== 'model') {
+ description += classify(parsedName.type);
+ }
return description;
},
@@ -3547,6 +3688,7 @@ define("ember-application/system/resolver",
return Ember.TEMPLATES[templateName];
}
},
+
/**
Lookup the view using `resolveOther`
@@ -3559,6 +3701,7 @@ define("ember-application/system/resolver",
this.useRouterNaming(parsedName);
return this.resolveOther(parsedName);
},
+
/**
Lookup the controller using `resolveOther`
@@ -3647,7 +3790,7 @@ define("ember-application/system/resolver",
}
});
});
-define("ember-extension-support",
+enifed("ember-extension-support",
["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
function(__dependency1__, __dependency2__, __dependency3__) {
"use strict";
@@ -3666,7 +3809,7 @@ define("ember-extension-support",
Ember.DataAdapter = DataAdapter;
Ember.ContainerDebugAdapter = ContainerDebugAdapter;
});
-define("ember-extension-support/container_debug_adapter",
+enifed("ember-extension-support/container_debug_adapter",
["ember-metal/core","ember-runtime/system/native_array","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
"use strict";
@@ -3743,7 +3886,7 @@ define("ember-extension-support/container_debug_adapter",
classes in the resolver for a given type.
@method canCatalogEntriesByType
- @param {string} type The type. e.g. "model", "controller", "route"
+ @param {String} type The type. e.g. "model", "controller", "route"
@return {boolean} whether a list is available for this type.
*/
canCatalogEntriesByType: function(type) {
@@ -3755,7 +3898,7 @@ define("ember-extension-support/container_debug_adapter",
Returns the available classes a given type.
@method catalogEntriesByType
- @param {string} type The type. e.g. "model", "controller", "route"
+ @param {String} type The type. e.g. "model", "controller", "route"
@return {Array} An array of strings.
*/
catalogEntriesByType: function(type) {
@@ -3779,7 +3922,7 @@ define("ember-extension-support/container_debug_adapter",
}
});
});
-define("ember-extension-support/data_adapter",
+enifed("ember-extension-support/data_adapter",
["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -3917,8 +4060,10 @@ define("ember-extension-support/data_adapter",
@return {Function} Method to call to remove all observers
*/
watchModelTypes: function(typesAdded, typesUpdated) {
- var modelTypes = this.getModelTypes(),
- self = this, typesToSend, releaseMethods = emberA();
+ var modelTypes = this.getModelTypes();
+ var self = this;
+ var releaseMethods = emberA();
+ var typesToSend;
typesToSend = modelTypes.map(function(type) {
var klass = type.klass;
@@ -4059,7 +4204,8 @@ define("ember-extension-support/data_adapter",
*/
observeModelType: function(type, typesUpdated) {
- var self = this, records = this.getRecords(type);
+ var self = this;
+ var records = this.getRecords(type);
var onChange = function() {
typesUpdated([self.wrapModelType(type)]);
@@ -4099,8 +4245,9 @@ define("ember-extension-support/data_adapter",
release: {Function} The function to remove observers
*/
wrapModelType: function(type, name) {
- var release, records = this.getRecords(type),
- typeToSend, self = this;
+ var records = this.getRecords(type);
+ var self = this;
+ var release, typeToSend;
typeToSend = {
name: name || type.toString(),
@@ -4122,8 +4269,9 @@ define("ember-extension-support/data_adapter",
@return {Array} Array of model types
*/
getModelTypes: function() {
- var types, self = this,
- containerDebugAdapter = this.get('containerDebugAdapter');
+ var self = this;
+ var containerDebugAdapter = this.get('containerDebugAdapter');
+ var types;
if (containerDebugAdapter.canCatalogEntriesByType('model')) {
types = containerDebugAdapter.catalogEntriesByType('model');
@@ -4154,9 +4302,9 @@ define("ember-extension-support/data_adapter",
@return {Array} Array of model type strings
*/
_getObjectsOnNamespaces: function() {
- var namespaces = emberA(Namespace.NAMESPACES),
- types = emberA(),
- self = this;
+ var namespaces = emberA(Namespace.NAMESPACES);
+ var types = emberA();
+ var self = this;
namespaces.forEach(function(namespace) {
for (var key in namespace) {
@@ -4199,7 +4347,9 @@ define("ember-extension-support/data_adapter",
searchKeywords: {Array}
*/
wrapRecord: function(record) {
- var recordToSend = { object: record }, columnValues = {}, self = this;
+ var recordToSend = { object: record };
+ var columnValues = {};
+ var self = this;
recordToSend.columnValues = this.getRecordColumnValues(record);
recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4272,17 +4422,21 @@ define("ember-extension-support/data_adapter",
}
});
});
-define("ember-extension-support/initializers",
+enifed("ember-extension-support/initializers",
[],
function() {
"use strict";
});
-define("ember-handlebars-compiler",
+enifed("ember-handlebars-compiler",
["ember-metal/core","exports"],
function(__dependency1__, __exports__) {
- "use strict";
- /* global Handlebars:true */
+ /* global Handlebars:true */
+
+ // Remove "use strict"; from transpiled module (in browser builds only) until
+ // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+ //
+ // REMOVE_USE_STRICT: true
/**
@module ember
@@ -4307,8 +4461,8 @@ define("ember-handlebars-compiler",
// ES6Todo: when ember-debug is es6'ed import this.
// var emberAssert = Ember.assert;
var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
- if (!Handlebars && typeof require === 'function') {
- Handlebars = require('handlebars');
+ if (!Handlebars && typeof eriuqer === 'function') {
+ Handlebars = eriuqer('handlebars');
}
@@ -4370,7 +4524,7 @@ define("ember-handlebars-compiler",
Which is functionally equivalent to:
```handlebars
- {{view App.CalendarView}}
+ {{view 'calendar'}}
```
Options in the helper will be passed to the view in exactly the same
@@ -4481,14 +4635,14 @@ define("ember-handlebars-compiler",
// This can go away once the following is closed:
// https://github.com/wycats/handlebars.js/issues/634
- var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
- BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
- INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+ var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/;
+ var BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/;
+ var INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
- var helperInvocation = source[source.length - 1],
- helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
- matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+ var helperInvocation = source[source.length - 1];
+ var helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1];
+ var matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
};
@@ -4541,12 +4695,12 @@ define("ember-handlebars-compiler",
@method precompile
@for Ember.Handlebars
@static
- @param {String} string The template to precompile
+ @param {String|Object} value The template to precompile or an Handlebars AST
@param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
compiled template should be returned as an Object or a String
*/
- EmberHandlebars.precompile = function(string, asObject) {
- var ast = Handlebars.parse(string);
+ EmberHandlebars.precompile = function(value, asObject) {
+ var ast = Handlebars.parse(value);
var options = {
knownHelpers: {
@@ -4595,7 +4749,7 @@ define("ember-handlebars-compiler",
__exports__["default"] = EmberHandlebars;
});
-define("ember-handlebars",
+enifed("ember-handlebars",
["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
"use strict";
@@ -4746,7 +4900,7 @@ define("ember-handlebars",
__exports__["default"] = EmberHandlebars;
});
-define("ember-handlebars/component_lookup",
+enifed("ember-handlebars/component_lookup",
["ember-runtime/system/object","exports"],
function(__dependency1__, __exports__) {
"use strict";
@@ -4757,9 +4911,9 @@ define("ember-handlebars/component_lookup",
container = container || this.container;
- var fullName = 'component:' + name,
- templateFullName = 'template:components/' + name,
- templateRegistered = container && container.has(templateFullName);
+ var fullName = 'component:' + name;
+ var templateFullName = 'template:components/' + name;
+ var templateRegistered = container && container.has(templateFullName);
if (templateRegistered) {
container.injection(fullName, 'layout', templateFullName);
@@ -4781,7 +4935,7 @@ define("ember-handlebars/component_lookup",
__exports__["default"] = ComponentLookup;
});
-define("ember-handlebars/controls",
+enifed("ember-handlebars/controls",
["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","ember-handlebars/ext","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
"use strict";
@@ -4872,7 +5026,7 @@ define("ember-handlebars/controls",
The helper can send multiple actions based on user events.
- The action property defines the action which is send when
+ The action property defines the action which is sent when
the user presses the return key.
```handlebars
@@ -4888,6 +5042,7 @@ define("ember-handlebars/controls",
* `focus-out`
* `key-press`
+
For example, if you desire an action to be sent when the input is blurred,
you only need to setup the action name to the event name property.
@@ -4986,10 +5141,10 @@ define("ember-handlebars/controls",
*/
function inputHelper(options) {
- var hash = options.hash,
- types = options.hashTypes,
- inputType = _resolveOption(this, options, 'type'),
- onEvent = hash.on;
+ var hash = options.hash;
+ var types = options.hashTypes;
+ var inputType = _resolveOption(this, options, 'type');
+ var onEvent = hash.on;
if (inputType === 'checkbox') {
delete hash.type;
@@ -5168,7 +5323,7 @@ define("ember-handlebars/controls",
Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
arguments from the helper to `Ember.TextArea`'s `create` method. You can
extend the capabilities of text areas in your application by reopening this
- class. For example, if you are building a Bootstrap project where `data-*`
+ class. For example, if you are building a Bootstrap project where `data-*`
attributes are used, you can globally add support for a `data-*` attribute
on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
`Ember.TextSupport` and adding it to the `attributeBindings` concatenated
@@ -5192,15 +5347,15 @@ define("ember-handlebars/controls",
*/
function textareaHelper(options) {
- var hash = options.hash,
- types = options.hashTypes;
+ var hash = options.hash;
+ var types = options.hashTypes;
return helpers.view.call(this, TextArea, options);
}
__exports__.textareaHelper = textareaHelper;
});
-define("ember-handlebars/controls/checkbox",
+enifed("ember-handlebars/controls/checkbox",
["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
"use strict";
@@ -5276,7 +5431,7 @@ define("ember-handlebars/controls/checkbox",
}
});
});
-define("ember-handlebars/controls/select",
+enifed("ember-handlebars/controls/select",
["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
"use strict";
@@ -5324,8 +5479,8 @@ define("ember-handlebars/controls/select",
},
selected: computed(function() {
- var content = get(this, 'content'),
- selection = get(this, 'parentView.selection');
+ var content = get(this, 'content');
+ var selection = get(this, 'parentView.selection');
if (get(this, 'parentView.multiple')) {
return selection && indexOf(selection, content.valueOf()) > -1;
} else {
@@ -5395,7 +5550,7 @@ define("ember-handlebars/controls/select",
```
```handlebars
- {{view Ember.Select content=names}}
+ {{view "select" content=names}}
```
Would result in the following HTML:
@@ -5418,10 +5573,7 @@ define("ember-handlebars/controls/select",
```
```handlebars
- {{view Ember.Select
- content=names
- value=selectedName
- }}
+ {{view "select" content=names value=selectedName}}
```
Would result in the following HTML with the `');
- canSet = el.options.length === 1;
- }
-
- innerHTMLTags[tagName] = canSet;
-
- return canSet;
- };
-
- function setInnerHTML(element, html) {
- var tagName = element.tagName;
-
- if (canSetInnerHTML(tagName)) {
- setInnerHTMLWithoutFix(element, html);
- } else {
- // Firefox versions < 11 do not have support for element.outerHTML.
- var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
-
- var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
- endTag = '';
-
- var wrapper = document.createElement('div');
- setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
- element = wrapper.firstChild;
- while (element.tagName !== tagName) {
- element = element.nextSibling;
- }
- }
-
- return element;
- }
-
- __exports__.setInnerHTML = setInnerHTML;function isSimpleClick(event) {
- var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
- secondaryClick = event.which > 1; // IE9 may return undefined
+ function isSimpleClick(event) {
+ var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
+ var secondaryClick = event.which > 1; // IE9 may return undefined
return !modifier && !secondaryClick;
}
__exports__.isSimpleClick = isSimpleClick;
});
-define("ember-views/views/collection_view",
- ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+enifed("ember-views/views/collection_view",
+ ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-handlebars/ext","ember-runtime/mixins/array","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
"use strict";
/**
@@ -36373,7 +37912,8 @@ define("ember-views/views/collection_view",
var View = __dependency10__["default"];
var observer = __dependency11__.observer;
var beforeObserver = __dependency11__.beforeObserver;
- var EmberArray = __dependency12__["default"];
+ var handlebarsGetView = __dependency12__.handlebarsGetView;
+ var EmberArray = __dependency13__["default"];
/**
`Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -36396,27 +37936,32 @@ define("ember-views/views/collection_view",
The view for each item in the collection will have its `content` property set
to the item.
- ## Specifying itemViewClass
+ ## Specifying `itemViewClass`
By default the view class for each item in the managed collection will be an
instance of `Ember.View`. You can supply a different class by setting the
`CollectionView`'s `itemViewClass` property.
- Given an empty `` and the following code:
+ Given the following application code:
```javascript
- someItemsView = Ember.CollectionView.create({
+ var App = Ember.Application.create();
+ App.ItemListView = Ember.CollectionView.extend({
classNames: ['a-collection'],
content: ['A','B','C'],
itemViewClass: Ember.View.extend({
template: Ember.Handlebars.compile("the letter: {{view.content}}")
})
});
-
- someItemsView.appendTo('body');
```
- Will result in the following HTML structure
+ And a simple application template:
+
+ ```handlebars
+ {{view 'item-list'}}
+ ```
+
+ The following HTML will result:
```html
@@ -36432,21 +37977,26 @@ define("ember-views/views/collection_view",
"ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
in the item views receiving an appropriately matched `tagName` property.
- Given an empty `` and the following code:
+ Given the following application code:
```javascript
- anUnorderedListView = Ember.CollectionView.create({
+ var App = Ember.Application.create();
+ App.UnorderedListView = Ember.CollectionView.create({
tagName: 'ul',
content: ['A','B','C'],
itemViewClass: Ember.View.extend({
template: Ember.Handlebars.compile("the letter: {{view.content}}")
})
});
-
- anUnorderedListView.appendTo('body');
```
- Will result in the following HTML structure
+ And a simple application template:
+
+ ```handlebars
+ {{view 'unordered-list-view'}}
+ ```
+
+ The following HTML will result:
```html
@@ -36457,7 +38007,7 @@ define("ember-views/views/collection_view",
```
Additional `tagName` pairs can be provided by adding to
- `Ember.CollectionView.CONTAINER_MAP `
+ `Ember.CollectionView.CONTAINER_MAP`. For example:
```javascript
Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
@@ -36470,7 +38020,7 @@ define("ember-views/views/collection_view",
`createChildView` method can be overidden:
```javascript
- CustomCollectionView = Ember.CollectionView.extend({
+ App.CustomCollectionView = Ember.CollectionView.extend({
createChildView: function(viewClass, attrs) {
if (attrs.content.kind == 'album') {
viewClass = App.AlbumView;
@@ -36490,18 +38040,23 @@ define("ember-views/views/collection_view",
will be the `CollectionView`s only child.
```javascript
- aListWithNothing = Ember.CollectionView.create({
- classNames: ['nothing']
+ var App = Ember.Application.create();
+ App.ListWithNothing = Ember.CollectionView.create({
+ classNames: ['nothing'],
content: null,
emptyView: Ember.View.extend({
template: Ember.Handlebars.compile("The collection is empty")
})
});
-
- aListWithNothing.appendTo('body');
```
- Will result in the following HTML structure
+ And a simple application template:
+
+ ```handlebars
+ {{view 'list-with-nothing'}}
+ ```
+
+ The following HTML will result:
```html
@@ -36658,18 +38213,8 @@ define("ember-views/views/collection_view",
// Loop through child views that correspond with the removed items.
// Note that we loop from the end of the array to the beginning because
// we are mutating it as we go.
- var childViews = this._childViews, childView, idx, len;
-
- len = this._childViews.length;
-
- var removingAll = removedCount === len;
-
- if (removingAll) {
- this.currentState.empty(this);
- this.invokeRecursively(function(view) {
- view.removedFromDOM = true;
- }, false);
- }
+ var childViews = this._childViews;
+ var childView, idx;
for (idx = start + removedCount - 1; idx >= start; idx--) {
childView = childViews[idx];
@@ -36692,19 +38237,15 @@ define("ember-views/views/collection_view",
@param {Number} added number of object added to content
*/
arrayDidChange: function(content, start, removed, added) {
- var addedViews = [], view, item, idx, len, itemViewClass,
- emptyView;
+ var addedViews = [];
+ var view, item, idx, len, itemViewClass, emptyView;
len = content ? get(content, 'length') : 0;
if (len) {
itemViewClass = get(this, 'itemViewClass');
+ itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
- if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
- itemViewClass = get(itemViewClass) || itemViewClass;
- }
-
-
for (idx = start; idx < start+added; idx++) {
item = content.objectAt(idx);
@@ -36788,7 +38329,7 @@ define("ember-views/views/collection_view",
__exports__["default"] = CollectionView;
});
-define("ember-views/views/component",
+enifed("ember-views/views/component",
["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -36938,8 +38479,8 @@ define("ember-views/views/component",
template: computed(function(key, value) {
if (value !== undefined) { return value; }
- var templateName = get(this, 'templateName'),
- template = this.templateForName(templateName, 'template');
+ var templateName = get(this, 'templateName');
+ var template = this.templateForName(templateName, 'template');
return template || get(this, 'defaultTemplate');
@@ -36963,9 +38504,9 @@ define("ember-views/views/component",
},
_yield: function(context, options) {
- var view = options.data.view,
- parentView = this._parentView,
- template = get(this, 'template');
+ var view = options.data.view;
+ var parentView = this._parentView;
+ var template = get(this, 'template');
if (template) {
@@ -37075,8 +38616,8 @@ define("ember-views/views/component",
@param [context] {*} a context to send with the action
*/
sendAction: function(action) {
- var actionName,
- contexts = a_slice.call(arguments, 1);
+ var actionName;
+ var contexts = a_slice.call(arguments, 1);
// Send the default action
if (action === undefined) {
@@ -37097,9 +38638,9 @@ define("ember-views/views/component",
__exports__["default"] = Component;
});
-define("ember-views/views/container_view",
- ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+enifed("ember-views/views/container_view",
+ ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
"use strict";
var Ember = __dependency1__["default"];
// Ember.assert, Ember.K
@@ -37110,22 +38651,21 @@ define("ember-views/views/container_view",
var set = __dependency5__.set;
var View = __dependency6__["default"];
- var ViewCollection = __dependency7__["default"];
- var cloneStates = __dependency8__.cloneStates;
- var EmberViewStates = __dependency8__.states;
+ var cloneStates = __dependency7__.cloneStates;
+ var EmberViewStates = __dependency7__.states;
- var EmberError = __dependency9__["default"];
+ var EmberError = __dependency8__["default"];
- var forEach = __dependency10__.forEach;
+ var forEach = __dependency9__.forEach;
- var computed = __dependency11__.computed;
- var run = __dependency12__["default"];
- var defineProperty = __dependency13__.defineProperty;
- var renderBuffer = __dependency14__["default"];
- var observer = __dependency15__.observer;
- var beforeObserver = __dependency15__.beforeObserver;
- var emberA = __dependency16__.A;
+ var computed = __dependency10__.computed;
+ var run = __dependency11__["default"];
+ var defineProperty = __dependency12__.defineProperty;
+ var renderBuffer = __dependency13__["default"];
+ var observer = __dependency14__.observer;
+ var beforeObserver = __dependency14__.beforeObserver;
+ var emberA = __dependency15__.A;
/**
@module ember
@@ -37285,6 +38825,7 @@ define("ember-views/views/container_view",
@extends Ember.View
*/
var ContainerView = View.extend(MutableArray, {
+ isContainer: true,
_states: states,
willWatchProperty: function(prop){
@@ -37358,9 +38899,6 @@ define("ember-views/views/container_view",
@param {Ember.RenderBuffer} buffer the buffer to render to
*/
render: function(buffer) {
- this.forEachChildView(function(view) {
- view.renderToBuffer(buffer);
- });
},
instrumentName: 'container',
@@ -37478,69 +39016,40 @@ define("ember-views/views/container_view",
},
ensureChildrenAreInDOM: function(view) {
- var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+ var childViews = view._childViews;
+ var renderer = view._renderer;
+ var i, len, childView;
for (i = 0, len = childViews.length; i < len; i++) {
childView = childViews[i];
-
- if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
-
- if (childView.renderToBufferIfNeeded(buffer)) {
- viewCollection.push(childView);
- } else if (viewCollection.length) {
- insertViewCollection(view, viewCollection, previous, buffer);
- buffer = null;
- previous = childView;
- viewCollection.clear();
- } else {
- previous = childView;
+ if (!childView._elementCreated) {
+ renderer.renderTree(childView, view, i);
}
}
-
- if (viewCollection.length) {
- insertViewCollection(view, viewCollection, previous, buffer);
- }
}
});
- function insertViewCollection(view, viewCollection, previous, buffer) {
- viewCollection.triggerRecursively('willInsertElement');
-
- if (previous) {
- previous.domManager.after(previous, buffer.string());
- } else {
- view.domManager.prepend(view, buffer.string());
- }
-
- viewCollection.forEach(function(v) {
- v._transitionTo('inDOM');
- v.propertyDidChange('element');
- v.triggerRecursively('didInsertElement');
- });
- }
-
-
__exports__["default"] = ContainerView;
});
-define("ember-views/views/core_view",
- ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+enifed("ember-views/views/core_view",
+ ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
"use strict";
- var cloneStates = __dependency1__.cloneStates;
- var states = __dependency1__.states;
- var EmberObject = __dependency2__["default"];
- var Evented = __dependency3__["default"];
- var ActionHandler = __dependency4__["default"];
+ var Rerender = __dependency1__["default"];
- var get = __dependency5__.get;
- var computed = __dependency6__.computed;
+ var cloneStates = __dependency2__.cloneStates;
+ var states = __dependency2__.states;
+ var EmberObject = __dependency3__["default"];
+ var Evented = __dependency4__["default"];
+ var ActionHandler = __dependency5__["default"];
- var typeOf = __dependency7__.typeOf;
+ var get = __dependency6__.get;
+ var set = __dependency7__.set;
+ var computed = __dependency8__.computed;
- var instrument = __dependency8__.instrument;
+ var typeOf = __dependency9__.typeOf;
-
- var renderBuffer = __dependency9__["default"];
+ var instrument = __dependency10__.instrument;
/**
`Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -37559,6 +39068,8 @@ define("ember-views/views/core_view",
*/
var CoreView = EmberObject.extend(Evented, ActionHandler, {
isView: true,
+ isVirtual: false,
+ isContainer: false,
_states: cloneStates(states),
@@ -37604,55 +39115,6 @@ define("ember-views/views/core_view",
hash.view = this;
},
- /**
- Invoked by the view system when this view needs to produce an HTML
- representation. This method will create a new render buffer, if needed,
- then apply any default attributes, such as class names and visibility.
- Finally, the `render()` method is invoked, which is responsible for
- doing the bulk of the rendering.
-
- You should not need to override this method; instead, implement the
- `template` property, or if you need more control, override the `render`
- method.
-
- @method renderToBuffer
- @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
- passed, a default buffer, using the current view's `tagName`, will
- be used.
- @private
- */
- renderToBuffer: function(buffer) {
- var name = 'render.' + this.instrumentName,
- details = {};
-
- this.instrumentDetails(details);
-
- return instrument(name, details, function instrumentRenderToBuffer() {
- return this._renderToBuffer(buffer);
- }, this);
- },
-
- _renderToBuffer: function(_buffer) {
- // If this is the top-most view, start a new buffer. Otherwise,
- // create a new buffer relative to the original using the
- // provided buffer operation (for example, `insertAfter` will
- // insert a new buffer after the "parent buffer").
- var tagName = this.tagName;
-
- if (tagName === null || tagName === undefined) {
- tagName = 'div';
- }
-
- var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
- this._transitionTo('inBuffer', false);
-
- this.beforeRender(buffer);
- this.render(buffer);
- this.afterRender(buffer);
-
- return buffer;
- },
-
/**
Override the default event firing from `Ember.Evented` to
also call methods with the given name.
@@ -37675,16 +39137,6 @@ define("ember-views/views/core_view",
}
},
- deprecatedSendHandles: function(actionName) {
- return !!this[actionName];
- },
-
- deprecatedSend: function(actionName) {
- var args = [].slice.call(arguments, 1);
- this[actionName].apply(this, args);
- return;
- },
-
has: function(name) {
return typeOf(this[name]) === 'function' || this._super(name);
},
@@ -37694,9 +39146,12 @@ define("ember-views/views/core_view",
if (!this._super()) { return; }
+
// destroy the element -- this will avoid each child view destroying
// the element over and over again...
- if (!this.removedFromDOM) { this.destroyElement(); }
+ if (!this.removedFromDOM && this._renderer) {
+ this._renderer.remove(this, true);
+ }
// remove from parent if found. Don't call removeFromParent,
// as removeFromParent will try to remove the element from
@@ -37709,15 +39164,17 @@ define("ember-views/views/core_view",
},
clearRenderedChildren: Ember.K,
- triggerRecursively: Ember.K,
- invokeRecursively: Ember.K,
_transitionTo: Ember.K,
destroyElement: Ember.K
});
+ CoreView.reopenClass({
+ renderer: new Rerender()
+ });
+
__exports__["default"] = CoreView;
});
-define("ember-views/views/states",
+enifed("ember-views/views/states",
["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -37758,7 +39215,7 @@ define("ember-views/views/states",
};
__exports__.states = states;
});
-define("ember-views/views/states/default",
+enifed("ember-views/views/states/default",
["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -37793,23 +39250,16 @@ define("ember-views/views/states/default",
},
destroyElement: function(view) {
- set(view, 'element', null);
- if (view._scheduledInsert) {
- run.cancel(view._scheduledInsert);
- view._scheduledInsert = null;
- }
+ if (view._renderer)
+ view._renderer.remove(view, false);
return view;
},
- renderToBufferIfNeeded: function () {
- return false;
- },
-
rerender: Ember.K,
invokeObserver: Ember.K
};
});
-define("ember-views/views/states/destroying",
+enifed("ember-views/views/states/destroying",
["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -37836,27 +39286,12 @@ define("ember-views/views/states/destroying",
},
destroyElement: function() {
throw new EmberError(fmt(destroyingError, ['destroyElement']));
- },
- empty: function() {
- throw new EmberError(fmt(destroyingError, ['empty']));
- },
-
- setElement: function() {
- throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
- },
-
- renderToBufferIfNeeded: function() {
- return false;
- },
-
- // Since element insertion is scheduled, don't do anything if
- // the view has been destroyed between scheduling and execution
- insertElement: Ember.K
+ }
});
__exports__["default"] = destroying;
});
-define("ember-views/views/states/has_element",
+enifed("ember-views/views/states/has_element",
["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
"use strict";
@@ -37879,7 +39314,7 @@ define("ember-views/views/states/has_element",
merge(hasElement, {
$: function(view, sel) {
- var elem = get(view, 'element');
+ var elem = view.get('concreteView').element;
return sel ? jQuery(sel, elem) : jQuery(elem);
},
@@ -37890,25 +39325,17 @@ define("ember-views/views/states/has_element",
return jQuery("#" + get(view, 'elementId'))[0];
},
- setElement: function(view, value) {
- if (value === null) {
- view._transitionTo('preRender');
- } else {
- throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
- }
-
- return value;
- },
-
// once the view has been inserted into the DOM, rerendering is
// deferred to allow bindings to synchronize.
rerender: function(view) {
- view.triggerRecursively('willClearRender');
-
- view.clearRenderedChildren();
-
- view.domManager.replace(view);
- return view;
+ if (view._root._morph && !view._elementInserted) {
+ throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+ }
+ // TODO: should be scheduled with renderer
+ run.scheduleOnce('render', function () {
+ if (view.isDestroying) return;
+ view._renderer.renderTree(view, view._parentView);
+ });
},
// once the view is already in the DOM, destroying it removes it
@@ -37916,27 +39343,10 @@ define("ember-views/views/states/has_element",
// preRender state if inDOM.
destroyElement: function(view) {
- view._notifyWillDestroyElement();
- view.domManager.remove(view);
- set(view, 'element', null);
- if (view._scheduledInsert) {
- run.cancel(view._scheduledInsert);
- view._scheduledInsert = null;
- }
+ view._renderer.remove(view, false);
return view;
},
- empty: function(view) {
- var _childViews = view._childViews, len, idx;
- if (_childViews) {
- len = _childViews.length;
- for (idx = 0; idx < len; idx++) {
- _childViews[idx]._notifyWillDestroyElement();
- }
- }
- view.domManager.empty(view);
- },
-
// Handle events from `Ember.EventDispatcher`
handleEvent: function(view, eventName, evt) {
if (view.has(eventName)) {
@@ -37955,7 +39365,7 @@ define("ember-views/views/states/has_element",
__exports__["default"] = hasElement;
});
-define("ember-views/views/states/in_buffer",
+enifed("ember-views/views/states/in_buffer",
["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -37994,54 +39404,22 @@ define("ember-views/views/states/in_buffer",
// view will render that view and append the resulting
// buffer into its buffer.
appendChild: function(view, childView, options) {
- var buffer = view.buffer, _childViews = view._childViews;
+ var buffer = view.buffer;
+ var _childViews = view._childViews;
childView = view.createChildView(childView, options);
if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
_childViews.push(childView);
- childView.renderToBuffer(buffer);
+ if (!childView._morph) {
+ buffer.pushChildView(childView);
+ }
view.propertyDidChange('childViews');
return childView;
},
- // when a view is rendered in a buffer, destroying the
- // element will simply destroy the buffer and put the
- // state back into the preRender state.
- destroyElement: function(view) {
- view.clearBuffer();
- var viewCollection = view._notifyWillDestroyElement();
- viewCollection.transitionTo('preRender', false);
-
- return view;
- },
-
- empty: function() {
- },
-
- renderToBufferIfNeeded: function (view, buffer) {
- return false;
- },
-
- // It should be impossible for a rendered view to be scheduled for
- // insertion.
- insertElement: function() {
- throw new EmberError("You can't insert an element that has already been rendered");
- },
-
- setElement: function(view, value) {
- if (value === null) {
- view._transitionTo('preRender');
- } else {
- view.clearBuffer();
- view._transitionTo('hasElement');
- }
-
- return value;
- },
-
invokeObserver: function(target, observer) {
observer.call(target);
}
@@ -38049,7 +39427,7 @@ define("ember-views/views/states/in_buffer",
__exports__["default"] = inBuffer;
});
-define("ember-views/views/states/in_dom",
+enifed("ember-views/views/states/in_dom",
["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
"use strict";
@@ -38088,21 +39466,15 @@ define("ember-views/views/states/in_dom",
if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
if (!this.isVirtual) delete View.views[view.elementId];
- },
-
- insertElement: function(view, fn) {
- throw new EmberError("You can't insert an element into the DOM that has already been inserted");
}
});
__exports__["default"] = inDOM;
});
-define("ember-views/views/states/pre_render",
+enifed("ember-views/views/states/pre_render",
["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
"use strict";
- /* global Node */
-
var _default = __dependency1__["default"];
var create = __dependency2__.create;
var merge = __dependency3__["default"];
@@ -38114,44 +39486,10 @@ define("ember-views/views/states/pre_render",
*/
var preRender = create(_default);
- merge(preRender, {
- // a view leaves the preRender state once its element has been
- // created (createElement).
- insertElement: function(view, fn) {
- view.createElement();
- var viewCollection = view.viewHierarchyCollection();
-
- viewCollection.trigger('willInsertElement');
-
- fn.call(view);
-
- // We transition to `inDOM` if the element exists in the DOM
- var element = view.get('element');
- if (jQuery.contains(document.body, element)) {
- viewCollection.transitionTo('inDOM', false);
- viewCollection.trigger('didInsertElement');
- }
- },
-
- renderToBufferIfNeeded: function(view, buffer) {
- view.renderToBuffer(buffer);
- return true;
- },
-
- empty: Ember.K,
-
- setElement: function(view, value) {
- if (value !== null) {
- view._transitionTo('hasElement');
- }
- return value;
- }
- });
-
__exports__["default"] = preRender;
});
-define("ember-views/views/view",
- ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
+enifed("ember-views/views/view",
+ ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
"use strict";
// Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -38181,47 +39519,36 @@ define("ember-views/views/view",
var isArray = __dependency11__.isArray;
var isNone = __dependency14__.isNone;
var Mixin = __dependency13__.Mixin;
- var deprecateProperty = __dependency10__.deprecateProperty;
- var emberA = __dependency15__.A;
+ var deprecateProperty = __dependency15__.deprecateProperty;
+ var emberA = __dependency16__.A;
- var dasherize = __dependency16__.dasherize;
+ var dasherize = __dependency17__.dasherize;
// ES6TODO: functions on EnumerableUtils should get their own export
- var forEach = __dependency17__.forEach;
- var addObject = __dependency17__.addObject;
- var removeObject = __dependency17__.removeObject;
+ var forEach = __dependency18__.forEach;
+ var addObject = __dependency18__.addObject;
+ var removeObject = __dependency18__.removeObject;
var beforeObserver = __dependency13__.beforeObserver;
- var copy = __dependency18__["default"];
- var isGlobalPath = __dependency19__.isGlobalPath;
+ var copy = __dependency19__["default"];
+ var isGlobalPath = __dependency20__.isGlobalPath;
- var propertyWillChange = __dependency20__.propertyWillChange;
- var propertyDidChange = __dependency20__.propertyDidChange;
+ var propertyWillChange = __dependency21__.propertyWillChange;
+ var propertyDidChange = __dependency21__.propertyDidChange;
- var jQuery = __dependency21__["default"];
+ var jQuery = __dependency22__["default"];
// for the side effect of extending Ember.run.queues
- var CoreView = __dependency23__["default"];
- var ViewCollection = __dependency24__["default"];
+ var CoreView = __dependency24__["default"];
/**
@module ember
@submodule ember-views
*/
-
- var ContainerView;
-
- function nullViewsBuffer(view) {
- view.buffer = null;
-
- }
-
- function clearCachedElement(view) {
- meta(view).cache.element = undefined;
- }
-
var childViewsProperty = computed(function() {
- var childViews = this._childViews, ret = emberA(), view = this;
+ var childViews = this._childViews;
+ var ret = emberA();
+ var view = this;
forEach(childViews, function(view) {
var currentChildViews;
@@ -38235,11 +39562,6 @@ define("ember-views/views/view",
});
ret.replace = function (idx, removedCount, addedViews) {
- if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
-
- if (view instanceof ContainerView) {
- return view.replace(idx, removedCount, addedViews);
- }
throw new EmberError("childViews is immutable");
};
@@ -38757,8 +40079,9 @@ define("ember-views/views/view",
on the descendent.
```javascript
- OuterView = Ember.View.extend({
- template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+ var App = Ember.Application.create();
+ App.OuterView = Ember.View.extend({
+ template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
eventManager: Ember.Object.create({
mouseEnter: function(event, view) {
// view might be instance of either
@@ -38768,7 +40091,7 @@ define("ember-views/views/view",
})
});
- InnerView = Ember.View.extend({
+ App.InnerView = Ember.View.extend({
click: function(event) {
// will be called if rendered inside
// an OuterView because OuterView's
@@ -38912,8 +40235,8 @@ define("ember-views/views/view",
template: computed('templateName', function(key, value) {
if (value !== undefined) { return value; }
- var templateName = get(this, 'templateName'),
- template = this.templateForName(templateName, 'template');
+ var templateName = get(this, 'templateName');
+ var template = this.templateForName(templateName, 'template');
return template || get(this, 'defaultTemplate');
@@ -38946,8 +40269,8 @@ define("ember-views/views/view",
@type Function
*/
layout: computed(function(key) {
- var layoutName = get(this, 'layoutName'),
- layout = this.templateForName(layoutName, 'layout');
+ var layoutName = get(this, 'layoutName');
+ var layout = this.templateForName(layoutName, 'layout');
return layout || get(this, 'defaultLayout');
@@ -39103,8 +40426,8 @@ define("ember-views/views/view",
@return Ember.View
*/
nearestOfType: function(klass) {
- var view = get(this, 'parentView'),
- isOfType = klass instanceof Mixin ?
+ var view = get(this, 'parentView');
+ var isOfType = klass instanceof Mixin ?
function(view) { return klass.detect(view); } :
function(view) { return klass.detect(view.constructor); };
@@ -39249,21 +40572,6 @@ define("ember-views/views/view",
return this.currentState.rerender(this);
},
- clearRenderedChildren: function() {
- var lengthBefore = this.lengthBeforeRender,
- lengthAfter = this.lengthAfterRender;
-
- // If there were child views created during the last call to render(),
- // remove them under the assumption that they will be re-created when
- // we re-render.
-
- // VIEW-TODO: Unit test this path.
- var childViews = this._childViews;
- for (var i=lengthAfter-1; i>=lengthBefore; i--) {
- if (childViews[i]) { childViews[i].destroy(); }
- }
- },
-
/**
Iterates over the view's `classNameBindings` array, inserts the value
of the specified property into the `classNames` array, then creates an
@@ -39274,8 +40582,8 @@ define("ember-views/views/view",
@private
*/
_applyClassNameBindings: function(classBindings) {
- var classNames = this.classNames,
- elem, newClass, dasherizedClass;
+ var classNames = this.classNames;
+ var elem, newClass, dasherizedClass;
// Loop through all of the configured bindings. These will be either
// property names ('isUrgent') or property paths relative to the view
@@ -39353,14 +40661,15 @@ define("ember-views/views/view",
@private
*/
_applyAttributeBindings: function(buffer, attributeBindings) {
- var attributeValue,
- unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+ var attributeValue;
+ var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
forEach(attributeBindings, function(binding) {
- var split = binding.split(':'),
- property = split[0],
- attributeName = split[1] || property;
+ var split = binding.split(':');
+ var property = split[0];
+ var attributeName = split[1] || property;
+
if (property in this) {
this._setupAttributeBindingObservation(property, attributeName);
@@ -39449,13 +40758,7 @@ define("ember-views/views/view",
@property element
@type DOMElement
*/
- element: computed('_parentView', function(key, value) {
- if (value !== undefined) {
- return this.currentState.setElement(this, value);
- } else {
- return this.currentState.getElement(this);
- }
- }),
+ element: null,
/**
Returns a jQuery object for this view's element. If you pass in a selector
@@ -39474,9 +40777,9 @@ define("ember-views/views/view",
},
mutateChildViews: function(callback) {
- var childViews = this._childViews,
- idx = childViews.length,
- view;
+ var childViews = this._childViews;
+ var idx = childViews.length;
+ var view;
while(--idx >= 0) {
view = childViews[idx];
@@ -39491,8 +40794,8 @@ define("ember-views/views/view",
if (!childViews) { return this; }
- var len = childViews.length,
- view, idx;
+ var len = childViews.length;
+ var view, idx;
for (idx = 0; idx < len; idx++) {
view = childViews[idx];
@@ -39522,12 +40825,11 @@ define("ember-views/views/view",
@param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
@return {Ember.View} receiver
*/
- appendTo: function(target) {
- // Schedule the DOM element to be created and appended to the given
- // element after bindings have synchronized.
- this._insertElementLater(function() {
- this.$().appendTo(target);
- });
+ appendTo: function(selector) {
+ var target = jQuery(selector);
+
+
+ this.constructor.renderer.appendTo(this, target[0]);
return this;
},
@@ -39545,47 +40847,15 @@ define("ember-views/views/view",
@param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
@return {Ember.View} received
*/
- replaceIn: function(target) {
+ replaceIn: function(selector) {
+ var target = jQuery(selector);
+
- this._insertElementLater(function() {
- jQuery(target).empty();
- this.$().appendTo(target);
- });
+ this.constructor.renderer.replaceIn(this, target[0]);
return this;
},
- /**
- Schedules a DOM operation to occur during the next render phase. This
- ensures that all bindings have finished synchronizing before the view is
- rendered.
-
- To use, pass a function that performs a DOM operation.
-
- Before your function is called, this view and all child views will receive
- the `willInsertElement` event. After your function is invoked, this view
- and all of its child views will receive the `didInsertElement` event.
-
- ```javascript
- view._insertElementLater(function() {
- this.createElement();
- this.$().appendTo('body');
- });
- ```
-
- @method _insertElementLater
- @param {Function} fn the function that inserts the element into the DOM
- @private
- */
- _insertElementLater: function(fn) {
- this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
- },
-
- _insertElement: function (fn) {
- this._scheduledInsert = null;
- this.currentState.insertElement(this, fn);
- },
-
/**
Appends the view's element to the document body. If the view does
not have an HTML representation yet, `createElement()` will be called
@@ -39619,9 +40889,6 @@ define("ember-views/views/view",
// In the interim, we will just re-render if that happens. It is more
// important than elements get garbage collected.
if (!this.removedFromDOM) { this.destroyElement(); }
- this.invokeRecursively(function(view) {
- if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
- });
},
elementId: null,
@@ -39643,20 +40910,20 @@ define("ember-views/views/view",
},
/**
- Creates a DOM representation of the view and all of its
- child views by recursively calling the `render()` method.
+ Creates a DOM representation of the view and all of its child views by
+ recursively calling the `render()` method.
- After the element has been created, `didInsertElement` will
+ After the element has been inserted into the DOM, `didInsertElement` will
be called on this view and all of its child views.
@method createElement
@return {Ember.View} receiver
*/
createElement: function() {
- if (get(this, 'element')) { return this; }
+ if (this.element) { return this; }
- var buffer = this.renderToBuffer();
- set(this, 'element', buffer.element());
+ this._didCreateElementWithoutMorph = true;
+ this.constructor.renderer.renderTree(this);
return this;
},
@@ -39673,6 +40940,9 @@ define("ember-views/views/view",
or after the view was re-rendered. Override this function to do any
set up that requires an element in the document body.
+ When a view has children, didInsertElement will be called on the
+ child view(s) first, bubbling upwards through the hierarchy.
+
@event didInsertElement
*/
didInsertElement: Ember.K,
@@ -39686,65 +40956,6 @@ define("ember-views/views/view",
*/
willClearRender: Ember.K,
- /**
- Run this callback on the current view (unless includeSelf is false) and recursively on child views.
-
- @method invokeRecursively
- @param fn {Function}
- @param includeSelf {Boolean} Includes itself if true.
- @private
- */
- invokeRecursively: function(fn, includeSelf) {
- var childViews = (includeSelf === false) ? this._childViews : [this];
- var currentViews, view, currentChildViews;
-
- while (childViews.length) {
- currentViews = childViews.slice();
- childViews = [];
-
- for (var i=0, l=currentViews.length; i
=0; i--) {
- childViews[i].removedFromDOM = true;
- }
-
// remove from non-virtual parent view if viewName was specified
if (viewName && nonVirtualParentView) {
nonVirtualParentView.set(viewName, null);
}
- childLen = childViews.length;
- for (i=childLen-1; i>=0; i--) {
- childViews[i].destroy();
- }
-
return this;
},
@@ -40187,16 +41346,18 @@ define("ember-views/views/view",
_toggleVisibility: function() {
var $el = this.$();
- if (!$el) { return; }
-
var isVisible = get(this, 'isVisible');
if (this._isVisible === isVisible) { return ; }
- $el.toggle(isVisible);
-
+ // It's important to keep these in sync, even if we don't yet have
+ // an element in the DOM to manipulate:
this._isVisible = isVisible;
+ if (!$el) { return; }
+
+ $el.toggle(isVisible);
+
if (this._isAncestorHidden()) { return; }
if (isVisible) {
@@ -40240,28 +41401,16 @@ define("ember-views/views/view",
return false;
},
-
- clearBuffer: function() {
- this.invokeRecursively(nullViewsBuffer);
- },
transitionTo: function(state, children) {
this._transitionTo(state, children);
},
_transitionTo: function(state, children) {
var priorState = this.currentState;
var currentState = this.currentState = this._states[state];
-
this._state = state;
if (priorState && priorState.exit) { priorState.exit(this); }
if (currentState.enter) { currentState.enter(this); }
- if (state === 'inDOM') { meta(this).cache.element = undefined; }
-
- if (children !== false) {
- this.forEachChildView(function(view) {
- view._transitionTo(state);
- });
- }
},
// .......................................................
@@ -40290,13 +41439,13 @@ define("ember-views/views/view",
return;
}
- var view = this,
- stateCheckedObserver = function() {
- view.currentState.invokeObserver(this, observer);
- },
- scheduledObserver = function() {
- run.scheduleOnce('render', this, stateCheckedObserver);
- };
+ var view = this;
+ var stateCheckedObserver = function() {
+ view.currentState.invokeObserver(this, observer);
+ };
+ var scheduledObserver = function() {
+ run.scheduleOnce('render', this, stateCheckedObserver);
+ };
addObserver(root, path, target, scheduledObserver);
@@ -40340,48 +41489,6 @@ define("ember-views/views/view",
run.once(View, 'notifyMutationListeners');
}
- var DOMManager = {
- prepend: function(view, html) {
- view.$().prepend(html);
- notifyMutationListeners();
- },
-
- after: function(view, html) {
- view.$().after(html);
- notifyMutationListeners();
- },
-
- html: function(view, html) {
- view.$().html(html);
- notifyMutationListeners();
- },
-
- replace: function(view) {
- var element = get(view, 'element');
-
- set(view, 'element', null);
-
- view._insertElementLater(function() {
- jQuery(element).replaceWith(get(view, 'element'));
- notifyMutationListeners();
- });
- },
-
- remove: function(view) {
- view.$().remove();
- notifyMutationListeners();
- },
-
- empty: function(view) {
- view.$().empty();
- notifyMutationListeners();
- }
- };
-
- View.reopen({
- domManager: DOMManager
- });
-
View.reopenClass({
/**
@@ -40404,11 +41511,10 @@ define("ember-views/views/view",
@private
*/
_parsePropertyPath: function(path) {
- var split = path.split(':'),
- propertyPath = split[0],
- classNames = "",
- className,
- falsyClassName;
+ var split = path.split(':');
+ var propertyPath = split[0];
+ var classNames = "";
+ var className, falsyClassName;
// check if the property is defined as prop:class or prop:trueClass:falseClass
if (split.length > 1) {
@@ -40492,7 +41598,7 @@ define("ember-views/views/view",
});
var mutation = EmberObject.extend(Evented).create();
-
+ // TODO MOVE TO RENDERER HOOKS
View.addMutationListener = function(callback) {
mutation.on('change', callback);
};
@@ -40550,82 +41656,11 @@ define("ember-views/views/view",
__exports__["default"] = View;
});
-define("ember-views/views/view_collection",
- ["ember-metal/enumerable_utils","exports"],
- function(__dependency1__, __exports__) {
- "use strict";
- var forEach = __dependency1__.forEach;
-
- function ViewCollection(initialViews) {
- var views = this.views = initialViews || [];
- this.length = views.length;
- }
-
- ViewCollection.prototype = {
- length: 0,
-
- trigger: function(eventName) {
- var views = this.views, view;
- for (var i = 0, l = views.length; i < l; i++) {
- view = views[i];
- if (view.trigger) { view.trigger(eventName); }
- }
- },
-
- triggerRecursively: function(eventName) {
- var views = this.views;
- for (var i = 0, l = views.length; i < l; i++) {
- views[i].triggerRecursively(eventName);
- }
- },
-
- invokeRecursively: function(fn) {
- var views = this.views, view;
-
- for (var i = 0, l = views.length; i < l; i++) {
- view = views[i];
- fn(view);
- }
- },
-
- transitionTo: function(state, children) {
- var views = this.views;
- for (var i = 0, l = views.length; i < l; i++) {
- views[i]._transitionTo(state, children);
- }
- },
-
- push: function() {
- this.length += arguments.length;
- var views = this.views;
- return views.push.apply(views, arguments);
- },
-
- objectAt: function(idx) {
- return this.views[idx];
- },
-
- forEach: function(callback) {
- var views = this.views;
- return forEach(views, callback);
- },
-
- clear: function() {
- this.length = 0;
- this.views.length = 0;
- }
- };
-
- __exports__["default"] = ViewCollection;
- });
-define("ember",
+enifed("ember",
["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
- // Remove "use strict"; from transpiled module until
- // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
- //
- // REMOVE_USE_STRICT: true
-
+ "use strict";
+ /* global navigator */
// require the main entry points for each of these packages
// this is so that the global exports occur properly
@@ -40641,521 +41676,830 @@ define("ember",
@module ember
*/
- function throwWithMessage(msg) {
- return function() {
- throw new Ember.Error(msg);
- };
- }
-
- function generateRemovedClass(className) {
- var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
-
- return {
- extend: throwWithMessage(className + msg),
- create: throwWithMessage(className + msg)
- };
- }
-
- Ember.StateManager = generateRemovedClass("Ember.StateManager");
-
- /**
- This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
- @class StateManager
- @namespace Ember
- */
-
- Ember.State = generateRemovedClass("Ember.State");
-
- /**
- This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
- @class State
- @namespace Ember
- */
- });
-define("metamorph",
- [],
- function() {
+ });
+enifed("morph",
+ ["./morph/morph","./morph/dom-helper","exports"],
+ function(__dependency1__, __dependency2__, __exports__) {
"use strict";
- // ==========================================================================
- // Project: metamorph
- // Copyright: ©2014 Tilde, Inc. All rights reserved.
- // ==========================================================================
+ var Morph = __dependency1__["default"];
+ var Morph;
+ __exports__.Morph = Morph;
+ var DOMHelper = __dependency2__["default"];
+ var DOMHelper;
+ __exports__.DOMHelper = DOMHelper;
+ });
+enifed("morph/dom-helper",
+ ["../morph/morph","./dom-helper/build-html-dom","exports"],
+ function(__dependency1__, __dependency2__, __exports__) {
+ "use strict";
+ var Morph = __dependency1__["default"];
+ var buildHTMLDOM = __dependency2__.buildHTMLDOM;
+ var svgNamespace = __dependency2__.svgNamespace;
+ var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
- var K = function() {},
- guid = 0,
- disableRange = (function(){
- if ('undefined' !== typeof MetamorphENV) {
- return MetamorphENV.DISABLE_RANGE_API;
- } else if ('undefined' !== ENV) {
- return ENV.DISABLE_RANGE_API;
- } else {
- return false;
- }
- })(),
+ var deletesBlankTextNodes = (function(){
+ var element = document.createElement('div');
+ element.appendChild( document.createTextNode('') );
+ var clonedElement = element.cloneNode(true);
+ return clonedElement.childNodes.length === 0;
+ })();
- // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
- supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+ var ignoresCheckedAttribute = (function(){
+ var element = document.createElement('input');
+ element.setAttribute('checked', 'checked');
+ var clonedElement = element.cloneNode(false);
+ return !clonedElement.checked;
+ })();
- // 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 = typeof document !== 'undefined' && (function() {
- var testEl = document.createElement('div');
- testEl.innerHTML = "";
- testEl.firstChild.innerHTML = "";
- return testEl.firstChild.innerHTML === '';
- })(),
+ function isSVG(ns){
+ return ns === svgNamespace;
+ }
-
- // IE 8 (and likely earlier) likes to move whitespace preceeding
- // a script tag to appear after it. This means that we can
- // accidentally remove whitespace when updating a morph.
- movesWhitespace = document && (function() {
- var testEl = document.createElement('div');
- testEl.innerHTML = "Test: Value";
- return testEl.childNodes[0].nodeValue === 'Test:' &&
- testEl.childNodes[2].nodeValue === ' Value';
- })();
-
- // Constructor that supports either Metamorph('foo') or new
- // Metamorph('foo');
- //
- // Takes a string of HTML as the argument.
-
- var Metamorph = function(html) {
- var self;
-
- if (this instanceof Metamorph) {
- self = this;
+ // This is not the namespace of the element, but of
+ // the elements inside that elements.
+ function interiorNamespace(element){
+ if (
+ element &&
+ element.namespaceURI === svgNamespace &&
+ !svgHTMLIntegrationPoints[element.tagName]
+ ) {
+ return svgNamespace;
} else {
- self = new K();
+ return null;
}
+ }
- self.innerHTML = html;
- var myGuid = 'metamorph-'+(guid++);
- self.start = myGuid + '-start';
- self.end = myGuid + '-end';
+ // The HTML spec allows for "omitted start tags". These tags are optional
+ // when their intended child is the first thing in the parent tag. For
+ // example, this is a tbody start tag:
+ //
+ //
+ //
+ //
+ //
+ // The tbody may be omitted, and the browser will accept and render:
+ //
+ //
+ //
+ //
+ // However, the omitted start tag will still be added to the DOM. Here
+ // we test the string and context to see if the browser is about to
+ // perform this cleanup.
+ //
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+ // describes which tags are omittable. The spec for tbody and colgroup
+ // explains this behavior:
+ //
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+ //
- return self;
+ var omittedStartTagChildTest = /<([\w:]+)/;
+ function detectOmittedStartTag(string, contextualElement){
+ // Omitted start tags are only inside table tags.
+ if (contextualElement.tagName === 'TABLE') {
+ var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+ if (omittedStartTagChildMatch) {
+ var omittedStartTagChild = omittedStartTagChildMatch[1];
+ // It is already asserted that the contextual element is a table
+ // and not the proper start tag. Just see if a tag was omitted.
+ return omittedStartTagChild === 'tr' ||
+ omittedStartTagChild === 'col';
+ }
+ }
+ }
+
+ function buildSVGDOM(html, dom){
+ var div = dom.document.createElement('div');
+ div.innerHTML = '';
+ return div.firstChild.childNodes;
+ }
+
+ /*
+ * A class wrapping DOM functions to address environment compatibility,
+ * namespaces, contextual elements for morph un-escaped content
+ * insertion.
+ *
+ * When entering a template, a DOMHelper should be passed:
+ *
+ * template(context, { hooks: hooks, dom: new DOMHelper() });
+ *
+ * TODO: support foreignObject as a passed contextual element. It has
+ * a namespace (svg) that does not match its internal namespace
+ * (xhtml).
+ *
+ * @class DOMHelper
+ * @constructor
+ * @param {HTMLDocument} _document The document DOM methods are proxied to
+ */
+ function DOMHelper(_document){
+ this.document = _document || window.document;
+ this.namespace = null;
+ }
+
+ var prototype = DOMHelper.prototype;
+ prototype.constructor = DOMHelper;
+
+ prototype.insertBefore = function(element, childElement, referenceChild) {
+ return element.insertBefore(childElement, referenceChild);
};
- K.prototype = Metamorph.prototype;
-
- var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
-
- outerHTMLFunc = function() {
- return this.startTag() + this.innerHTML + this.endTag();
+ prototype.appendChild = function(element, childElement) {
+ return element.appendChild(childElement);
};
- startTagFunc = function() {
- /*
- * We replace chevron by its hex code in order to prevent escaping problems.
- * Check this thread for more explaination:
- * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
- */
- return "
| hi |
";
- * div.firstChild.firstChild.tagName //=> ""
- *
- * If our script markers are inside such a node, we need to find that
- * node and use *it* as the marker.
- */
- var realNode = function(start) {
- while (start.parentNode.tagName === "") {
- start = start.parentNode;
- }
-
- return start;
- };
-
- /*
- * When automatically adding a tbody, Internet Explorer inserts the
- * tbody immediately before the first
. Other browsers create it
- * before the first node, no matter what.
- *
- * This means the the following code:
- *
- * div = document.createElement("div");
- * div.innerHTML = "
- *
- * Generates the following DOM in IE:
- *
- * + div
- * + table
- * - script id='first'
- * + tbody
- * + tr
- * + td
- * - "hi"
- * - script id='last'
- *
- * Which means that the two script tags, even though they were
- * inserted at the same point in the hierarchy in the original
- * HTML, now have different parents.
- *
- * This code reparents the first script tag by making it the tbody's
- * first child.
- *
- */
- var fixParentage = function(start, end) {
- if (start.parentNode !== end.parentNode) {
- end.parentNode.insertBefore(start, end.parentNode.firstChild);
- }
- };
-
- htmlFunc = function(html, outerToo) {
- // get the real starting node. see realNode for details.
- var start = realNode(document.getElementById(this.start));
- var end = document.getElementById(this.end);
- var parentNode = end.parentNode;
- var node, nextSibling, last;
-
- // make sure that the start and end nodes share the same
- // parent. If not, fix it.
- fixParentage(start, end);
-
- // remove all of the nodes after the starting placeholder and
- // before the ending placeholder.
- node = start.nextSibling;
- while (node) {
- nextSibling = node.nextSibling;
- last = node === end;
-
- // if this is the last node, and we want to remove it as well,
- // set the `end` node to the next sibling. This is because
- // for the rest of the function, we insert the new nodes
- // before the end (note that insertBefore(node, null) is
- // the same as appendChild(node)).
- //
- // if we do not want to remove it, just break.
- if (last) {
- if (outerToo) { end = node.nextSibling; } else { break; }
- }
-
- node.parentNode.removeChild(node);
-
- // if this is the last node and we didn't break before
- // (because we wanted to remove the outer nodes), break
- // now.
- if (last) { break; }
-
- node = nextSibling;
- }
-
- // 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(start.parentNode, html);
-
- if (outerToo) {
- start.parentNode.removeChild(start);
- }
-
- // copy the nodes for the HTML between the starting and ending
- // placeholder.
- while (node) {
- nextSibling = node.nextSibling;
- parentNode.insertBefore(node, end);
- node = nextSibling;
- }
- };
-
- // remove the nodes in the DOM representing this metamorph.
- //
- // this includes the starting and ending placeholders.
- removeFunc = function() {
- var start = realNode(document.getElementById(this.start));
- var end = document.getElementById(this.end);
-
- this.html('');
- start.parentNode.removeChild(start);
- end.parentNode.removeChild(end);
- };
-
- appendToFunc = function(parentNode) {
- var node = firstNodeFor(parentNode, this.outerHTML());
- var nextSibling;
-
- while (node) {
- nextSibling = node.nextSibling;
- parentNode.appendChild(node);
- node = nextSibling;
- }
- };
-
- afterFunc = function(html) {
- // get the real starting node. see realNode for details.
- var end = document.getElementById(this.end);
- var insertBefore = end.nextSibling;
- 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, insertBefore);
- 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;
- }
+ prototype.createElement = function(tagName) {
+ return this.document.createElement(tagName);
};
}
- Metamorph.prototype.html = function(html) {
- this.checkRemoved();
- if (html === undefined) { return this.innerHTML; }
-
- htmlFunc.call(this, html);
-
- this.innerHTML = html;
+ prototype.setNamespace = function(ns) {
+ this.namespace = ns;
};
- Metamorph.prototype.replaceWith = function(html) {
- this.checkRemoved();
- htmlFunc.call(this, html, true);
+ prototype.detectNamespace = function(element) {
+ this.namespace = interiorNamespace(element);
};
- 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;
-
- Metamorph.prototype.isRemoved = function() {
- var before = document.getElementById(this.start);
- var after = document.getElementById(this.end);
-
- return !before || !after;
+ prototype.createDocumentFragment = function(){
+ return this.document.createDocumentFragment();
};
- Metamorph.prototype.checkRemoved = function() {
- if (this.isRemoved()) {
- throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+ prototype.createTextNode = function(text){
+ return this.document.createTextNode(text);
+ };
+
+ prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
+ if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
+ for (var i=0, len=blankChildTextNodes.length;i]*selected/;
+ detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+ return select.selectedIndex === 0 &&
+ !detectAutoSelectedOptionRegex.test(html);
+ };
+ } else {
+ detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+ var selectedAttribute = option.getAttribute('selected');
+ return select.selectedIndex === 0 && (
+ selectedAttribute === null ||
+ ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
+ );
+ };
+ }
+
+ // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
+ // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
+ // them to an initial list of corrected tags.
+ //
+ // Here we are only dealing with the ones which can have child nodes.
+ //
+ var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
+ var tableInnerHTMLTestElement = document.createElement('table');
+ try {
+ tableInnerHTMLTestElement.innerHTML = '';
+ } catch (e) {
+ } finally {
+ tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
+ }
+ if (tableNeedsInnerHTMLFix) {
+ tagNamesRequiringInnerHTMLFix = {
+ colgroup: ['table'],
+ table: [],
+ tbody: ['table'],
+ tfoot: ['table'],
+ thead: ['table'],
+ tr: ['table', 'tbody']
+ };
+ }
+
+ // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
+ // add it to the list of corrected tags.
+ //
+ var selectInnerHTMLTestElement = document.createElement('select');
+ selectInnerHTMLTestElement.innerHTML = '';
+ if (selectInnerHTMLTestElement) {
+ tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
+ tagNamesRequiringInnerHTMLFix.select = [];
+ }
+
+ function scriptSafeInnerHTML(element, html) {
+ // without a leading text node, IE will drop a leading script tag.
+ html = ''+html;
+
+ element.innerHTML = html;
+
+ var nodes = element.childNodes;
+
+ // Look for to remove it.
+ var shyElement = nodes[0];
+ while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+ shyElement = shyElement.firstChild;
+ }
+ // At this point it's the actual unicode character.
+ if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+ var newValue = shyElement.nodeValue.slice(1);
+ if (newValue.length) {
+ shyElement.nodeValue = shyElement.nodeValue.slice(1);
+ } else {
+ shyElement.parentNode.removeChild(shyElement);
+ }
+ }
+
+ return nodes;
+ }
+
+ function buildDOMWithFix(html, contextualElement){
+ var tagName = contextualElement.tagName;
+
+ // Firefox versions < 11 do not have support for element.outerHTML.
+ var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
+ if (!outerHTML) {
+ throw "Can't set innerHTML on "+tagName+" in this browser";
+ }
+
+ var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
+ var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
+ var endTag = '';
+
+ var wrappedHTML = [startTag, html, endTag];
+
+ var i = wrappingTags.length;
+ var wrappedDepth = 1 + i;
+ while(i--) {
+ wrappedHTML.unshift('<'+wrappingTags[i]+'>');
+ wrappedHTML.push('');
+ }
+
+ var wrapper = document.createElement('div');
+ scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
+ var element = wrapper;
+ while (wrappedDepth--) {
+ element = element.firstChild;
+ while (element && element.nodeType !== 1) {
+ element = element.nextSibling;
+ }
+ }
+ while (element && element.tagName !== tagName) {
+ element = element.nextSibling;
+ }
+ return element ? element.childNodes : [];
+ }
+
+ var buildDOM;
+ if (needsShy) {
+ buildDOM = function buildDOM(html, contextualElement, dom){
+ contextualElement = dom.cloneNode(contextualElement, false);
+ scriptSafeInnerHTML(contextualElement, html);
+ return contextualElement.childNodes;
+ };
+ } else {
+ buildDOM = function buildDOM(html, contextualElement, dom){
+ contextualElement = dom.cloneNode(contextualElement, false);
+ contextualElement.innerHTML = html;
+ return contextualElement.childNodes;
+ };
+ }
+
+ var buildIESafeDOM;
+ if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
+ buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
+ // Make a list of the leading text on script nodes. Include
+ // script tags without any whitespace for easier processing later.
+ var spacesBefore = [];
+ var spacesAfter = [];
+ html = html.replace(/(\s*)()(\s*)/g, function(match, tag, spaces) {
+ spacesAfter.push(spaces);
+ return tag;
+ });
+
+ // Fetch nodes
+ var nodes;
+ if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
+ // buildDOMWithFix uses string wrappers for problematic innerHTML.
+ nodes = buildDOMWithFix(html, contextualElement);
+ } else {
+ nodes = buildDOM(html, contextualElement, dom);
+ }
+
+ // Build a list of script tags, the nodes themselves will be
+ // mutated as we add test nodes.
+ var i, j, node, nodeScriptNodes;
+ var scriptNodes = [];
+ for (i=0;node=nodes[i];i++) {
+ if (node.nodeType !== 1) {
+ continue;
+ }
+ if (node.tagName === 'SCRIPT') {
+ scriptNodes.push(node);
+ } else {
+ nodeScriptNodes = node.getElementsByTagName('script');
+ for (j=0;j 0) {
+ textNode = dom.document.createTextNode(spaceBefore);
+ scriptNode.parentNode.insertBefore(textNode, scriptNode);
+ }
+
+ spaceAfter = spacesAfter[i];
+ if (spaceAfter && spaceAfter.length > 0) {
+ textNode = dom.document.createTextNode(spaceAfter);
+ scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
+ }
+ }
+
+ return nodes;
+ };
+ } else {
+ buildIESafeDOM = buildDOM;
+ }
+
+ // When parsing innerHTML, the browser may set up DOM with some things
+ // not desired. For example, with a select element context and option
+ // innerHTML the first option will be marked selected.
+ //
+ // This method cleans up some of that, resetting those values back to
+ // their defaults.
+ //
+ function buildSafeDOM(html, contextualElement, dom) {
+ var childNodes = buildIESafeDOM(html, contextualElement, dom);
+
+ if (contextualElement.tagName === 'SELECT') {
+ // Walk child nodes
+ for (var i = 0; childNodes[i]; i++) {
+ // Find and process the first option child node
+ if (childNodes[i].tagName === 'OPTION') {
+ if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
+ // If the first node is selected but does not have an attribute,
+ // presume it is not really selected.
+ childNodes[i].parentNode.selectedIndex = -1;
+ }
+ break;
+ }
+ }
+ }
+
+ return childNodes;
+ }
+
+ var buildHTMLDOM;
+ if (needsIntegrationPointFix) {
+ buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
+ if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
+ return buildSafeDOM(html, document.createElement('div'), dom);
+ } else {
+ return buildSafeDOM(html, contextualElement, dom);
+ }
+ };
+ } else {
+ buildHTMLDOM = buildSafeDOM;
+ }
+
+ __exports__.buildHTMLDOM = buildHTMLDOM;
+ });
+enifed("morph/morph",
+ ["exports"],
+ function(__exports__) {
+ "use strict";
+ var splice = Array.prototype.splice;
+
+ function ensureStartEnd(start, end) {
+ if (start === null || end === null) {
+ throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
+ }
+ }
+
+ function ensureContext(contextualElement) {
+ if (!contextualElement || contextualElement.nodeType !== 1) {
+ throw new Error('An element node must be provided for a contextualElement, you provided ' +
+ (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
+ }
+ }
+
+ // TODO: this is an internal API, this should be an assert
+ function Morph(parent, start, end, domHelper, contextualElement) {
+ if (parent.nodeType === 11) {
+ ensureStartEnd(start, end);
+ this.element = null;
+ } else {
+ this.element = parent;
+ }
+ this._parent = parent;
+ this.start = start;
+ this.end = end;
+ this.domHelper = domHelper;
+ ensureContext(contextualElement);
+ this.contextualElement = contextualElement;
+ this.reset();
+ }
+
+ Morph.prototype.reset = function() {
+ this.text = null;
+ this.owner = null;
+ this.morphs = null;
+ this.before = null;
+ this.after = null;
+ this.escaped = true;
+ };
+
+ Morph.prototype.parent = function () {
+ if (!this.element) {
+ var parent = this.start.parentNode;
+ if (this._parent !== parent) {
+ this.element = this._parent = parent;
+ }
+ }
+ return this._parent;
+ };
+
+ Morph.prototype.destroy = function () {
+ if (this.owner) {
+ this.owner.removeMorph(this);
+ } else {
+ clear(this.element || this.parent(), this.start, this.end);
+ }
+ };
+
+ Morph.prototype.removeMorph = function (morph) {
+ var morphs = this.morphs;
+ for (var i=0, l=morphs.length; i 0 ? morphs[index-1] : null;
+ var after = index < morphs.length ? morphs[index] : null;
+ var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+ var end = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+ var morph = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+
+ morph.owner = this;
+ morph._update(parent, node);
+
+ if (before !== null) {
+ morph.before = before;
+ before.end = start.nextSibling;
+ before.after = morph;
+ }
+
+ if (after !== null) {
+ morph.after = after;
+ after.before = morph;
+ after.start = end.previousSibling;
+ }
+
+ this.morphs.splice(index, 0, morph);
+ return morph;
+ };
+
+ Morph.prototype.replace = function (index, removedLength, addedNodes) {
+ if (this.morphs === null) this.morphs = [];
+ var parent = this.element || this.parent();
+ var morphs = this.morphs;
+ var before = index > 0 ? morphs[index-1] : null;
+ var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
+ var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+ var end = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+ var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
+ var args, i, current;
+
+ if (removedLength > 0) {
+ clear(parent, start, end);
+ }
+
+ if (addedLength === 0) {
+ if (before !== null) {
+ before.after = after;
+ before.end = end;
+ }
+ if (after !== null) {
+ after.before = before;
+ after.start = start;
+ }
+ morphs.splice(index, removedLength);
+ return;
+ }
+
+ args = new Array(addedLength+2);
+ if (addedLength > 0) {
+ for (i=0; ithis.lengthBeforeRender){this.clearRenderedChildren();this._childViews.length=this.lengthBeforeRender}if(i){t=Ember.RenderBuffer();t=this.renderToBuffer(t);h=this._childViews.length>0;if(h){this.invokeRecursively(o,false)}e.innerHTML=t.innerString?t.innerString():s(t);r(this,"element",e);var a=this._transitionTo?this._transitionTo:this.transitionTo;a.call(this,"inDOM");if(h){this.invokeRecursively(l,false)}}else{e.innerHTML=""}}t["default"]=Ember.View.extend(i,{updateContext:function(e){var t=n(this,"context");Ember.instrument("view.updateContext.render",this,function(){if(t!==e){r(this,"context",e);if(e&&e.isController){r(this,"controller",e)}}},this)},rerender:function(){Ember.run.scheduleOnce("render",this,h)},_contextDidChange:Ember.observer(h,"context","controller")})});t("list-view/list_item_view_mixin",["exports"],function(e){"use strict";var t=Ember.get,i=Ember.set;function n(e,t){return e&&t&&e.x===t.x&&e.y===t.y}function r(){var e,i,r;Ember.instrument("view.updateContext.positionElement",this,function(){e=t(this,"element");i=this.position;r=this._position;if(!i||!e){return}if(n(i,r)){return}Ember.run.schedule("render",this,this._parentView.applyTransform,e,i.x,i.y);this._position=i},this)}e["default"]=Ember.Mixin.create({init:function(){this._super();this.one("didInsertElement",r)},classNames:["ember-list-item-view"],_position:null,updatePosition:function(e){this.position=e;this._positionElement()},_positionElement:r})});t("list-view/list_view",["list-view/list_view_helper","list-view/list_view_mixin","exports"],function(e,t,i){"use strict";var n=e["default"];var r=t["default"];var s=Ember.get,o=Ember.set;i["default"]=Ember.ContainerView.extend(r,{css:{position:"relative",overflow:"auto","-webkit-overflow-scrolling":"touch","overflow-scrolling":"touch"},applyTransform:n.applyTransform,_scrollTo:function(e){var t=s(this,"element");if(t){t.scrollTop=e}},didInsertElement:function(){var e=this;var t=s(this,"element");this._updateScrollableHeight();this._scroll=function(t){e.scroll(t)};Ember.$(t).on("scroll",this._scroll)},willDestroyElement:function(){var e;e=s(this,"element");Ember.$(e).off("scroll",this._scroll)},scroll:function(e){this.scrollTo(e.target.scrollTop)},scrollTo:function(e){var t=s(this,"element");this._scrollTo(e);this._scrollContentTo(e)},totalHeightDidChange:Ember.observer(function(){Ember.run.scheduleOnce("afterRender",this,this._updateScrollableHeight)},"totalHeight"),_updateScrollableHeight:function(){var e,t;t=this._state||this.state;if(t==="inDOM"){if(this._isChildEmptyView()){e=""}else{e=s(this,"totalHeight")}this.$(".ember-list-container").css({height:e})}}})});t("list-view/list_view_helper",["exports"],function(e){"use strict";var t=document.createElement("div"),i=t.style;var n=["Webkit","Moz","O","ms"];function r(e){if(e in i)return e;var t=e.charAt(0).toUpperCase()+e.slice(1);for(var r=0;r1}).readOnly(),init:function(){this._super();this._cachedHeights=[0];this.on("didInsertElement",this._syncListContainerWidth);this.columnCountDidChange();this._syncChildViews();this._addContentArrayObserver()},_addContentArrayObserver:Ember.beforeObserver(function(){c.call(this)},"content"),render:function(e){e.push('');this._super(e);e.push("
")},willInsertElement:function(){if(!this.get("height")||!this.get("rowHeight")){throw new Error("A ListView must be created with a height and a rowHeight.")}this._super()},style:Ember.computed("height","width",function(){var e,t,i,r;e=n(this,"height");t=n(this,"width");r=n(this,"css");i="";if(e){i+="height:"+e+"px;"}if(t){i+="width:"+t+"px;"}for(var s in r){if(r.hasOwnProperty(s)){i+=s+":"+r[s]+";"}}return i}),scrollTo:function(e){throw new Error("must override to perform the visual scroll and effectively delegate to _scrollContentTo")},_scrollTo:Ember.K,_scrollContentTo:function(e){var t,i,r,l,h,a,c,u,d;u=o(0,e);if(this.scrollTop===u){return}var f=o(0,n(this,"totalHeight")-n(this,"height"));u=s(u,f);d=n(this,"content");c=n(d,"length");t=this._startingIndex(c);Ember.instrument("view._scrollContentTo",{scrollTop:u,content:d,startingIndex:t,endingIndex:s(o(c-1,0),t+this._numChildViewsForViewport())},function(){this.scrollTop=u;h=o(c-1,0);t=this._startingIndex();l=t+this._numChildViewsForViewport();i=s(h,l);if(t===this._lastStartingIndex&&i===this._lastEndingIndex){this.trigger("scrollYChanged",e);return}else{Ember.run(this,function(){this._reuseChildren();this._lastStartingIndex=t;this._lastEndingIndex=i;this.trigger("scrollYChanged",e)})}},this)},totalHeight:Ember.computed("content.length","rowHeight","columnCount","bottomPadding",function(){if(typeof this.heightForIndex==="function"){return this._totalHeightWithHeightForIndex()}else{return this._totalHeightWithStaticRowHeight()}}),_doRowHeightDidChange:function(){this._cachedHeights=[0];this._cachedPos=0;this._syncChildViews()},_rowHeightDidChange:Ember.observer("rowHeight",function(){Ember.run.once(this,this._doRowHeightDidChange)}),_totalHeightWithHeightForIndex:function(){var e=this.get("content.length");return this._cachedHeightLookup(e)},_totalHeightWithStaticRowHeight:function(){var e,t,i,r;e=n(this,"content.length");t=n(this,"rowHeight");i=n(this,"columnCount");r=n(this,"bottomPadding");return h(e/i)*t+r},_prepareChildForReuse:function(e){e.prepareForReuse()},_reuseChildForContentIndex:function(e,t){var i,s,o,l,h,a,c;var u=this.itemViewForIndex(t);if(e.constructor!==u){var d=this._childViews.indexOf(e);e.destroy();e=this.createChildView(u);this.insertAt(d,e)}i=n(this,"content");a=n(this,"enableProfiling");h=this.positionForIndex(t);e.updatePosition(h);r(e,"contentIndex",t);if(a){Ember.instrument("view._reuseChildForContentIndex",h,function(){},this)}o=i.objectAt(t);e.updateContext(o)},positionForIndex:function(e){if(typeof this.heightForIndex!=="function"){return this._singleHeightPosForIndex(e)}else{return this._multiHeightPosForIndex(e)}},_singleHeightPosForIndex:function(e){var t,i,r,s,o,h;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");s=n(this,"rowHeight");o=s*l(e/r);h=e%r*t;return{y:o,x:h}},_multiHeightPosForIndex:function(e){var t,i,r,s,o,l;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");l=e%r*t;o=this._cachedHeightLookup(e);return{x:l,y:o}},_cachedHeightLookup:function(e){for(var t=this._cachedPos;te){i=l(t/e)}else{i=1}return i}),columnCountDidChange:Ember.observer(function(){var e,t,i,r,o,l,h,a;l=this._lastColumnCount;t=this.scrollTop;h=n(this,"columnCount");r=n(this,"maxScrollTop");a=n(this,"element");this._lastColumnCount=h;if(l){e=l/h;i=t*e;o=s(r,i);this._scrollTo(o);this.scrollTop=o}if(arguments.length>0){Ember.run.schedule("afterRender",this,this._syncListContainerWidth)}},"columnCount"),maxScrollTop:Ember.computed("height","totalHeight",function(){var e,t;e=n(this,"totalHeight");t=n(this,"height");return o(0,e-t)}),_isChildEmptyView:function(){var e=n(this,"emptyView");return e&&e instanceof Ember.View&&this._childViews.length===1&&this._childViews.indexOf(e)===0},_numChildViewsForViewport:function(){if(this.heightForIndex){return this._numChildViewsForViewportWithMultiHeight()}else{return this._numChildViewsForViewportWithoutMultiHeight()}},_numChildViewsForViewportWithoutMultiHeight:function(){var e,t,i,r;e=n(this,"height");t=n(this,"rowHeight");i=n(this,"paddingCount");r=n(this,"columnCount");return h(e/t)*r+i*r},_numChildViewsForViewportWithMultiHeight:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");var a=this._calculatedStartingIndex();var c=0;var u=this._cachedHeightLookup(a);for(var d=0;ds){break}}return d+h+1},_startingIndex:function(e){var t,i,r,h,a;if(e===undefined){a=n(this,"content.length")}else{a=e}t=this.scrollTop;i=n(this,"rowHeight");r=n(this,"columnCount");if(this.heightForIndex){h=this._calculatedStartingIndex()}else{h=l(t/i)*r}var c=this._numChildViewsForViewport();var u=1*r;var d=o(a-c,0);return s(h,d)},_calculatedStartingIndex:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");for(var a=0;a=r){break}}return a},contentWillChange:Ember.beforeObserver(function(){var e;e=n(this,"content");if(e){e.removeArrayObserver(this)}},"content"),contentDidChange:Ember.observer(function(){c.call(this);d.call(this)},"content"),needsSyncChildViews:Ember.observer(d,"height","width","columnCount"),_addItemView:function(e){var t,i;t=this.itemViewForIndex(e);i=this.createChildView(t);this.pushObject(i)},itemViewForIndex:function(e){return n(this,"itemViewClass")},heightForIndex:null,_syncChildViews:function(){var e,t,i,r,s,o,l,h,c,d,f;if(n(this,"isDestroyed")||n(this,"isDestroying")){return}h=n(this,"content.length");c=n(this,"emptyView");t=this._childViewCount();e=this.positionOrderedChildViews();if(this._isChildEmptyView()){v.call(this)}o=this._startingIndex();l=o+t;r=t;i=e.length;f=r-i;if(f===0){}else if(f>0){s=this._lastEndingIndex;for(d=0;d=this._lastStartingIndex||t .ember-list-container")[0]},willBeginScroll:function(e,t){this._isScrolling=false;this.trigger("scrollingDidStart");this.scroller.doTouchStart(e,t)},continueScroll:function(e,t){var i,n,r;if(this._isScrolling){this.scroller.doTouchMove(e,t)}else{i=this._scrollerTop;this.scroller.doTouchMove(e,t);n=this._scrollerTop;if(i!==n){r=Ember.$.Event("scrollerstart");Ember.$(e[0].target).trigger(r);this._isScrolling=true}}},endScroll:function(e){this.scroller.doTouchEnd(e)},scrollTo:function(e,t){if(t===undefined){t=true}this.scroller.scrollTo(0,e,t,1)},mouseWheel:function(e){var t,i,n;t=e.webkitDirectionInvertedFromDevice;i=e.wheelDeltaY*(t?.8:-.8);n=this.scroller.__scrollTop+i;if(n>=0&&n<=this.scroller.__maxScrollTop){this.scroller.scrollBy(0,i,true);e.stopPropagation()}return false}})});i("list-view/main")})(this);
\ No newline at end of file