language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | emberjs | ember.js | 3634605361d7dca709838583de051b9a91e6d4d3.json | Implement basic serialize | packages/ember-routing/tests/integration/basic_test.js | @@ -1,8 +1,12 @@
-var Router, App, AppView, templates, router;
+var Router, App, AppView, templates, router, urls;
var get = Ember.get, set = Ember.set;
function bootApplication() {
- router = Router.create();
+ router = Router.create({
+ updateURL: function(url) {
+ urls.push(url);
+ }
+ });
Ember.run(function() {
router._container.view.application = AppView.create().appendTo('#qunit-fixture');
@@ -18,6 +22,8 @@ module("Basic Routing", {
App.LoadingRoute = Ember.Route.extend({
});
+ urls = [];
+
Ember.TEMPLATES.app = Ember.Handlebars.compile("{{outlet}}");
Ember.TEMPLATES.home = Ember.Handlebars.compile("<h3>Hours</h3>");
Ember.TEMPLATES.homepage = Ember.TEMPLATES.home;
@@ -253,11 +259,6 @@ test("The Special Page returning a promise puts the app into a loading state unt
});
App.SpecialRoute = Ember.Route.extend({
- //setup: function() {
- //var self = this, args = arguments;
- //Ember.run(function() { self._super.apply(self, args); });
- //},
-
setupControllers: function(controller, model) {
set(controller, 'content', model);
}
@@ -290,3 +291,153 @@ test("The Special Page returning a promise puts the app into a loading state unt
start();
}, 100);
});
+
+test("Moving from one page to another triggers the correct callbacks", function() {
+ Router.map(function(match) {
+ match("/").to("home");
+ match("/specials/:menu_item_id").to("special");
+ });
+
+ var menuItem;
+
+ App.MenuItem = Ember.Object.extend(Ember.Deferred);
+ App.MenuItem.find = function(id) {
+ menuItem = App.MenuItem.create({ id: id });
+ return menuItem;
+ };
+
+ App.LoadingRoute = Ember.Route.extend({
+
+ });
+
+ App.HomeRoute = Ember.Route.extend({
+
+ });
+
+ App.SpecialRoute = Ember.Route.extend({
+ setupControllers: function(controller, model) {
+ set(controller, 'content', model);
+ }
+ });
+
+ Ember.TEMPLATES.home = Ember.Handlebars.compile(
+ "<h3>Home</h3>"
+ );
+
+ Ember.TEMPLATES.special = Ember.Handlebars.compile(
+ "<p>{{content.id}}</p>"
+ );
+
+ Ember.TEMPLATES.loading = Ember.Handlebars.compile(
+ "<p>LOADING!</p>"
+ );
+
+ bootApplication();
+
+ router._container.controller.special = Ember.Controller.create();
+
+ Ember.run(function() {
+ router.handleURL("/");
+ });
+
+ equal(Ember.$('h3', '#qunit-fixture').text(), "Home", "The app is now in the initial state");
+
+ Ember.run(function() {
+ router.transitionTo('special', App.MenuItem.create({ id: 1 }));
+ });
+
+ deepEqual(urls, ['/specials/1']);
+});
+
+test("Nested callbacks are not exited when moving to siblings", function() {
+ Router.map(function(match) {
+ match("/").to("root", function(match) {
+ match("/").to("home");
+ match("/specials/:menu_item_id").to("special");
+ });
+ });
+
+ var menuItem;
+
+ App.MenuItem = Ember.Object.extend(Ember.Deferred);
+ App.MenuItem.find = function(id) {
+ menuItem = App.MenuItem.create({ id: id });
+ return menuItem;
+ };
+
+ App.LoadingRoute = Ember.Route.extend({
+
+ });
+
+ var rootSetup = 0, rootRender = 0, rootModel = 0, rootSerialize = 0;
+
+ App.RootRoute = Ember.Route.extend({
+ model: function() {
+ rootModel++;
+ return this._super.apply(this, arguments);
+ },
+
+ serialize: function() {
+ rootSerialize++;
+ return this._super.apply(this, arguments);
+ },
+
+ setupControllers: function() {
+ rootSetup++;
+ },
+
+ renderTemplates: function() {
+ rootRender++;
+ }
+ });
+
+ App.HomeRoute = Ember.Route.extend({
+
+ });
+
+ App.SpecialRoute = Ember.Route.extend({
+ setupControllers: function(controller, model) {
+ set(controller, 'content', model);
+ }
+ });
+
+ Ember.TEMPLATES.home = Ember.Handlebars.compile(
+ "<h3>Home</h3>"
+ );
+
+ Ember.TEMPLATES.special = Ember.Handlebars.compile(
+ "<p>{{content.id}}</p>"
+ );
+
+ Ember.TEMPLATES.loading = Ember.Handlebars.compile(
+ "<p>LOADING!</p>"
+ );
+
+ bootApplication();
+
+ router._container.controller.special = Ember.Controller.create();
+
+ Ember.run(function() {
+ router.handleURL("/");
+ });
+
+ equal(Ember.$('h3', '#qunit-fixture').text(), "Home", "The app is now in the initial state");
+ equal(rootSetup, 1, "The root setup was triggered");
+ equal(rootRender, 1, "The root render was triggered");
+ equal(rootSerialize, 0, "The root serialize was not called");
+ equal(rootModel, 1, "The root model was called");
+
+ Ember.run(function() {
+ router.transitionTo('special', App.MenuItem.create({ id: 1 }));
+ });
+ equal(rootSetup, 1, "The root setup was not triggered again");
+ equal(rootRender, 1, "The root render was not triggered again");
+ equal(rootSerialize, 0, "The root serialize was not called");
+
+ // TODO: Should this be changed?
+ equal(rootModel, 2, "The root model was called again");
+
+ deepEqual(urls, ['/specials/1']);
+});
+
+// TODO: Parent context change | true |
Other | emberjs | ember.js | be91b981e3a9f88a871c54c5dcc18c57cedf5eaf.json | Add support for models | packages/ember-routing/lib/system/route.js | @@ -16,6 +16,14 @@ Ember.Route = Ember.Object.extend({
this.renderTemplates(context);
},
+ deserialize: function(params) {
+ return this.model(params);
+ },
+
+ model: function() {
+
+ },
+
setupControllers: function(context) {
}, | true |
Other | emberjs | ember.js | be91b981e3a9f88a871c54c5dcc18c57cedf5eaf.json | Add support for models | packages/ember-routing/tests/integration/basic_test.js | @@ -131,3 +131,69 @@ test("The Homepage with a `setupControllers` hook modifying other controllers",
equal(Ember.$('ul li', '#qunit-fixture').eq(2).text(), "Sunday: Noon to 6pm", "The template was rendered with the hours context");
});
+test("The Homepage getting its controller context via controllerContext", function() {
+ Router.map(function(match) {
+ match("/").to("home");
+ });
+
+ App.HomeRoute = Ember.Route.extend({
+ model: function() {
+ return Ember.A([
+ "Monday through Friday: 9am to 5pm",
+ "Saturday: Noon to Midnight",
+ "Sunday: Noon to 6pm"
+ ]);
+ },
+
+ setupControllers: function(controller, model) {
+ set(this.controller('home'), 'hours', model);
+ }
+ });
+
+ Ember.TEMPLATES.home = Ember.Handlebars.compile(
+ "<ul>{{#each entry in hours}}<li>{{entry}}</li>{{/each}}</ul>"
+ );
+
+ bootApplication();
+
+ router._container.controller.home = Ember.Controller.create();
+
+ Ember.run(function() {
+ router.handleURL("/");
+ });
+
+ equal(Ember.$('ul li', '#qunit-fixture').eq(2).text(), "Sunday: Noon to 6pm", "The template was rendered with the hours context");
+});
+
+test("The Homepage getting its controller context by deserializing the params hash", function() {
+ Router.map(function(match) {
+ match("/").to("home");
+ match("/specials/:menu_item_id").to("special");
+ });
+
+ App.SpecialRoute = Ember.Route.extend({
+ model: function(params) {
+ return Ember.Object.create({
+ menuItemId: params.menu_item_id
+ });
+ },
+
+ setupControllers: function(controller, model) {
+ set(controller, 'content', model);
+ }
+ });
+
+ Ember.TEMPLATES.special = Ember.Handlebars.compile(
+ "<p>{{content.menuItemId}}</p>"
+ );
+
+ bootApplication();
+
+ router._container.controller.special = Ember.Controller.create();
+
+ Ember.run(function() {
+ router.handleURL("/specials/1");
+ });
+
+ equal(Ember.$('p', '#qunit-fixture').text(), "1", "The model was used to render the template");
+}); | true |
Other | emberjs | ember.js | 7758d8ed25c9ebc7af80016c75539e60bdf588fa.json | Remove separator code.
We don't need to support them without '*'. | packages/ember-metal/lib/watching.js | @@ -142,7 +142,7 @@ function isProto(pvalue) {
// A ChainNode watches a single key on an object. If you provide a starting
// value for the key then the node won't actually watch it. For a root node
// pass null for parent and key and object for value.
-var ChainNode = function(parent, key, value, separator) {
+var ChainNode = function(parent, key, value) {
var obj;
this._parent = parent;
this._key = key;
@@ -156,7 +156,6 @@ var ChainNode = function(parent, key, value, separator) {
this._watching = value===undefined;
this._value = value;
- this._separator = separator || '.';
this._paths = {};
if (this._watching) {
this._object = parent.value();
@@ -193,7 +192,7 @@ ChainNodePrototype.destroy = function() {
// copies a top level object only
ChainNodePrototype.copy = function(obj) {
- var ret = new ChainNode(null, null, obj, this._separator),
+ var ret = new ChainNode(null, null, obj),
paths = this._paths, path;
for (path in paths) {
if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
@@ -205,7 +204,7 @@ ChainNodePrototype.copy = function(obj) {
// called on the root node of a chain to setup watchers on the specified
// path.
ChainNodePrototype.add = function(path) {
- var obj, tuple, key, src, separator, paths;
+ var obj, tuple, key, src, paths;
paths = this._paths;
paths[path] = (paths[path] || 0) + 1;
@@ -230,12 +229,11 @@ ChainNodePrototype.add = function(path) {
} else {
src = tuple[0];
key = path.slice(0, 0-(tuple[1].length+1));
- separator = path.slice(key.length, key.length+1);
path = tuple[1];
}
tuple.length = 0;
- this.chain(key, path, src, separator);
+ this.chain(key, path, src);
};
// called on the root node of a chain to teardown watcher on the specified
@@ -264,12 +262,12 @@ ChainNodePrototype.remove = function(path) {
ChainNodePrototype.count = 0;
-ChainNodePrototype.chain = function(key, path, src, separator) {
+ChainNodePrototype.chain = function(key, path, src) {
var chains = this._chains, node;
if (!chains) { chains = this._chains = {}; }
node = chains[key];
- if (!node) { node = chains[key] = new ChainNode(this, key, src, separator); }
+ if (!node) { node = chains[key] = new ChainNode(this, key, src); }
node.count++; // count chains...
// chain rest of path if there is one
@@ -312,7 +310,7 @@ ChainNodePrototype.willChange = function() {
};
ChainNodePrototype.chainWillChange = function(chain, path, depth) {
- if (this._key) { path = this._key + this._separator + path; }
+ if (this._key) { path = this._key + '.' + path; }
if (this._parent) {
this._parent.chainWillChange(this, path, depth+1);
@@ -324,7 +322,7 @@ ChainNodePrototype.chainWillChange = function(chain, path, depth) {
};
ChainNodePrototype.chainDidChange = function(chain, path, depth) {
- if (this._key) { path = this._key + this._separator + path; }
+ if (this._key) { path = this._key + '.' + path; }
if (this._parent) {
this._parent.chainDidChange(this, path, depth+1);
} else { | false |
Other | emberjs | ember.js | c4bdb77f4625fb134686b8aa52c8ec6a7baaa3a0.json | Convert chain watchers to use arrays.
This eliminates the use of guidFor when adding/removing chains. | packages/ember-metal/lib/watching.js | @@ -96,8 +96,8 @@ function addChainWatcher(obj, keyName, node) {
nodes = m.chainWatchers = { __emberproto__: obj };
}
- if (!nodes[keyName]) { nodes[keyName] = {}; }
- nodes[keyName][guidFor(node)] = node;
+ if (!nodes[keyName]) { nodes[keyName] = []; }
+ nodes[keyName].push(node);
Ember.watch(obj, keyName);
}
@@ -106,7 +106,12 @@ function removeChainWatcher(obj, keyName, node) {
var m = metaFor(obj, false),
nodes = m.chainWatchers;
if (!nodes || nodes.__emberproto__ !== obj) { return; } //nothing to do
- if (nodes[keyName]) { delete nodes[keyName][guidFor(node)]; }
+ if (nodes[keyName]) {
+ nodes = nodes[keyName];
+ for (var i = 0, l = nodes.length; i < l; i++) {
+ if (nodes[i] === node) { nodes.splice(i, 1); }
+ }
+ }
Ember.unwatch(obj, keyName);
}
@@ -378,9 +383,8 @@ function notifyChains(obj, m, keyName, methodName, arg) {
nodes = nodes[keyName];
if (!nodes) { return; }
- for(var key in nodes) {
- if (!nodes.hasOwnProperty(key)) { continue; }
- nodes[key][methodName](arg);
+ for(var i = 0, l = nodes.length; i < l; i++) {
+ nodes[i][methodName](arg);
}
}
| true |
Other | emberjs | ember.js | c4bdb77f4625fb134686b8aa52c8ec6a7baaa3a0.json | Convert chain watchers to use arrays.
This eliminates the use of guidFor when adding/removing chains. | packages/ember-metal/tests/watching/watch_test.js | @@ -181,15 +181,16 @@ test('when watching a global object, destroy should remove chain watchers from t
var meta_Global = Ember.meta(Global);
var chainNode = Ember.meta(obj).chains._chains.Global._chains.foo;
- var guid = Ember.guidFor(chainNode);
+ var index = meta_Global.chainWatchers.foo.indexOf(chainNode);
equal(meta_Global.watching.foo, 1, 'should be watching foo');
- strictEqual(meta_Global.chainWatchers.foo[guid], chainNode, 'should have chain watcher');
+ strictEqual(meta_Global.chainWatchers.foo[index], chainNode, 'should have chain watcher');
Ember.destroy(obj);
+ index = meta_Global.chainWatchers.foo.indexOf(chainNode);
equal(meta_Global.watching.foo, 0, 'should not be watching foo');
- strictEqual(meta_Global.chainWatchers.foo[guid], undefined, 'should not have chain watcher');
+ equal(index, -1, 'should not have chain watcher');
Global = null; // reset
});
@@ -204,13 +205,14 @@ test('when watching another object, destroy should remove chain watchers from th
var meta_objB = Ember.meta(objB);
var chainNode = Ember.meta(objA).chains._chains.b._chains.foo;
- var guid = Ember.guidFor(chainNode);
+ var index = meta_objB.chainWatchers.foo.indexOf(chainNode);
equal(meta_objB.watching.foo, 1, 'should be watching foo');
- strictEqual(meta_objB.chainWatchers.foo[guid], chainNode, 'should have chain watcher');
+ strictEqual(meta_objB.chainWatchers.foo[index], chainNode, 'should have chain watcher');
Ember.destroy(objA);
+ index = meta_objB.chainWatchers.foo.indexOf(chainNode);
equal(meta_objB.watching.foo, 0, 'should not be watching foo');
- strictEqual(meta_objB.chainWatchers.foo[guid], undefined, 'should not have chain watcher');
+ equal(index, -1, 'should not have chain watcher');
}); | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | .jshintrc | @@ -11,6 +11,7 @@
"ember_deprecate",
"ember_deprecateFunc",
"require",
+ "requireModule",
"equal",
"test",
"testBoth", | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | Assetfile | @@ -50,6 +50,31 @@ class EmberLicenseFilter < Rake::Pipeline::Filter
end
end
+class AddMicroLoader < Rake::Pipeline::Filter
+ LOADER = File.expand_path("../packages/loader/lib/main.js", __FILE__)
+
+ def initialize(options={}, &block)
+ super(&block)
+ @global = options[:global]
+ end
+
+ def generate_output(inputs, output)
+ output.write "(function() {\n" unless @global
+
+ output.write File.read(LOADER)
+
+ inputs.each do |input|
+ output.write input.read
+ end
+
+ output.write "\n})();\n" unless @global
+ end
+
+ def additional_dependencies(input)
+ [ LOADER ]
+ end
+end
+
class JSHintRC < Rake::Pipeline::Filter
def jshintrc
@jshintrc ||= File.read(".jshintrc")
@@ -122,6 +147,7 @@ input "packages" do
}
concat "ember-spade.js"
+ filter AddMicroLoader, :global => true
end
end
@@ -150,6 +176,7 @@ distros.each do |name, modules|
module_paths = modules.map{|m| "#{m}.js" }
match "{#{module_paths.join(',')}}" do
concat(module_paths){ ["#{name}.js", "#{name}.prod.js"] }
+ filter AddMicroLoader
end
# Add debug to the main distro | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | Gemfile.lock | @@ -52,7 +52,7 @@ GEM
multi_json (>= 1.0)
kicker (2.6.1)
listen
- listen (0.5.3)
+ listen (0.6.0)
mime-types (1.19)
multi_json (1.3.7)
multipart-post (1.1.5) | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | packages/ember-runtime/lib/mixins/deferred.js | @@ -1,4 +1,4 @@
-require("rsvp");
+var RSVP = requireModule("rsvp");
/**
@module ember | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | packages/loader/lib/main.js | @@ -0,0 +1,31 @@
+var define, requireModule;
+
+(function() {
+ var registry = {}, seen = {};
+
+ define = function(name, deps, callback) {
+ registry[name] = { deps: deps, callback: callback };
+ };
+
+ requireModule = function(name) {
+ if (seen[name]) { return seen[name]; }
+ seen[name] = {};
+
+ var mod = registry[name],
+ deps = mod.deps,
+ callback = mod.callback,
+ reified = [],
+ exports;
+
+ for (var i=0, l=deps.length; i<l; i++) {
+ if (deps[i] === 'exports') {
+ reified.push(exports = {});
+ } else {
+ reified.push(requireModule(deps[i]));
+ }
+ }
+
+ var value = callback.apply(this, reified);
+ return seen[name] = exports || value;
+ };
+})(); | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | packages/loader/package.json | @@ -0,0 +1,28 @@
+{
+ "name": "ember-microloader",
+ "summary": "Ember Microloader",
+ "description": "The external dependency loader for Ember",
+ "homepage": "http://emberjs.com",
+ "author": "Yehuda Katz",
+ "version": "1.0.0-pre.2",
+
+ "directories": {
+ "lib": "lib"
+ },
+
+ "dependencies": {},
+
+ "dependencies:development": {},
+
+ "bpm:build": {
+
+ "bpm_libs.js": {
+ "files": ["lib"],
+ "modes": "*"
+ },
+
+ "ember-views/bpm_tests.js": {}
+ }
+}
+
+ | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | packages/rsvp/lib/main.js | @@ -1,208 +1,224 @@
-(function(exports) { "use strict";
-
-var browserGlobal = (typeof window !== 'undefined') ? window : {};
-
-var MutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
-var async;
-
-if (typeof process !== 'undefined') {
- async = function(callback, binding) {
- process.nextTick(function() {
- callback.call(binding);
- });
- };
-} else if (MutationObserver) {
- var queue = [];
-
- var observer = new MutationObserver(function() {
- var toProcess = queue.slice();
- queue = [];
-
- toProcess.forEach(function(tuple) {
- var callback = tuple[0], binding = tuple[1];
- callback.call(binding);
- });
- });
+define("rsvp",
+ ["exports"],
+ function(exports) {
+ "use strict";
+ var browserGlobal = (typeof window !== 'undefined') ? window : {};
+
+ var MutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
+ var async;
+
+ if (typeof process !== 'undefined' &&
+ {}.toString.call(process) === '[object process]') {
+ async = function(callback, binding) {
+ process.nextTick(function() {
+ callback.call(binding);
+ });
+ };
+ } else if (MutationObserver) {
+ var queue = [];
+
+ var observer = new MutationObserver(function() {
+ var toProcess = queue.slice();
+ queue = [];
+
+ toProcess.forEach(function(tuple) {
+ var callback = tuple[0], binding = tuple[1];
+ callback.call(binding);
+ });
+ });
+
+ var element = document.createElement('div');
+ observer.observe(element, { attributes: true });
+
+ async = function(callback, binding) {
+ queue.push([callback, binding]);
+ element.setAttribute('drainQueue', 'drainQueue');
+ };
+ } else {
+ async = function(callback, binding) {
+ setTimeout(function() {
+ callback.call(binding);
+ }, 1);
+ };
+ }
- var element = document.createElement('div');
- observer.observe(element, { attributes: true });
- async = function(callback, binding) {
- queue.push([callback, binding]);
- element.setAttribute('drainQueue', 'drainQueue');
- };
-} else {
- async = function(callback, binding) {
- setTimeout(function() {
- callback.call(binding);
- }, 1);
- };
-}
+ var Event = function(type, options) {
+ this.type = type;
-exports.async = async;
+ for (var option in options) {
+ if (!options.hasOwnProperty(option)) { continue; }
-var Event = exports.Event = function(type, options) {
- this.type = type;
+ this[option] = options[option];
+ }
+ };
- for (var option in options) {
- if (!options.hasOwnProperty(option)) { continue; }
- this[option] = options[option];
- }
-};
+ var indexOf = function(callbacks, callback) {
+ for (var i=0, l=callbacks.length; i<l; i++) {
+ if (callbacks[i][0] === callback) { return i; }
+ }
-var indexOf = function(callbacks, callback) {
- for (var i=0, l=callbacks.length; i<l; i++) {
- if (callbacks[i][0] === callback) { return i; }
- }
+ return -1;
+ };
- return -1;
-};
+ var callbacksFor = function(object) {
+ var callbacks = object._promiseCallbacks;
-var callbacksFor = function(object) {
- var callbacks = object._promiseCallbacks;
+ if (!callbacks) {
+ callbacks = object._promiseCallbacks = {};
+ }
- if (!callbacks) {
- callbacks = object._promiseCallbacks = {};
- }
+ return callbacks;
+ };
- return callbacks;
-};
+ var EventTarget = {
+ mixin: function(object) {
+ object.on = this.on;
+ object.off = this.off;
+ object.trigger = this.trigger;
+ return object;
+ },
-var EventTarget = exports.EventTarget = {
- mixin: function(object) {
- object.on = this.on;
- object.off = this.off;
- object.trigger = this.trigger;
- return object;
- },
+ on: function(eventNames, callback, binding) {
+ var allCallbacks = callbacksFor(this), callbacks, eventName;
+ eventNames = eventNames.split(/\s+/);
+ binding = binding || this;
- on: function(eventName, callback, binding) {
- var allCallbacks = callbacksFor(this), callbacks;
- binding = binding || this;
+ while (eventName = eventNames.shift()) {
+ callbacks = allCallbacks[eventName];
- callbacks = allCallbacks[eventName];
+ if (!callbacks) {
+ callbacks = allCallbacks[eventName] = [];
+ }
- if (!callbacks) {
- callbacks = allCallbacks[eventName] = [];
- }
+ if (indexOf(callbacks, callback) === -1) {
+ callbacks.push([callback, binding]);
+ }
+ }
+ },
- if (indexOf(callbacks, callback) === -1) {
- callbacks.push([callback, binding]);
- }
- },
+ off: function(eventNames, callback) {
+ var allCallbacks = callbacksFor(this), callbacks, eventName, index;
+ eventNames = eventNames.split(/\s+/);
- off: function(eventName, callback) {
- var allCallbacks = callbacksFor(this), callbacks;
+ while (eventName = eventNames.shift()) {
+ if (!callback) {
+ allCallbacks[eventName] = [];
+ continue;
+ }
- if (!callback) {
- allCallbacks[eventName] = [];
- return;
- }
+ callbacks = allCallbacks[eventName];
- callbacks = allCallbacks[eventName];
+ index = indexOf(callbacks, callback);
- var index = indexOf(callbacks, callback);
+ if (index !== -1) { callbacks.splice(index, 1); }
+ }
+ },
- if (index !== -1) { callbacks.splice(index, 1); }
- },
+ trigger: function(eventName, options) {
+ var allCallbacks = callbacksFor(this),
+ callbacks, callbackTuple, callback, binding, event;
- trigger: function(eventName, options) {
- var allCallbacks = callbacksFor(this),
- callbacks, callbackTuple, callback, binding, event;
+ if (callbacks = allCallbacks[eventName]) {
+ for (var i=0, l=callbacks.length; i<l; i++) {
+ callbackTuple = callbacks[i];
+ callback = callbackTuple[0];
+ binding = callbackTuple[1];
- if (callbacks = allCallbacks[eventName]) {
- for (var i=0, l=callbacks.length; i<l; i++) {
- callbackTuple = callbacks[i];
- callback = callbackTuple[0];
- binding = callbackTuple[1];
+ if (typeof options !== 'object') {
+ options = { detail: options };
+ }
- if (typeof options !== 'object') {
- options = { detail: options };
+ event = new Event(eventName, options);
+ callback.call(binding, event);
+ }
}
+ }
+ };
+
+
+ var Promise = function() {
+ this.on('promise:resolved', function(event) {
+ this.trigger('success', { detail: event.detail });
+ }, this);
+
+ this.on('promise:failed', function(event) {
+ this.trigger('error', { detail: event.detail });
+ }, this);
+ };
- event = new Event(eventName, options);
- callback.call(binding, event);
+
+ var noop = function() {};
+
+ var invokeCallback = function(type, promise, callback, event) {
+ var value, error;
+
+ if (callback) {
+ try {
+ value = callback(event.detail);
+ } catch(e) {
+ error = e;
+ }
+ } else {
+ value = event.detail;
}
- }
- }
-};
-var Promise = exports.Promise = function() {
- this.on('promise:resolved', function(event) {
- this.trigger('success', { detail: event.detail });
- }, this);
+ if (value instanceof Promise) {
+ value.then(function(value) {
+ promise.resolve(value);
+ }, function(error) {
+ promise.reject(error);
+ });
+ } else if (callback && value) {
+ promise.resolve(value);
+ } else if (error) {
+ promise.reject(error);
+ } else {
+ promise[type](value);
+ }
+ };
+
+ Promise.prototype = {
+ then: function(done, fail) {
+ var thenPromise = new Promise();
- this.on('promise:failed', function(event) {
- this.trigger('error', { detail: event.detail });
- }, this);
-};
+ this.on('promise:resolved', function(event) {
+ invokeCallback('resolve', thenPromise, done, event);
+ });
-var noop = function() {};
+ this.on('promise:failed', function(event) {
+ invokeCallback('reject', thenPromise, fail, event);
+ });
-var invokeCallback = function(type, promise, callback, event) {
- var value, error;
+ return thenPromise;
+ },
- if (callback) {
- try {
- value = callback(event.detail);
- } catch(e) {
- error = e;
- }
- } else {
- value = event.detail;
- }
-
- if (value instanceof Promise) {
- value.then(function(value) {
- promise.resolve(value);
- }, function(error) {
- promise.reject(error);
- });
- } else if (callback && value) {
- promise.resolve(value);
- } else if (error) {
- promise.reject(error);
- } else {
- promise[type](value);
- }
-};
-
-Promise.prototype = {
- then: function(done, fail) {
- var thenPromise = new Promise();
-
- this.on('promise:resolved', function(event) {
- invokeCallback('resolve', thenPromise, done, event);
- });
-
- this.on('promise:failed', function(event) {
- invokeCallback('reject', thenPromise, fail, event);
- });
-
- return thenPromise;
- },
-
- resolve: function(value) {
- exports.async(function() {
- this.trigger('promise:resolved', { detail: value });
- this.isResolved = value;
- }, this);
-
- this.resolve = noop;
- this.reject = noop;
- },
-
- reject: function(value) {
- exports.async(function() {
- this.trigger('promise:failed', { detail: value });
- this.isRejected = value;
- }, this);
-
- this.resolve = noop;
- this.reject = noop;
- }
-};
-
-EventTarget.mixin(Promise.prototype);
- })(window.RSVP = {});
+ resolve: function(value) {
+ async(function() {
+ this.trigger('promise:resolved', { detail: value });
+ this.isResolved = value;
+ }, this);
+
+ this.resolve = noop;
+ this.reject = noop;
+ },
+
+ reject: function(value) {
+ async(function() {
+ this.trigger('promise:failed', { detail: value });
+ this.isRejected = value;
+ }, this);
+
+ this.resolve = noop;
+ this.reject = noop;
+ }
+ };
+
+ EventTarget.mixin(Promise.prototype);
+
+ exports.async = async;
+ exports.Event = Event;
+ exports.EventTarget = EventTarget;
+ exports.Promise = Promise;
+ }); | true |
Other | emberjs | ember.js | 65e800fbe3f91b60ac7e65e7016e42fd1506ab17.json | Load external dependencies via an AMD shim
The shim is included inside a closure that wraps
the entire Ember package, so it doesn't leak out
into the global space and conflict with other AMD
loaders that may be in use. | tests/index.html | @@ -181,6 +181,9 @@ <h2 id="qunit-userAgent"></h2>
];
}
+ // External dependencies are loaded via the AMD shim
+ packages.unshift('rsvp');
+
len = packages.length;
// There is no require for this in the code | true |
Other | emberjs | ember.js | b212d2f58324909af7994de0c607b2fde74c529a.json | Fix failing build
:full != "full" | Assetfile | @@ -144,7 +144,7 @@ input "packages" do
end
distros.each do |name, modules|
- name = name == :full ? "ember" : "ember-#{name}"
+ name = name == "full" ? "ember" : "ember-#{name}"
input "dist/modules" do
module_paths = modules.map{|m| "#{m}.js" } | false |
Other | emberjs | ember.js | 240d28aac0b67c2d8848a280d395085c6385bbbe.json | Fix meta objects appearing in JSON on IE7/8
Define a no-open toJSON() function on Meta objects to surpress them from
JSON output on IE7/8. | packages/ember-metal/lib/utils.js | @@ -169,6 +169,10 @@ if (isDefinePropertySimulated) {
// jQuery.extend() by having a property that fails
// hasOwnProperty check.
Meta.prototype.__preventPlainObject__ = true;
+
+ // Without non-enumerable properties, meta objects will be output in JSON
+ // unless explicitly suppressed
+ Meta.prototype.toJSON = function () { };
}
/** | false |
Other | emberjs | ember.js | b35fcaa45da30a593b9238aaa2194fc79c85d919.json | Remove unneeded lazy check
Now that we eagerly remove the observer on
willClearRender, we don't need a lazy check. | packages/ember-views/lib/views/view.js | @@ -1267,10 +1267,6 @@ Ember.View = Ember.CoreView.extend(
// Get the current value of the property
newClass = this._classStringForProperty(binding);
elem = this.$();
- if (!elem) {
- removeObserver(this, parsedPath.path, observer);
- return;
- }
// If we had previously added a class to the element, remove it.
if (oldClass) { | false |
Other | emberjs | ember.js | 3b8987626fc2516dc324a8ccb5fc8a6013bac2dc.json | Fix failing Ember.Checkbox test on jQuery master | packages/ember-handlebars/tests/controls/checkbox_test.js | @@ -1,4 +1,6 @@
-var get = Ember.get, set = Ember.set, checkboxView, dispatcher;
+var get = Ember.get, set = Ember.set,
+ isInternetExplorer = window.navigator.userAgent.match(/msie/i),
+ checkboxView, dispatcher;
module("Ember.Checkbox", {
setup: function() {
@@ -92,7 +94,7 @@ test("checking the checkbox updates the value", function() {
// Can't find a way to programatically trigger a checkbox in IE and have it generate the
// same events as if a user actually clicks.
- if (!Ember.$.browser.msie) {
+ if (!isInternetExplorer) {
checkboxView.$()[0].click();
} else {
checkboxView.$().trigger('click'); | false |
Other | emberjs | ember.js | 9bc2b4159bfb6545958c5368e41ebe649cc45ea6.json | Add capitalize function to Ember.String | packages/ember-runtime/lib/ext/string.js | @@ -16,7 +16,8 @@ var fmt = Ember.String.fmt,
camelize = Ember.String.camelize,
decamelize = Ember.String.decamelize,
dasherize = Ember.String.dasherize,
- underscore = Ember.String.underscore;
+ underscore = Ember.String.underscore,
+ capitalize = Ember.String.capitalize;
if (Ember.EXTEND_PROTOTYPES) {
@@ -69,5 +70,12 @@ if (Ember.EXTEND_PROTOTYPES) {
return underscore(this);
};
+ /**
+ @see Ember.String.capitalize
+ */
+ String.prototype.capitalize = function() {
+ return capitalize(this);
+ };
+
}
| true |
Other | emberjs | ember.js | 9bc2b4159bfb6545958c5368e41ebe649cc45ea6.json | Add capitalize function to Ember.String | packages/ember-runtime/lib/system/string.js | @@ -201,5 +201,22 @@ Ember.String = {
underscore: function(str) {
return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+ },
+
+ /**
+ Returns the Capitalized form of a string
+
+ 'innerHTML'.capitalize() => 'InnerHTML'
+ 'action_name'.capitalize() => 'Action_name'
+ 'css-class-name'.capitalize() => 'Css-class-name'
+ 'my favorite items'.capitalize() => 'My favorite items'
+
+ @param {String} str
+
+ @returns {String}
+ */
+ capitalize: function(str) {
+ return str.charAt(0).toUpperCase() + str.substr(1);
}
+
}; | true |
Other | emberjs | ember.js | 9bc2b4159bfb6545958c5368e41ebe649cc45ea6.json | Add capitalize function to Ember.String | packages/ember-runtime/tests/system/string/capitalize.js | @@ -0,0 +1,44 @@
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+module('Ember.String.capitalize');
+
+test("capitalize normal string", function() {
+ deepEqual(Ember.String.capitalize('my favorite items'), 'My favorite items');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('my favorite items'.capitalize(), 'My favorite items');
+ }
+});
+
+test("capitalize dasherized string", function() {
+ deepEqual(Ember.String.capitalize('css-class-name'), 'Css-class-name');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('css-class-name'.capitalize(), 'Css-class-name');
+ }
+});
+
+test("capitalize underscored string", function() {
+ deepEqual(Ember.String.capitalize('action_name'), 'Action_name');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('action_name'.capitalize(), 'Action_name');
+ }
+});
+
+test("capitalize camelcased string", function() {
+ deepEqual(Ember.String.capitalize('innerHTML'), 'InnerHTML');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('innerHTML'.capitalize(), 'InnerHTML');
+ }
+});
+
+test("does nothing with capitalized string", function() {
+ deepEqual(Ember.String.capitalize('Capitalized string'), 'Capitalized string');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('Capitalized string'.capitalize(), 'Capitalized string');
+ }
+});
+ | true |
Other | emberjs | ember.js | 48da23b0956d0f0eeef8ddcd212e2e17ba79b3f7.json | Fix typo in Application.initialize assertion. | packages/ember-application/lib/system/application.js | @@ -325,7 +325,7 @@ Ember.Application = Ember.Namespace.extend(
@param router {Ember.Router}
*/
initialize: function(router) {
- Ember.assert("Application initialize may only be call once", !this.isInitialized);
+ Ember.assert("Application initialize may only be called once", !this.isInitialized);
Ember.assert("Application not destroyed", !this.isDestroyed);
router = this.setupRouter(router); | false |
Other | emberjs | ember.js | b1c0b4ce617fc7a5e7165d352283355b69290d25.json | Fix typo in test | packages/ember-metal/tests/utils/meta_test.js | @@ -63,7 +63,7 @@ if (Ember.platform.defineProperty.isSimulated) {
props.push(prop);
}
deepEqual(props.sort(), ['bar', 'foo']);
- if (typeof JSON !== 'undefiend' && 'stringify' in JSON) {
+ if (typeof JSON !== 'undefined' && 'stringify' in JSON) {
try {
JSON.stringify(obj);
} catch (e) { | false |
Other | emberjs | ember.js | d884654354a179533fc80132eb85d2fb19dc30f0.json | fix edge cases with adding/removing observers | packages/ember-metal/lib/events.js | @@ -54,8 +54,7 @@ function targetSetFor(obj, eventName) {
// meta system.
var SKIP_PROPERTIES = { __ember_source__: true };
-function iterateSet(obj, eventName, callback, params) {
- var targetSet = targetSetFor(obj, eventName);
+function iterateSet(targetSet, callback) {
if (!targetSet) { return false; }
// Iterate through all elements of the target set
for(var targetGuid in targetSet) {
@@ -69,7 +68,7 @@ function iterateSet(obj, eventName, callback, params) {
var action = actionSet[methodGuid];
if (action) {
- if (callback(action, params, obj) === true) {
+ if (callback(action) === true) {
return true;
}
}
@@ -92,6 +91,32 @@ function invokeAction(action, params, sender) {
}
}
+function targetSetUnion(obj, eventName, targetSet) {
+ iterateSet(targetSetFor(obj, eventName), function (action) {
+ var targetGuid = guidFor(action.target),
+ methodGuid = guidFor(action.method),
+ actionSet = targetSet[targetGuid];
+ if (!actionSet) actionSet = targetSet[targetGuid] = {};
+ actionSet[methodGuid] = action;
+ });
+}
+
+function targetSetDiff(obj, eventName, targetSet) {
+ var diffTargetSet = {};
+ iterateSet(targetSetFor(obj, eventName), function (action) {
+ var targetGuid = guidFor(action.target),
+ methodGuid = guidFor(action.method),
+ actionSet = targetSet[targetGuid],
+ diffActionSet = diffTargetSet[targetGuid];
+ if (!actionSet) actionSet = targetSet[targetGuid] = {};
+ if (actionSet[methodGuid]) return;
+ actionSet[methodGuid] = action;
+ if (!diffActionSet) diffActionSet = diffTargetSet[targetGuid] = {};
+ diffActionSet[methodGuid] = action;
+ });
+ return diffTargetSet;
+}
+
/**
Add an event listener
@@ -160,7 +185,7 @@ function removeListener(obj, eventName, target, method) {
if (method) {
_removeListener(target, method);
} else {
- iterateSet(obj, eventName, function(action) {
+ iterateSet(targetSetFor(obj, eventName), function(action) {
_removeListener(action.target, action.method);
});
}
@@ -281,41 +306,18 @@ function watchedEvents(obj) {
@param {Array} params
@return true
*/
-function sendEvent(obj, eventName, params) {
+function sendEvent(obj, eventName, params, targetSet) {
// first give object a chance to handle it
if (obj !== Ember && 'function' === typeof obj.sendEvent) {
obj.sendEvent(eventName, params);
}
- iterateSet(obj, eventName, invokeAction, params);
- return true;
-}
+ if (!targetSet) targetSet = targetSetFor(obj, eventName);
-/**
- @private
- @method deferEvent
- @for Ember
- @param obj
- @param {String} eventName
- @param {Array} params
-*/
-function deferEvent(obj, eventName, params) {
- var actions = [];
- iterateSet(obj, eventName, function (action) {
- actions.push(action);
+ iterateSet(targetSet, function (action) {
+ invokeAction(action, params, obj);
});
-
- return function() {
- if (obj.isDestroyed) { return; }
-
- if (obj !== Ember && 'function' === typeof obj.sendEvent) {
- obj.sendEvent(eventName, params);
- }
-
- for (var i=0, len=actions.length; i < len; ++i) {
- invokeAction(actions[i], params, obj);
- }
- };
+ return true;
}
/**
@@ -326,7 +328,7 @@ function deferEvent(obj, eventName, params) {
@param {String} eventName
*/
function hasListeners(obj, eventName) {
- if (iterateSet(obj, eventName, function() { return true; })) {
+ if (iterateSet(targetSetFor(obj, eventName), function() { return true; })) {
return true;
}
@@ -346,7 +348,7 @@ function hasListeners(obj, eventName) {
*/
function listenersFor(obj, eventName) {
var ret = [];
- iterateSet(obj, eventName, function (action) {
+ iterateSet(targetSetFor(obj, eventName), function (action) {
ret.push([action.target, action.method]);
});
return ret;
@@ -360,4 +362,5 @@ Ember.sendEvent = sendEvent;
Ember.hasListeners = hasListeners;
Ember.watchedEvents = watchedEvents;
Ember.listenersFor = listenersFor;
-Ember.deferEvent = deferEvent;
+Ember.listenersDiff = targetSetDiff;
+Ember.listenersUnion = targetSetUnion;
\ No newline at end of file | true |
Other | emberjs | ember.js | d884654354a179533fc80132eb85d2fb19dc30f0.json | fix edge cases with adding/removing observers | packages/ember-metal/lib/observer.js | @@ -10,94 +10,96 @@ require('ember-metal/array');
var AFTER_OBSERVERS = ':change';
var BEFORE_OBSERVERS = ':before';
+
var guidFor = Ember.guidFor;
var deferred = 0;
-var array_Slice = [].slice;
-
-var ObserverSet = function () {
- this.targetSet = {};
-};
-ObserverSet.prototype.add = function (target, path) {
- var targetSet = this.targetSet,
- targetGuid = Ember.guidFor(target),
- pathSet = targetSet[targetGuid];
- if (!pathSet) {
- targetSet[targetGuid] = pathSet = {};
- }
- if (pathSet[path]) {
- return false;
- } else {
- return pathSet[path] = true;
- }
-};
-ObserverSet.prototype.clear = function () {
- this.targetSet = {};
-};
-var DeferredEventQueue = function() {
- this.targetSet = {};
- this.queue = [];
-};
+/*
+ this.observerSet = {
+ [senderGuid]: { // variable name: `keySet`
+ [keyName]: listIndex
+ }
+ },
+ this.observers = [
+ {
+ sender: obj,
+ keyName: keyName,
+ eventName: eventName,
+ listeners: {
+ [targetGuid]: { // variable name: `actionSet`
+ [methodGuid]: { // variable name: `action`
+ target: [Object object],
+ method: [Function function]
+ }
+ }
+ }
+ },
+ ...
+ ]
+*/
+function ObserverSet() {
+ this.clear();
+}
-DeferredEventQueue.prototype.push = function(target, eventName, keyName) {
- var targetSet = this.targetSet,
- queue = this.queue,
- targetGuid = Ember.guidFor(target),
- eventNameSet = targetSet[targetGuid],
- index;
+ObserverSet.prototype.add = function(sender, keyName, eventName) {
+ var observerSet = this.observerSet,
+ observers = this.observers,
+ senderGuid = Ember.guidFor(sender),
+ keySet = observerSet[senderGuid],
+ index;
- if (!eventNameSet) {
- targetSet[targetGuid] = eventNameSet = {};
+ if (!keySet) {
+ observerSet[senderGuid] = keySet = {};
}
- index = eventNameSet[eventName];
+ index = keySet[keyName];
if (index === undefined) {
- eventNameSet[eventName] = queue.push(Ember.deferEvent(target, eventName, [target, keyName])) - 1;
- } else {
- queue[index] = Ember.deferEvent(target, eventName, [target, keyName]);
+ index = observers.push({
+ sender: sender,
+ keyName: keyName,
+ eventName: eventName,
+ listeners: {}
+ }) - 1;
+ keySet[keyName] = index;
}
+ return observers[index].listeners;
};
-DeferredEventQueue.prototype.flush = function() {
- var queue = this.queue;
- this.queue = [];
- this.targetSet = {};
- for (var i=0, len=queue.length; i < len; ++i) {
- queue[i]();
+ObserverSet.prototype.flush = function() {
+ var observers = this.observers, i, len, observer, sender;
+ this.clear();
+ for (i=0, len=observers.length; i < len; ++i) {
+ observer = observers[i];
+ sender = observer.sender;
+ if (sender.isDestroyed) { continue; }
+ Ember.sendEvent(sender, observer.eventName, [sender, observer.keyName], observer.listeners);
}
};
-var queue = new DeferredEventQueue(), beforeObserverSet = new ObserverSet();
-
-function notifyObservers(obj, eventName, keyName, forceNotification) {
- if (deferred && !forceNotification) {
- queue.push(obj, eventName, keyName);
- } else {
- Ember.sendEvent(obj, eventName, [obj, keyName]);
- }
-}
-
-function flushObserverQueue() {
- beforeObserverSet.clear();
+ObserverSet.prototype.clear = function() {
+ this.observerSet = {};
+ this.observers = [];
+};
- queue.flush();
-}
+var beforeObserverSet = new ObserverSet(), observerSet = new ObserverSet();
/**
@method beginPropertyChanges
@chainable
*/
Ember.beginPropertyChanges = function() {
deferred++;
- return this;
};
/**
@method endPropertyChanges
*/
Ember.endPropertyChanges = function() {
deferred--;
- if (deferred<=0) flushObserverQueue();
+ if (deferred<=0) {
+ beforeObserverSet.clear();
+ observerSet.flush();
+ }
};
/**
@@ -234,25 +236,27 @@ Ember.removeBeforeObserver = function(obj, path, target, method) {
return this;
};
-Ember.notifyObservers = function(obj, keyName) {
+Ember.notifyBeforeObservers = function(obj, keyName) {
if (obj.isDestroying) { return; }
- notifyObservers(obj, changeEvent(keyName), keyName);
+ var eventName = beforeEvent(keyName), listeners, listenersDiff;
+ if (deferred) {
+ listeners = beforeObserverSet.add(obj, keyName, eventName);
+ listenersDiff = Ember.listenersDiff(obj, eventName, listeners);
+ Ember.sendEvent(obj, eventName, [obj, keyName], listenersDiff);
+ } else {
+ Ember.sendEvent(obj, eventName, [obj, keyName]);
+ }
};
-Ember.notifyBeforeObservers = function(obj, keyName) {
+Ember.notifyObservers = function(obj, keyName) {
if (obj.isDestroying) { return; }
- var guid, set, forceNotification = false;
-
+ var eventName = changeEvent(keyName), listeners;
if (deferred) {
- if (beforeObserverSet.add(obj, keyName)) {
- forceNotification = true;
- } else {
- return;
- }
+ listeners = observerSet.add(obj, keyName, eventName);
+ Ember.listenersUnion(obj, eventName, listeners);
+ } else {
+ Ember.sendEvent(obj, eventName, [obj, keyName]);
}
-
- notifyObservers(obj, beforeEvent(keyName), keyName, forceNotification);
};
- | true |
Other | emberjs | ember.js | 5ebcd2187c9ce059dd20224e6f6f3c697527954b.json | add another edge case | packages/ember-metal/tests/observer_test.js | @@ -774,8 +774,10 @@ testBoth("observers added/removed during changeProperties should do the right th
var addedAfterFirstChangeObserver = new Observer();
var addedAfterLastChangeObserver = new Observer();
var removedBeforeFirstChangeObserver = new Observer();
+ var removedBeforeLastChangeObserver = new Observer();
var removedAfterLastChangeObserver = new Observer();
removedBeforeFirstChangeObserver.add();
+ removedBeforeLastChangeObserver.add();
removedAfterLastChangeObserver.add();
Ember.changeProperties(function () {
removedBeforeFirstChangeObserver.remove();
@@ -787,6 +789,7 @@ testBoth("observers added/removed during changeProperties should do the right th
equal(addedBeforeFirstChangeObserver.didChangeCount, 0, 'addObserver called before the first change is deferred');
addedAfterFirstChangeObserver.add();
+ removedBeforeLastChangeObserver.remove();
set(obj, 'foo', 2);
@@ -805,6 +808,8 @@ testBoth("observers added/removed during changeProperties should do the right th
equal(addedAfterFirstChangeObserver.didChangeCount, 1, 'addObserver called after the first change sees 1');
equal(addedAfterLastChangeObserver.willChangeCount, 0, 'addBeforeObserver called after the last change sees none');
equal(addedAfterLastChangeObserver.didChangeCount, 0, 'addObserver called after the last change sees none');
+ equal(removedBeforeLastChangeObserver.willChangeCount, 1, 'removeBeforeObserver called before the last change still sees 1');
+ equal(removedBeforeLastChangeObserver.didChangeCount, 1, 'removeObserver called before the last change still sees 1');
equal(removedAfterLastChangeObserver.willChangeCount, 1, 'removeBeforeObserver called after the last change still sees 1');
equal(removedAfterLastChangeObserver.didChangeCount, 1, 'removeObserver called after the last change still sees 1');
}); | false |
Other | emberjs | ember.js | 8555c0f5d616e8594362cebf5a3b4c0f146afe08.json | Use markdown syntax | packages/ember-runtime/lib/mixins/enumerable.js | @@ -42,7 +42,7 @@ function iter(key, value) {
can use any of these methods on simple arrays. If Array already implements
one of these methods, the mixin will not override them.
- h3. Writing Your Own Enumerable
+ ## Writing Your Own Enumerable
To make your own custom class enumerable, you need two items:
@@ -57,7 +57,7 @@ function iter(key, value) {
to your class and you will be able to enumerate the contents of your object
like any other collection.
- h3. Using Ember Enumeration with Other Libraries
+ ## Using Ember Enumeration with Other Libraries
Many other libraries provide some kind of iterator or enumeration like
facility. This is often where the most common API conflicts occur. | false |
Other | emberjs | ember.js | 4260efe344c02a8a3b195162746a7d40bb95d5fb.json | add tests for Em.View#nearestOfType | packages/ember-views/tests/views/view/nearest_of_type_test.js | @@ -0,0 +1,37 @@
+var set = Ember.set, get = Ember.get;
+
+module("Ember.View#nearestOfType");
+
+(function() {
+ var Mixin = Ember.Mixin.create({}),
+ Parent = Ember.View.extend(Mixin, {
+ render: function(buffer) {
+ this.appendChild( Ember.View.create() );
+ }
+ });
+
+ test("nearestOfType should find the closest view by view class", function() {
+ var parent, child;
+
+ Ember.run(function() {
+ parent = Parent.create();
+ parent.appendTo('#qunit-fixture');
+ });
+
+ child = parent.get('childViews')[0];
+ equal(child.nearestOfType(Parent), parent, "finds closest view in the hierarchy by class");
+ });
+
+ test("nearestOfType should find the closest view by mixin", function() {
+ var parent, child;
+
+ Ember.run(function() {
+ parent = Parent.create();
+ parent.appendTo('#qunit-fixture');
+ });
+
+ child = parent.get('childViews')[0];
+ equal(child.nearestOfType(Mixin), parent, "finds closest view in the hierarchy by class");
+ });
+
+}());
\ No newline at end of file | false |
Other | emberjs | ember.js | e754cf4d289745279e1801eb97e0fd639164b67b.json | TabPane: prefer nearestOfType to nearestInstanceOf | packages/ember-handlebars/lib/controls/tabs/tab_pane_view.js | @@ -13,7 +13,7 @@ var get = Ember.get;
*/
Ember.TabPaneView = Ember.View.extend({
tabsContainer: Ember.computed(function() {
- return this.nearestInstanceOf(Ember.TabContainerView);
+ return this.nearestOfType(Ember.TabContainerView);
}).property().volatile(),
isVisible: Ember.computed(function() { | true |
Other | emberjs | ember.js | e754cf4d289745279e1801eb97e0fd639164b67b.json | TabPane: prefer nearestOfType to nearestInstanceOf | packages/ember-views/lib/views/view.js | @@ -1040,7 +1040,7 @@ Ember.View = Ember.CoreView.extend(
@return Ember.CollectionView
*/
collectionView: Ember.computed(function() {
- return this.nearestInstanceOf(Ember.CollectionView);
+ return this.nearestOfType(Ember.CollectionView);
}),
/** | true |
Other | emberjs | ember.js | ac54388c817881fc14072b3dfce49cfa1ef63f10.json | Fix overrideAccessors for Ember Data tests | packages/ember-metal/lib/accessors.js | @@ -162,6 +162,8 @@ set = function set(obj, keyName, value, tolerant) {
// Currently used only by Ember Data tests
if (Ember.config.overrideAccessors) {
+ Ember.get = get;
+ Ember.set = set;
Ember.config.overrideAccessors();
get = Ember.get;
set = Ember.set; | false |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | Rakefile | @@ -80,7 +80,6 @@ task :test, [:suite] => :dist do |t, args|
"package=all&jquery=git&nojshint=true",
"package=all&extendprototypes=true&nojshint=true",
"package=all&extendprototypes=true&jquery=git&nojshint=true",
- "package=all&nocpdefaultcacheable=true&nojshint=true",
"package=all&dist=build&nojshint=true"]
}
| true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/lib/controls/button.js | @@ -40,22 +40,22 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
if (typeof target !== 'string') { return target; }
return Ember.Handlebars.getPath(root, target, { data: data });
- }).property('target').cacheable(),
+ }).property('target'),
// Defaults to 'button' if tagName is 'input' or 'button'
type: Ember.computed(function(key, value) {
var tagName = this.get('tagName');
if (value !== undefined) { this._type = value; }
if (this._type !== undefined) { return this._type; }
if (tagName === 'input' || tagName === 'button') { return 'button'; }
- }).property('tagName').cacheable(),
+ }).property('tagName'),
disabled: false,
// Allow 'a' tags to act like buttons
href: Ember.computed(function() {
return this.get('tagName') === 'a' ? '#' : null;
- }).property('tagName').cacheable(),
+ }).property('tagName'),
mouseDown: function() {
if (!get(this, 'disabled')) { | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/lib/controls/select.js | @@ -325,7 +325,7 @@ Ember.Select = Ember.View.extend(
var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
return valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection');
- }).property('selection').cacheable(),
+ }).property('selection'),
/**
If given, a top-most dummy option will be rendered to serve as a user
@@ -510,7 +510,7 @@ Ember.SelectOption = Ember.View.extend({
Ember.defineProperty(this, 'label', Ember.computed(function() {
return get(this, labelPath);
- }).property(labelPath).cacheable());
+ }).property(labelPath));
}, 'parentView.optionLabelPath'),
valuePathDidChange: Ember.observer(function() {
@@ -520,6 +520,6 @@ Ember.SelectOption = Ember.View.extend({
Ember.defineProperty(this, 'value', Ember.computed(function() {
return get(this, valuePath);
- }).property(valuePath).cacheable());
+ }).property(valuePath));
}, 'parentView.optionValuePath')
}); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/tests/controls/select_test.js | @@ -461,7 +461,7 @@ test("works from a template with bindings", function() {
fullName: Ember.computed(function() {
return this.get('firstName') + " " + this.get('lastName');
- }).property('firstName', 'lastName').cacheable()
+ }).property('firstName', 'lastName')
});
var erik = Person.create({id: 4, firstName: 'Erik', lastName: 'Bryn'}); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/tests/handlebars_test.js | @@ -112,7 +112,7 @@ test("template view should call the function of the associated template with its
personName: Ember.computed(function() {
this._i++;
return this._personName + this._i;
- }).cacheable(),
+ }),
templates: Ember.Object.create({
test_template: Ember.Handlebars.compile("<h1 id='twas-called'>template was called for {{personName}}. Yea {{personName}}</h1>") | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/tests/helpers/yield_test.js | @@ -69,7 +69,7 @@ test("templates should yield to block, when the yield is embedded in a hierarchy
indexArray[i] = i;
}
return indexArray;
- }).property().cacheable()
+ }).property()
});
view = Ember.View.create({ | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-handlebars/tests/views/collection_view_test.js | @@ -446,7 +446,7 @@ test("should render multiple, bound nested collections (#68)", function() {
template: Ember.Handlebars.compile('{{#collection TemplateTests.InnerList class="inner"}}{{content}}{{/collection}}{{content}}'),
innerListContent: Ember.computed(function() {
return Ember.A([1,2,3]);
- }).cacheable()
+ })
});
TemplateTests.OuterList = Ember.CollectionView.extend({ | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-metal/lib/computed.js | @@ -8,7 +8,7 @@ require('ember-metal/watching');
@module ember-metal
*/
-Ember.warn("Computed properties will soon be cacheable by default. To enable this in your app, set `ENV.CP_DEFAULT_CACHEABLE = true`.", Ember.CP_DEFAULT_CACHEABLE);
+Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
var get = Ember.get,
@@ -119,7 +119,7 @@ function removeDependentKeys(desc, obj, keyName, meta) {
*/
function ComputedProperty(func, opts) {
this.func = func;
- this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : Ember.CP_DEFAULT_CACHEABLE;
+ this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
this._dependentKeys = opts && opts.dependentKeys;
}
@@ -140,7 +140,7 @@ var ComputedPropertyPrototype = ComputedProperty.prototype;
// After calculating the value of this function, Ember.js will
// return that value without re-executing this function until
// one of the dependent properties change.
- }.property('firstName', 'lastName').cacheable()
+ }.property('firstName', 'lastName')
});
Properties are cacheable by default.
@@ -401,7 +401,7 @@ Ember.cacheFor = function cacheFor(obj, key) {
Ember.computed.not = function(dependentKey) {
return Ember.computed(dependentKey, function(key) {
return !get(this, dependentKey);
- }).cacheable();
+ });
};
/**
@@ -413,7 +413,7 @@ Ember.computed.empty = function(dependentKey) {
return Ember.computed(dependentKey, function(key) {
var val = get(this, dependentKey);
return val === undefined || val === null || val === '' || (Ember.isArray(val) && get(val, 'length') === 0);
- }).cacheable();
+ });
};
/**
@@ -424,5 +424,5 @@ Ember.computed.empty = function(dependentKey) {
Ember.computed.bool = function(dependentKey) {
return Ember.computed(dependentKey, function(key) {
return !!get(this, dependentKey);
- }).cacheable();
+ });
}; | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-metal/lib/core.js | @@ -109,20 +109,6 @@ Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION !
*/
Ember.SHIM_ES5 = (Ember.ENV.SHIM_ES5 === false) ? false : Ember.EXTEND_PROTOTYPES;
-
-/**
- Determines whether computed properties are cacheable by default.
- This option will be removed for the 1.1 release.
-
- When caching is enabled by default, you can use `volatile()` to disable
- caching on individual computed properties.
-
- @property CP_DEFAULT_CACHEABLE
- @type Boolean
- @default true
-*/
-Ember.CP_DEFAULT_CACHEABLE = (Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
-
/**
Empty function. Useful for some operations.
| true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-metal/lib/properties.js | @@ -69,7 +69,7 @@ var Descriptor = Ember.Descriptor = function() {};
// define a computed property
Ember.defineProperty(contact, 'fullName', Ember.computed(function() {
return this.firstName+' '+this.lastName;
- }).property('firstName', 'lastName').cacheable());
+ }).property('firstName', 'lastName'));
@method defineProperty
@for Ember | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-metal/tests/computed_test.js | @@ -181,7 +181,7 @@ module('Ember.computed - cacheable', {
Ember.defineProperty(obj, 'foo', Ember.computed(function() {
count++;
return 'bar '+count;
- }).cacheable());
+ }));
},
teardown: function() {
@@ -230,7 +230,7 @@ testBoth('cacheFor should return falsy cached values', function(get, set) {
Ember.defineProperty(obj, 'falsy', Ember.computed(function() {
return false;
- }).cacheable());
+ }));
equal(Ember.cacheFor(obj, 'falsy'), undefined, "should not yet be a cached value");
@@ -250,7 +250,7 @@ module('Ember.computed - dependentkey', {
Ember.defineProperty(obj, 'foo', Ember.computed(function() {
count++;
return 'bar '+count;
- }).property('bar').cacheable());
+ }).property('bar'));
},
teardown: function() {
@@ -293,7 +293,7 @@ testBoth('should invalidate multiple nested dependent keys', function(get, set)
Ember.defineProperty(obj, 'bar', Ember.computed(function() {
count++;
return 'baz '+count;
- }).property('baz').cacheable());
+ }).property('baz'));
equal(Ember.isWatching(obj, 'bar'), false, 'precond not watching dependent key');
equal(Ember.isWatching(obj, 'baz'), false, 'precond not watching dependent key');
@@ -317,12 +317,12 @@ testBoth('circular keys should not blow up', function(get, set) {
Ember.defineProperty(obj, 'bar', Ember.computed(function() {
count++;
return 'bar '+count;
- }).property('foo').cacheable());
+ }).property('foo'));
Ember.defineProperty(obj, 'foo', Ember.computed(function() {
count++;
return 'foo '+count;
- }).property('bar').cacheable());
+ }).property('bar'));
equal(get(obj, 'foo'), 'foo 1', 'get once');
equal(get(obj, 'foo'), 'foo 1', 'cached retrieve');
@@ -342,7 +342,7 @@ testBoth('redefining a property should undo old depenent keys', function(get ,se
Ember.defineProperty(obj, 'foo', Ember.computed(function() {
count++;
return 'baz '+count;
- }).property('baz').cacheable());
+ }).property('baz'));
equal(Ember.isWatching(obj, 'bar'), false, 'after redefining should not be watching dependent key');
@@ -399,7 +399,7 @@ testBoth('depending on simple chain', function(get, set) {
// assign computed property
Ember.defineProperty(obj, 'prop',
- Ember.computed(func).property('foo.bar.baz.biff').cacheable());
+ Ember.computed(func).property('foo.bar.baz.biff'));
equal(get(obj, 'prop'), 'BIFF 1');
@@ -447,7 +447,7 @@ testBoth('depending on Global chain', function(get, set) {
Ember.defineProperty(obj, 'prop', Ember.computed(function() {
count++;
return Ember.get('Global.foo.bar.baz.biff')+' '+count;
- }).property('Global.foo.bar.baz.biff').cacheable());
+ }).property('Global.foo.bar.baz.biff'));
equal(get(obj, 'prop'), 'BIFF 1');
@@ -490,8 +490,8 @@ testBoth('depending on Global chain', function(get, set) {
});
testBoth('chained dependent keys should evaluate computed properties lazily', function(get,set){
- Ember.defineProperty(obj.foo.bar, 'b', Ember.computed(func).property().cacheable());
- Ember.defineProperty(obj.foo, 'c', Ember.computed(function(){}).property('bar.b').cacheable());
+ Ember.defineProperty(obj.foo.bar, 'b', Ember.computed(func).property());
+ Ember.defineProperty(obj.foo, 'c', Ember.computed(function(){}).property('bar.b'));
equal(count, 0, 'b should not run');
});
@@ -530,7 +530,7 @@ testBoth('setting a watched computed property', function(get, set) {
return value;
}
return get(this, 'firstName') + ' ' + get(this, 'lastName');
- }).property('firstName', 'lastName').cacheable()
+ }).property('firstName', 'lastName')
);
var fullNameWillChange = 0,
fullNameDidChange = 0,
@@ -586,7 +586,7 @@ testBoth('setting a cached computed property that modifies the value you give it
return value + 1;
}
return get(this, 'foo') + 1;
- }).property('foo').cacheable()
+ }).property('foo')
);
var plusOneWillChange = 0,
plusOneDidChange = 0; | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-metal/tests/observer_test.js | @@ -683,7 +683,7 @@ testBoth('setting a cached computed property whose value has changed should trig
Ember.defineProperty(obj, 'foo', Ember.computed(function(key, value) {
if (arguments.length === 2) { return value; }
return get(this, 'baz');
- }).property('baz').cacheable());
+ }).property('baz'));
var count = 0;
@@ -727,7 +727,7 @@ testBoth("immediate observers should fire synchronously", function(get, set) {
return value;
}
return "yes hello this is foo";
- }).cacheable());
+ }));
equal(get(obj, 'foo'), "yes hello this is foo", "precond - computed property returns a value");
equal(observerCalled, 0, "observer has not yet been called"); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-routing/lib/routable.js | @@ -161,7 +161,7 @@ Ember.Routable = Ember.Mixin.create({
*/
isRoutable: Ember.computed(function() {
return typeof get(this, 'route') === 'string';
- }).cacheable(),
+ }),
/**
@private
@@ -174,7 +174,7 @@ Ember.Routable = Ember.Mixin.create({
isLeafRoute: Ember.computed(function() {
if (get(this, 'isLeaf')) { return true; }
return !get(this, 'childStates').findProperty('isRoutable');
- }).cacheable(),
+ }),
/**
@private
@@ -190,7 +190,7 @@ Ember.Routable = Ember.Mixin.create({
if (route) {
return Ember._RouteMatcher.create({ route: route });
}
- }).cacheable(),
+ }),
/**
@private
@@ -206,7 +206,7 @@ Ember.Routable = Ember.Mixin.create({
if (routeMatcher) {
return routeMatcher.identifiers.length > 0;
}
- }).cacheable(),
+ }),
/**
@private
@@ -226,7 +226,7 @@ Ember.Routable = Ember.Mixin.create({
} else {
return modelType;
}
- }).cacheable(),
+ }),
/**
@private
@@ -474,7 +474,7 @@ Ember.Routable = Ember.Mixin.create({
}
return 'application';
- }).cacheable(),
+ }),
_template: Ember.computed(function(key, value) {
if (arguments.length > 1) { return value; }
@@ -492,7 +492,7 @@ Ember.Routable = Ember.Mixin.create({
baseName = baseName.replace(/Route$/, '');
return baseName.charAt(0).toLowerCase() + baseName.substr(1);
}
- }).cacheable(),
+ }),
render: function(options) {
options = options || {}; | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/mixins/array.js | @@ -120,15 +120,15 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
'[]': Ember.computed(function(key, value) {
if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
return this ;
- }).property().cacheable(),
+ }).property(),
firstObject: Ember.computed(function() {
return this.objectAt(0);
- }).property().cacheable(),
+ }).property(),
lastObject: Ember.computed(function() {
return this.objectAt(get(this, 'length')-1);
- }).property().cacheable(),
+ }).property(),
// optimized version from Enumerable
contains: function(obj){
@@ -293,7 +293,7 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
*/
hasArrayObservers: Ember.computed(function() {
return Ember.hasListeners(this, '@array:change') || Ember.hasListeners(this, '@array:before');
- }).property().cacheable(),
+ }).property(),
/**
If you are implementing an object that supports Ember.Array, call this
@@ -390,6 +390,6 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
'@each': Ember.computed(function() {
if (!this.__each) this.__each = new Ember.EachProxy(this);
return this.__each;
- }).property().cacheable()
+ }).property()
}) ; | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/mixins/deferred.js | @@ -46,5 +46,5 @@ Ember.Deferred = Ember.Mixin.create({
promise: Ember.computed(function() {
return new RSVP.Promise();
- }).cacheable()
+ })
}); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/mixins/enumerable.js | @@ -137,7 +137,7 @@ Ember.Enumerable = Ember.Mixin.create(
ret = this.nextObject(0, null, context);
pushCtx(context);
return ret ;
- }).property('[]').cacheable(),
+ }).property('[]'),
/**
Helper method returns the last object from a collection. If your enumerable
@@ -163,7 +163,7 @@ Ember.Enumerable = Ember.Mixin.create(
} while (cur !== undefined);
pushCtx(context);
return last;
- }).property('[]').cacheable(),
+ }).property('[]'),
/**
Returns true if the passed object can be found in the receiver. The
@@ -637,7 +637,7 @@ Ember.Enumerable = Ember.Mixin.create(
*/
'[]': Ember.computed(function(key, value) {
return this;
- }).property().cacheable(),
+ }).property(),
// ..........................................................
// ENUMERABLE OBSERVERS
@@ -691,7 +691,7 @@ Ember.Enumerable = Ember.Mixin.create(
*/
hasEnumerableObservers: Ember.computed(function() {
return Ember.hasListeners(this, '@enumerable:change') || Ember.hasListeners(this, '@enumerable:before');
- }).property().cacheable(),
+ }).property(),
/** | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/mixins/sortable.js | @@ -105,7 +105,7 @@ Ember.SortableMixin = Ember.Mixin.create(Ember.MutableEnumerable, {
}
return content;
- }).cacheable(),
+ }),
_contentWillChange: Ember.beforeObserver(function() {
var content = get(this, 'content'), | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/mixins/target_action_support.js | @@ -24,7 +24,7 @@ Ember.TargetActionSupport = Ember.Mixin.create({
} else {
return target;
}
- }).property('target').cacheable(),
+ }).property('target'),
triggerAction: function() {
var action = get(this, 'action'), | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/system/array_proxy.js | @@ -63,7 +63,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,
*/
arrangedContent: Ember.computed('content', function() {
return get(this, 'content');
- }).cacheable(),
+ }),
/**
Should actually retrieve the object at the specified index from the
@@ -205,7 +205,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,
var arrangedContent = get(this, 'arrangedContent');
return arrangedContent ? get(arrangedContent, 'length') : 0;
// No dependencies since Enumerable notifies length of change
- }).property().cacheable(),
+ }).property(),
replace: function(idx, amt, objects) {
Ember.assert('The content property of '+ this.constructor + ' should be set before modifying it', this.get('content')); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/system/each_proxy.js | @@ -27,7 +27,7 @@ var EachArray = Ember.Object.extend(Ember.Array, {
length: Ember.computed(function() {
var content = this._content;
return content ? get(content, 'length') : 0;
- }).property().cacheable()
+ }).property()
});
| true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/lib/system/set.js | @@ -335,12 +335,12 @@ Ember.Set = Ember.CoreObject.extend(Ember.MutableEnumerable, Ember.Copyable, Emb
// more optimized version
firstObject: Ember.computed(function() {
return this.length > 0 ? this[0] : undefined;
- }).property().cacheable(),
+ }).property(),
// more optimized version
lastObject: Ember.computed(function() {
return this.length > 0 ? this[this.length-1] : undefined;
- }).property().cacheable(),
+ }).property(),
// implements Ember.MutableEnumerable
addObject: function(obj) { | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/legacy_1x/mixins/observable/observable_test.js | @@ -331,7 +331,7 @@ module("Computed properties", {
computedCached: Ember.computed(function(key, value) {
this.computedCachedCalls.push(value);
return 'computedCached';
- }).property().cacheable(),
+ }).property(),
// DEPENDENT KEYS
@@ -354,19 +354,19 @@ module("Computed properties", {
dependentCached: Ember.computed(function(key, value) {
this.dependentCachedCalls.push(value);
return 'dependentCached';
- }).property('changer').cacheable(),
+ }).property('changer'),
// everytime it is recomputed, increments call
incCallCount: 0,
inc: Ember.computed(function() {
return this.incCallCount++;
- }).property('changer').cacheable(),
+ }).property('changer'),
// depends on cached property which depends on another property...
nestedIncCallCount: 0,
nestedInc: Ember.computed(function(key, value) {
return this.nestedIncCallCount++;
- }).property('inc').cacheable(),
+ }).property('inc'),
// two computed properties that depend on a third property
state: 'on',
@@ -538,7 +538,7 @@ test("dependent keys should be able to be specified as property paths", function
menuPrice: Ember.computed(function() {
return this.get('menu.price');
- }).property('menu.price').cacheable()
+ }).property('menu.price')
});
equal(depObj.get('menuPrice'), 5, "precond - initial value returns 5");
@@ -600,7 +600,7 @@ test("cacheable nested dependent keys should clear after their dependencies upda
price: Ember.computed(function() {
return this.get('restaurant.menu.price');
- }).property('restaurant.menu.price').cacheable()
+ }).property('restaurant.menu.price')
});
});
| true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/mixins/array_test.js | @@ -37,7 +37,7 @@ var TestArray = Ember.Object.extend(Ember.Array, {
length: Ember.computed(function() {
return this._content.length;
- }).property().cacheable(),
+ }).property(),
slice: function() {
return this._content.slice();
@@ -374,7 +374,7 @@ testBoth("should be clear caches for computed properties that have dependent key
common: Ember.computed(function() {
return get(get(this, 'resources').objectAt(0), 'common');
- }).property('resources.@each.common').cacheable()
+ }).property('resources.@each.common')
});
get(obj, 'resources').pushObject(Ember.Object.create({ common: "HI!" })); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/mixins/enumerable_test.js | @@ -26,7 +26,7 @@ var TestEnumerable = Ember.Object.extend(Ember.Enumerable, {
length: Ember.computed(function() {
return this._content.length;
- }).property().cacheable(),
+ }).property(),
slice: function() {
return this._content.slice(); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/mixins/mutable_array_test.js | @@ -33,7 +33,7 @@ var TestMutableArray = Ember.Object.extend(Ember.MutableArray, {
length: Ember.computed(function() {
return this._content.length;
- }).property().cacheable(),
+ }).property(),
slice: function() {
return this._content.slice(); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/mixins/mutable_enumerable_test.js | @@ -37,7 +37,7 @@ var TestMutableEnumerable = Ember.Object.extend(Ember.MutableEnumerable, {
length: Ember.computed(function() {
return this._content.length;
- }).property().cacheable(),
+ }).property(),
slice: function() {
return this._content.slice(); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/mixins/observable_test.js | @@ -72,7 +72,7 @@ testBoth("should be able to retrieve cached values of computed properties withou
var obj = Ember.Object.create({
foo: Ember.computed(function() {
return "foo";
- }).cacheable(),
+ }),
bar: "bar"
}); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/suites/enumerable.js | @@ -219,7 +219,7 @@ var EnumerableTests = Ember.Object.extend({
*/
canTestMutation: Ember.computed(function() {
return this.mutate !== EnumerableTests.prototype.mutate;
- }).property().cacheable(),
+ }).property(),
/**
Invoked to actually run the test - overridden by mixins | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-runtime/tests/system/object/computed_test.js | @@ -5,7 +5,7 @@ module('Ember.Object computed property');
testWithDefault('computed property on instance', function(get, set) {
var MyClass = Ember.Object.extend({
- foo: Ember.computed(function() { return 'FOO'; }).cacheable()
+ foo: Ember.computed(function() { return 'FOO'; })
});
equal(get(new MyClass(), 'foo'), 'FOO');
@@ -16,11 +16,11 @@ testWithDefault('computed property on instance', function(get, set) {
testWithDefault('computed property on subclass', function(get, set) {
var MyClass = Ember.Object.extend({
- foo: Ember.computed(function() { return 'FOO'; }).cacheable()
+ foo: Ember.computed(function() { return 'FOO'; })
});
var Subclass = MyClass.extend({
- foo: Ember.computed(function() { return 'BAR'; }).cacheable()
+ foo: Ember.computed(function() { return 'BAR'; })
});
equal(get(new Subclass(), 'foo'), 'BAR');
@@ -31,7 +31,7 @@ testWithDefault('computed property on subclass', function(get, set) {
testWithDefault('replacing computed property with regular val', function(get, set) {
var MyClass = Ember.Object.extend({
- foo: Ember.computed(function() { return 'FOO'; }).cacheable()
+ foo: Ember.computed(function() { return 'FOO'; })
});
var Subclass = MyClass.extend({
@@ -56,7 +56,7 @@ testWithDefault('complex depndent keys', function(get, set) {
foo: Ember.computed(function() {
set(this, 'count', get(this, 'count')+1);
return Ember.get(get(this, 'bar'), 'baz') + ' ' + get(this, 'count');
- }).property('bar.baz').cacheable()
+ }).property('bar.baz')
});
@@ -95,7 +95,7 @@ testWithDefault('complex depndent keys changing complex dependent keys', functio
foo: Ember.computed(function() {
set(this, 'count', get(this, 'count')+1);
return Ember.get(get(this, 'bar'), 'baz') + ' ' + get(this, 'count');
- }).property('bar.baz').cacheable()
+ }).property('bar.baz')
});
@@ -111,7 +111,7 @@ testWithDefault('complex depndent keys changing complex dependent keys', functio
foo: Ember.computed(function() {
set(this, 'count', get(this, 'count')+1);
return Ember.get(get(this, 'bar2'), 'baz') + ' ' + get(this, 'count');
- }).property('bar2.baz').cacheable()
+ }).property('bar2.baz')
});
var obj2 = new Subclass(); | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-states/lib/state.js | @@ -47,7 +47,7 @@ Ember.State = Ember.Object.extend(Ember.Evented,
}
return path;
- }).property().cacheable(),
+ }).property(),
/**
@private
@@ -144,7 +144,7 @@ Ember.State = Ember.Object.extend(Ember.Evented,
*/
isLeaf: Ember.computed(function() {
return !get(this, 'childStates').length;
- }).cacheable(),
+ }),
/**
A boolean value indicating whether the state takes a context. | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-states/lib/state_manager.js | @@ -601,7 +601,7 @@ Ember.StateManager = Ember.State.extend({
*/
currentPath: Ember.computed('currentState', function() {
return get(this, 'currentState.path');
- }).cacheable(),
+ }),
/**
The name of transitionEvent that this stateManager will dispatch | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-views/lib/views/container_view.js | @@ -10,7 +10,7 @@ var forEach = Ember.EnumerableUtils.forEach;
var childViewsProperty = Ember.computed(function() {
return get(this, '_childViews');
-}).property('_childViews').cacheable();
+}).property('_childViews');
/**
A `ContainerView` is an `Ember.View` subclass that allows for manual or programatic | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | packages/ember-views/lib/views/view.js | @@ -24,7 +24,7 @@ var childViewsProperty = Ember.computed(function() {
});
return ret;
-}).property().cacheable();
+}).property();
Ember.warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember.ENV.VIEW_PRESERVES_CONTEXT !== false);
@@ -794,7 +794,7 @@ Ember.View = Ember.CoreView.extend(
template = this.templateForName(templateName, 'template');
return template || get(this, 'defaultTemplate');
- }).property('templateName').cacheable(),
+ }).property('templateName'),
/**
The controller managing this view. If this property is set, it will be
@@ -812,7 +812,7 @@ Ember.View = Ember.CoreView.extend(
parentView = get(this, 'parentView');
return parentView ? get(parentView, 'controller') : null;
}
- }).property().cacheable(),
+ }).property(),
/**
A view may contain a layout. A layout is a regular template but
@@ -835,7 +835,7 @@ Ember.View = Ember.CoreView.extend(
layout = this.templateForName(layoutName, 'layout');
return layout || get(this, 'defaultLayout');
- }).property('layoutName').cacheable(),
+ }).property('layoutName'),
templateForName: function(name, type) {
if (!name) { return; }
@@ -907,7 +907,7 @@ Ember.View = Ember.CoreView.extend(
}
return this;
- }).cacheable(),
+ }),
/**
@private
@@ -1020,7 +1020,7 @@ Ember.View = Ember.CoreView.extend(
*/
collectionView: Ember.computed(function() {
return this.nearestInstanceOf(Ember.CollectionView);
- }).cacheable(),
+ }),
/**
Return the nearest ancestor that is a direct child of
@@ -1031,7 +1031,7 @@ Ember.View = Ember.CoreView.extend(
*/
itemView: Ember.computed(function() {
return this.nearestChildOf(Ember.CollectionView);
- }).cacheable(),
+ }),
/**
Return the nearest ancestor that has the property
@@ -1042,7 +1042,7 @@ Ember.View = Ember.CoreView.extend(
*/
contentView: Ember.computed(function() {
return this.nearestWithProperty('content');
- }).cacheable(),
+ }),
/**
@private
@@ -1363,7 +1363,7 @@ Ember.View = Ember.CoreView.extend(
} else {
return this.invokeForState('getElement');
}
- }).property('_parentView').cacheable(),
+ }).property('_parentView'),
/**
Returns a jQuery object for this view's element. If you pass in a selector
@@ -1542,7 +1542,7 @@ Ember.View = Ember.CoreView.extend(
*/
elementId: Ember.computed(function(key, value) {
return value !== undefined ? value : Ember.guidFor(this);
- }).cacheable(),
+ }),
// TODO: Perhaps this should be removed from the production build somehow.
_elementIdDidChange: Ember.beforeObserver(function() { | true |
Other | emberjs | ember.js | 5ef55f22c584abc788fd98994af591f010ba82e9.json | Remove CP_DEFAULT_CACHEABLE flag
Computed Properties will always be cached by default. Use `volatile` to
change this on a per-property basis. | tests/index.html | @@ -70,12 +70,6 @@
var extendPrototypes = QUnit.urlParams.extendprototypes;
ENV['EXTEND_PROTOTYPES'] = !!extendPrototypes;
- // Handle CP cacheable by default
- QUnit.config.urlConfig.push('nocpdefaultcacheable');
-
- var noCpDefaultCacheable = QUnit.urlParams.nocpdefaultcacheable;
- ENV['CP_DEFAULT_CACHEABLE'] = !noCpDefaultCacheable;
-
// Don't worry about jQuery version
ENV['FORCE_JQUERY'] = true;
</script> | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | Rakefile | @@ -81,7 +81,6 @@ task :test, [:suite] => :dist do |t, args|
"package=all&extendprototypes=true&nojshint=true",
"package=all&extendprototypes=true&jquery=git&nojshint=true",
"package=all&nocpdefaultcacheable=true&nojshint=true",
- "package=all&noviewpreservescontext=true&nojshint=true",
"package=all&dist=build&nojshint=true"]
}
| true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/lib/helpers/outlet.js | @@ -51,11 +51,7 @@ Ember.Handlebars.registerHelper('outlet', function(property, options) {
property = 'view';
}
- if(Ember.VIEW_PRESERVES_CONTEXT) {
- options.hash.currentViewBinding = "view.context." + property;
- } else {
- options.hash.currentViewBinding = "controller." + property;
- }
+ options.hash.currentViewBinding = "view.context." + property;
return Ember.Handlebars.helpers.view.call(this, Ember.Handlebars.OutletView, options);
}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/lib/helpers/view.js | @@ -11,7 +11,6 @@ require("ember-handlebars");
var get = Ember.get, set = Ember.set;
var PARENT_VIEW_PATH = /^parentView\./;
var EmberHandlebars = Ember.Handlebars;
-var VIEW_PRESERVES_CONTEXT = Ember.VIEW_PRESERVES_CONTEXT;
EmberHandlebars.ViewHelper = Ember.Object.create({
@@ -143,7 +142,7 @@ EmberHandlebars.ViewHelper = Ember.Object.create({
// We only want to override the `_context` computed property if there is
// no specified controller. See View#_context for more information.
- if (VIEW_PRESERVES_CONTEXT && !newView.proto().controller && !newView.proto().controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
+ if (!newView.proto().controller && !newView.proto().controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
viewOptions._context = thisContext;
}
| true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/tests/handlebars_test.js | @@ -220,23 +220,13 @@ test("child views can be inserted using the {{view}} Handlebars helper", functio
templates: templates
});
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- view.set('cruel', "cruel");
- } else {
- TemplateTests.LabelView.reopen({ cruel: "cruel" });
- }
+ view.set('cruel', "cruel");
appendView();
ok(view.$("#hello-world:contains('Hello world!')").length, "The parent view renders its contents");
-
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- ok(view.$("#child-view:contains('Goodbye cruel world!')").length === 1, "The child view renders its content once");
- ok(view.$().text().match(/Hello world!.*Goodbye cruel world\!/), "parent view should appear before the child view");
- } else {
- ok(view.$("#child-view:contains('Goodbye cruel world?')").length === 1, "The child view renders its content once");
- ok(view.$().text().match(/Hello world!.*Goodbye cruel world\?/), "parent view should appear before the child view");
- }
+ ok(view.$("#child-view:contains('Goodbye cruel world!')").length === 1, "The child view renders its content once");
+ ok(view.$().text().match(/Hello world!.*Goodbye cruel world\!/), "parent view should appear before the child view");
});
test("should accept relative paths to views", function() {
@@ -281,23 +271,14 @@ test("child views can be inserted inside a bind block", function() {
templates: templates
});
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- view.set('content', Ember.Object.create({ blah: "wot" }));
- } else {
- TemplateTests.BQView.reopen({ content: Ember.Object.create({ blah: "wot" }) });
- }
+ view.set('content', Ember.Object.create({ blah: "wot" }));
appendView();
ok(view.$("#hello-world:contains('Hello world!')").length, "The parent view renders its contents");
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- ok(view.$("blockquote").text().match(/Goodbye.*wot.*cruel.*world\!/), "The child view renders its content once");
- ok(view.$().text().match(/Hello world!.*Goodbye.*wot.*cruel.*world\!/), "parent view should appear before the child view");
- } else {
- ok(view.$("blockquote").text().match(/Goodbye.*wot.*cruel.*world\?/), "The child view renders its content once");
- ok(view.$().text().match(/Hello world!.*Goodbye.*wot.*cruel.*world\?/), "parent view should appear before the child view");
- }
+ ok(view.$("blockquote").text().match(/Goodbye.*wot.*cruel.*world\!/), "The child view renders its content once");
+ ok(view.$().text().match(/Hello world!.*Goodbye.*wot.*cruel.*world\!/), "parent view should appear before the child view");
});
test("Ember.View should bind properties in the parent context", function() {
@@ -767,77 +748,46 @@ test("views set the template of their children to a passed block", function() {
ok(view.$('h1:has(span)').length === 1, "renders the passed template inside the parent template");
});
-if (Ember.VIEW_PRESERVES_CONTEXT) {
-
- test("views render their template in the context of the parent view's context", function() {
- var templates = Ember.Object.create({
- parent: Ember.Handlebars.compile('<h1>{{#with content}}{{#view}}{{firstName}} {{lastName}}{{/view}}{{/with}}</h1>')
- });
-
- view = Ember.View.create({
- templates: templates,
- templateName: 'parent',
-
- content: {
- firstName: "Lana",
- lastName: "del Heeeyyyyyy"
- }
- });
-
- appendView();
- equal(view.$('h1').text(), "Lana del Heeeyyyyyy", "renders properties from parent context");
+test("views render their template in the context of the parent view's context", function() {
+ var templates = Ember.Object.create({
+ parent: Ember.Handlebars.compile('<h1>{{#with content}}{{#view}}{{firstName}} {{lastName}}{{/view}}{{/with}}</h1>')
});
- test("views make a view keyword available that allows template to reference view context", function() {
- var templates = Ember.Object.create({
- parent: Ember.Handlebars.compile('<h1>{{#with content}}{{#view subview}}{{view.firstName}} {{lastName}}{{/view}}{{/with}}</h1>')
- });
-
- view = Ember.View.create({
- templates: templates,
- templateName: 'parent',
-
- content: {
- subview: Ember.View.extend({
- firstName: "Brodele"
- }),
- firstName: "Lana",
- lastName: "del Heeeyyyyyy"
- }
- });
+ view = Ember.View.create({
+ templates: templates,
+ templateName: 'parent',
- appendView();
- equal(view.$('h1').text(), "Brodele del Heeeyyyyyy", "renders properties from parent context");
+ content: {
+ firstName: "Lana",
+ lastName: "del Heeeyyyyyy"
+ }
});
-} else {
-
- test("should pass hash arguments to the view object", function() {
- TemplateTests.bindTestObject = Ember.Object.create({
- bar: 'bat'
- });
-
- TemplateTests.HashArgTemplateView = Ember.View.extend({
- });
-
- Ember.run(function() {
- view = Ember.View.create({
- template: Ember.Handlebars.compile('{{#view TemplateTests.HashArgTemplateView fooBinding="TemplateTests.bindTestObject.bar"}}{{foo}}{{/view}}')
- });
-
- appendView();
- });
+ appendView();
+ equal(view.$('h1').text(), "Lana del Heeeyyyyyy", "renders properties from parent context");
+});
- equal(view.$().text(), "bat", "prints initial bound value");
+test("views make a view keyword available that allows template to reference view context", function() {
+ var templates = Ember.Object.create({
+ parent: Ember.Handlebars.compile('<h1>{{#with content}}{{#view subview}}{{view.firstName}} {{lastName}}{{/view}}{{/with}}</h1>')
+ });
- Ember.run(function() {
- set(TemplateTests.bindTestObject, 'bar', 'brains');
- });
+ view = Ember.View.create({
+ templates: templates,
+ templateName: 'parent',
- equal(view.$().text(), "brains", "prints updated bound value");
+ content: {
+ subview: Ember.View.extend({
+ firstName: "Brodele"
+ }),
+ firstName: "Lana",
+ lastName: "del Heeeyyyyyy"
+ }
});
-}
+ appendView();
+ equal(view.$('h1').text(), "Brodele del Heeeyyyyyy", "renders properties from parent context");
+});
test("should warn if setting a template on a view with a templateName already specified", function() {
view = Ember.View.create({
@@ -2304,9 +2254,7 @@ test("should update bound values after view's parent is removed and then re-appe
})
});
- var targetView = Ember.VIEW_PRESERVES_CONTEXT ? parentView : parentView.get('testView');
-
- targetView.setProperties({
+ parentView.setProperties({
showStuff: true,
boundValue: "foo"
});
@@ -2318,29 +2266,29 @@ test("should update bound values after view's parent is removed and then re-appe
equal(Ember.$.trim(view.$().text()), "foo");
Ember.run(function() {
- set(targetView, 'showStuff', false);
+ set(parentView, 'showStuff', false);
});
equal(Ember.$.trim(view.$().text()), "Not true.");
Ember.run(function() {
- set(targetView, 'showStuff', true);
+ set(parentView, 'showStuff', true);
});
equal(Ember.$.trim(view.$().text()), "foo");
Ember.run(function() {
parentView.remove();
- set(targetView, 'showStuff', false);
+ set(parentView, 'showStuff', false);
});
Ember.run(function() {
- set(targetView, 'showStuff', true);
+ set(parentView, 'showStuff', true);
});
Ember.run(function() {
parentView.appendTo('#qunit-fixture');
});
Ember.run(function() {
- set(targetView, 'boundValue', "bar");
+ set(parentView, 'boundValue', "bar");
});
equal(Ember.$.trim(view.$().text()), "bar");
}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/tests/helpers/each_test.js | @@ -270,72 +270,68 @@ test("it works with the controller keyword", function() {
equal(view.$().text(), "foobarbaz");
});
-if (Ember.VIEW_PRESERVES_CONTEXT) {
+module("{{#each foo in bar}}");
- module("{{#each foo in bar}}");
-
- test("#each accepts a name binding and does not change the context", function() {
- view = Ember.View.create({
- template: templateFor("{{#each item in items}}{{title}} {{item}}{{/each}}"),
- title: "My Cool Each Test",
- items: Ember.A([1, 2])
- });
-
- append(view);
-
- equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+test("#each accepts a name binding and does not change the context", function() {
+ view = Ember.View.create({
+ template: templateFor("{{#each item in items}}{{title}} {{item}}{{/each}}"),
+ title: "My Cool Each Test",
+ items: Ember.A([1, 2])
});
- test("#each accepts a name binding and can display child properties", function() {
- view = Ember.View.create({
- template: templateFor("{{#each item in items}}{{title}} {{item.name}}{{/each}}"),
- title: "My Cool Each Test",
- items: Ember.A([{ name: 1 }, { name: 2 }])
- });
+ append(view);
- append(view);
+ equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+});
- equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+test("#each accepts a name binding and can display child properties", function() {
+ view = Ember.View.create({
+ template: templateFor("{{#each item in items}}{{title}} {{item.name}}{{/each}}"),
+ title: "My Cool Each Test",
+ items: Ember.A([{ name: 1 }, { name: 2 }])
});
- test("#each accepts 'this' as the right hand side", function() {
- view = Ember.View.create({
- template: templateFor("{{#each item in this}}{{view.title}} {{item.name}}{{/each}}"),
- title: "My Cool Each Test",
- controller: Ember.A([{ name: 1 }, { name: 2 }])
- });
+ append(view);
- append(view);
+ equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+});
- equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+test("#each accepts 'this' as the right hand side", function() {
+ view = Ember.View.create({
+ template: templateFor("{{#each item in this}}{{view.title}} {{item.name}}{{/each}}"),
+ title: "My Cool Each Test",
+ controller: Ember.A([{ name: 1 }, { name: 2 }])
});
- test("views inside #each preserve the new context", function() {
- var controller = Ember.A([ { name: "Adam" }, { name: "Steve" } ]);
+ append(view);
- view = Ember.View.create({
- controller: controller,
- template: templateFor('{{#each controller}}{{#view}}{{name}}{{/view}}{{/each}}')
- });
+ equal(view.$().text(), "My Cool Each Test 1My Cool Each Test 2");
+});
- append(view);
+test("views inside #each preserve the new context", function() {
+ var controller = Ember.A([ { name: "Adam" }, { name: "Steve" } ]);
- equal(view.$().text(), "AdamSteve");
+ view = Ember.View.create({
+ controller: controller,
+ template: templateFor('{{#each controller}}{{#view}}{{name}}{{/view}}{{/each}}')
});
- test("controller is assignable inside an #each", function() {
- var controller = Ember.ArrayController.create({
- content: Ember.A([ { name: "Adam" }, { name: "Steve" } ])
- });
+ append(view);
- view = Ember.View.create({
- controller: controller,
- template: templateFor('{{#each itemController in this}}{{#view controllerBinding="itemController"}}{{name}}{{/view}}{{/each}}')
- });
+ equal(view.$().text(), "AdamSteve");
+});
- append(view);
+test("controller is assignable inside an #each", function() {
+ var controller = Ember.ArrayController.create({
+ content: Ember.A([ { name: "Adam" }, { name: "Steve" } ])
+ });
- equal(view.$().text(), "AdamSteve");
+ view = Ember.View.create({
+ controller: controller,
+ template: templateFor('{{#each itemController in this}}{{#view controllerBinding="itemController"}}{{name}}{{/view}}{{/each}}')
});
-}
+ append(view);
+
+ equal(view.$().text(), "AdamSteve");
+}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/tests/helpers/if_unless_test.js | @@ -14,18 +14,14 @@ module("Handlebars {{#if}} and {{#unless}} helpers", {
}
});
-if (Ember.VIEW_PRESERVES_CONTEXT) {
+test("unless should keep the current context (#784)", function() {
+ view = Ember.View.create({
+ o: Ember.Object.create({foo: '42'}),
- test("unless should keep the current context (#784)", function() {
- view = Ember.View.create({
- o: Ember.Object.create({foo: '42'}),
-
- template: Ember.Handlebars.compile('{{#with o}}{{#view Ember.View}}{{#unless view.doesNotExist}}foo: {{foo}}{{/unless}}{{/view}}{{/with}}')
- });
-
- appendView(view);
-
- equal(view.$().text(), 'foo: 42');
+ template: Ember.Handlebars.compile('{{#with o}}{{#view Ember.View}}{{#unless view.doesNotExist}}foo: {{foo}}{{/unless}}{{/view}}{{/with}}')
});
-}
+ appendView(view);
+
+ equal(view.$().text(), 'foo: 42');
+}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/tests/helpers/outlet_test.js | @@ -58,26 +58,24 @@ test("outlet should allow controllers to fill in slots in prerender state", func
equal(view.$().text(), 'HIBYE');
});
-if(Ember.VIEW_PRESERVES_CONTEXT) {
- test("outlet should allow a view's default context to fill in slots", function() {
- var template = "<h1>HI</h1>{{outlet}}";
- view = Ember.View.create({
- template: Ember.Handlebars.compile(template)
- });
-
- appendView(view);
+test("outlet should allow a view's default context to fill in slots", function() {
+ var template = "<h1>HI</h1>{{outlet}}";
+ view = Ember.View.create({
+ template: Ember.Handlebars.compile(template)
+ });
- equal(view.$().text(), 'HI');
+ appendView(view);
- Ember.run(function() {
- view.set('view', Ember.View.create({
- template: compile("<p>BYE</p>")
- }));
- });
+ equal(view.$().text(), 'HI');
- equal(view.$().text(), 'HIBYE');
+ Ember.run(function() {
+ view.set('view', Ember.View.create({
+ template: compile("<p>BYE</p>")
+ }));
});
-}
+
+ equal(view.$().text(), 'HIBYE');
+});
test("outlet should support an optional name", function() {
var controller = Ember.Object.create(); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-handlebars/tests/helpers/with_test.js | @@ -122,22 +122,20 @@ test("it should support #with foo as bar, then #with bar as qux", function() {
equal(view.$().text(), "butterfly", "should update");
});
-if (Ember.VIEW_PRESERVES_CONTEXT) {
- module("Handlebars {{#with this as foo}}");
+module("Handlebars {{#with this as foo}}");
- test("it should support #with this as qux", function() {
- var view = Ember.View.create({
- template: Ember.Handlebars.compile("{{#with this as person}}{{person.name}}{{/with}}"),
- controller: Ember.Object.create({ name: "Los Pivots" })
- });
-
- appendView(view);
- equal(view.$().text(), "Los Pivots", "should be properly scoped");
+test("it should support #with this as qux", function() {
+ var view = Ember.View.create({
+ template: Ember.Handlebars.compile("{{#with this as person}}{{person.name}}{{/with}}"),
+ controller: Ember.Object.create({ name: "Los Pivots" })
+ });
- Ember.run(function() {
- Ember.set(view, 'controller.name', "l'Pivots");
- });
+ appendView(view);
+ equal(view.$().text(), "Los Pivots", "should be properly scoped");
- equal(view.$().text(), "l'Pivots", "should update");
+ Ember.run(function() {
+ Ember.set(view, 'controller.name', "l'Pivots");
});
-}
+
+ equal(view.$().text(), "l'Pivots", "should update");
+}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-metal/lib/core.js | @@ -123,46 +123,6 @@ Ember.SHIM_ES5 = (Ember.ENV.SHIM_ES5 === false) ? false : Ember.EXTEND_PROTOTYPE
*/
Ember.CP_DEFAULT_CACHEABLE = (Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
-/**
- Determines whether views render their templates using themselves
- as the context, or whether it is inherited from the parent. This option
- will be removed in the 1.1 release.
-
- If you need to update your application to use the new context rules, simply
- prefix property access with `view.`:
-
- Before:
-
- ``` handlebars
- {{#each App.photosController}}
- Photo Title: {{title}}
- {{#view App.InfoView contentBinding="this"}}
- {{content.date}}
- {{content.cameraType}}
- {{otherViewProperty}}
- {{/view}}
- {{/each}}
- ```
-
- After:
-
- ``` handlebars
- {{#each App.photosController}}
- Photo Title: {{title}}
- {{#view App.InfoView}}
- {{date}}
- {{cameraType}}
- {{view.otherViewProperty}}
- {{/view}}
- {{/each}}
- ```
-
- @property VIEW_PRESERVES_CONTEXT
- @type Boolean
- @default true
-*/
-Ember.VIEW_PRESERVES_CONTEXT = (Ember.ENV.VIEW_PRESERVES_CONTEXT !== false);
-
/**
Empty function. Useful for some operations.
| true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-views/lib/views/view.js | @@ -26,8 +26,7 @@ var childViewsProperty = Ember.computed(function() {
return ret;
}).property().cacheable();
-var VIEW_PRESERVES_CONTEXT = Ember.VIEW_PRESERVES_CONTEXT;
-Ember.warn("The way that the {{view}} helper affects templates is about to change. Previously, templates inside child views would use the new view as the context. Soon, views will preserve their parent context when rendering their template. You can opt-in early to the new behavior by setting `ENV.VIEW_PRESERVES_CONTEXT = true`. For more information, see https://gist.github.com/2494968. You should update your templates as soon as possible; this default will change soon, and the option will be eliminated entirely before the 1.0 release.", VIEW_PRESERVES_CONTEXT);
+Ember.warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember.ENV.VIEW_PRESERVES_CONTEXT !== false);
/**
Global hash of shared templates. This will automatically be populated
@@ -898,15 +897,13 @@ Ember.View = Ember.CoreView.extend(
return value;
}
- if (VIEW_PRESERVES_CONTEXT) {
- if (controller = get(this, 'controller')) {
- return controller;
- }
+ if (controller = get(this, 'controller')) {
+ return controller;
+ }
- parentView = get(this, '_parentView');
- if (parentView) {
- return get(parentView, '_context');
- }
+ parentView = get(this, '_parentView');
+ if (parentView) {
+ return get(parentView, '_context');
}
return this; | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-views/tests/views/container_view_test.js | @@ -157,11 +157,9 @@ test("if a ContainerView starts with a currentView, it is rendered as a child vi
equal(get(container, 'childViews.length'), 1, "should have one child view");
equal(get(container, 'childViews').objectAt(0), mainView, "should have the currentView as the only child view");
equal(mainView.get('parentView'), container, "parentView is setup");
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- equal(context, container.get('context'), 'context preserved');
- equal(templateData.keywords.controller, controller, 'templateData is setup');
- equal(templateData.keywords.view, mainView, 'templateData is setup');
- }
+ equal(context, container.get('context'), 'context preserved');
+ equal(templateData.keywords.controller, controller, 'templateData is setup');
+ equal(templateData.keywords.view, mainView, 'templateData is setup');
});
test("if a ContainerView is created with a currentView, it is rendered as a child view", function() {
@@ -190,11 +188,9 @@ test("if a ContainerView is created with a currentView, it is rendered as a chil
equal(get(container, 'childViews.length'), 1, "should have one child view");
equal(get(container, 'childViews').objectAt(0), mainView, "should have the currentView as the only child view");
equal(mainView.get('parentView'), container, "parentView is setup");
- if (Ember.VIEW_PRESERVES_CONTEXT) {
- equal(context, container.get('context'), 'context preserved');
- equal(templateData.keywords.controller, controller, 'templateData is setup');
- equal(templateData.keywords.view, mainView, 'templateData is setup');
- }
+ equal(context, container.get('context'), 'context preserved');
+ equal(templateData.keywords.controller, controller, 'templateData is setup');
+ equal(templateData.keywords.view, mainView, 'templateData is setup');
});
test("if a ContainerView starts with no currentView and then one is set, the ContainerView is updated", function() { | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-views/tests/views/view/context_test.js | @@ -1,58 +1,32 @@
module("Ember.View - context property");
-if (Ember.VIEW_PRESERVES_CONTEXT) {
- test("setting a controller on a inner view should change it context", function() {
- var App = {};
- var a = { name: 'a' };
- var b = { name: 'b' };
-
- var innerView = Ember.View.create();
- var middleView = Ember.ContainerView.create();
- var outerView = App.outerView = Ember.ContainerView.create({
- controller: a
- });
-
- Ember.run(function() {
- outerView.appendTo('#qunit-fixture');
- });
-
- Ember.run(function () {
- outerView.set('currentView', middleView);
- });
-
- Ember.run(function () {
- innerView.set('controller', b);
- middleView.set('currentView', innerView);
- });
-
- // assert
- equal(outerView.get('context'), a, 'outer context correct');
- equal(middleView.get('context'), a, 'middle context correct');
- equal(innerView.get('context'), b, 'inner context correct');
+test("setting a controller on a inner view should change it context", function() {
+ var App = {};
+ var a = { name: 'a' };
+ var b = { name: 'b' };
+
+ var innerView = Ember.View.create();
+ var middleView = Ember.ContainerView.create();
+ var outerView = App.outerView = Ember.ContainerView.create({
+ controller: a
});
-} else {
- test("context defaults to current view", function() {
- var innerView = Ember.View.create();
- var middleView = Ember.ContainerView.create();
- var outerView = Ember.ContainerView.create();
-
- Ember.run(function() {
- outerView.appendTo('#qunit-fixture');
- });
- Ember.run(function () {
- outerView.set('currentView', middleView);
- });
+ Ember.run(function() {
+ outerView.appendTo('#qunit-fixture');
+ });
- Ember.run(function () {
- middleView.set('currentView', innerView);
- });
+ Ember.run(function () {
+ outerView.set('currentView', middleView);
+ });
- // assert
- equal(outerView.get('context'), outerView, 'outer context correct');
- equal(middleView.get('context'), middleView, 'middle context correct');
- equal(innerView.get('context'), innerView, 'inner context correct');
+ Ember.run(function () {
+ innerView.set('controller', b);
+ middleView.set('currentView', innerView);
});
-}
+ // assert
+ equal(outerView.get('context'), a, 'outer context correct');
+ equal(middleView.get('context'), a, 'middle context correct');
+ equal(innerView.get('context'), b, 'inner context correct');
+});
| true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | packages/ember-views/tests/views/view/template_test.js | @@ -1,7 +1,5 @@
var set = Ember.set, get = Ember.get;
-var VIEW_PRESERVES_CONTEXT = Ember.VIEW_PRESERVES_CONTEXT;
-
module("Ember.View - Template Functionality");
test("should call the function of the associated template", function() {
@@ -111,7 +109,7 @@ test("should render an empty element if no template is specified", function() {
});
test("should provide a controller to the template if a controller is specified on the view", function() {
- expect(VIEW_PRESERVES_CONTEXT ? 7 : 5);
+ expect(7);
var Controller1 = Ember.Object.extend({
toString: function() { return "Controller1"; }
@@ -194,9 +192,6 @@ test("should provide a controller to the template if a controller is specified o
strictEqual(optionsDataKeywordsControllerForView, controller1, "passes the original controller in the data");
strictEqual(optionsDataKeywordsControllerForChildView, controller1, "passes the controller in the data to child views");
-
- if (VIEW_PRESERVES_CONTEXT) {
- strictEqual(contextForView, controller2, "passes the controller in as the main context of the parent view");
- strictEqual(contextForControllerlessView, controller1, "passes the controller in as the main context of the child view");
- }
+ strictEqual(contextForView, controller2, "passes the controller in as the main context of the parent view");
+ strictEqual(contextForControllerlessView, controller1, "passes the controller in as the main context of the child view");
}); | true |
Other | emberjs | ember.js | 710d1e1ab55a60edd259d8a3cd9c7467e1b50c41.json | Remove VIEW_PRESERVES_CONTEXT flag
Functionality can no longer be disabled. | tests/index.html | @@ -76,12 +76,6 @@
var noCpDefaultCacheable = QUnit.urlParams.nocpdefaultcacheable;
ENV['CP_DEFAULT_CACHEABLE'] = !noCpDefaultCacheable;
- // Handle preserving context
- QUnit.config.urlConfig.push('noviewpreservescontext');
-
- var noViewPreservesContext = QUnit.urlParams.noviewpreservescontext;
- ENV['VIEW_PRESERVES_CONTEXT'] = !noViewPreservesContext;
-
// Don't worry about jQuery version
ENV['FORCE_JQUERY'] = true;
</script> | true |
Other | emberjs | ember.js | b0c4adb23fb6bce43291f217d45294fa486b09b8.json | Replace willRerender with willClearRender
This should also fix some memory leaks with
observers previously not torn down on parent
view destruction. | packages/ember-handlebars/lib/helpers/action.js | @@ -53,7 +53,7 @@ ActionHelper.registerAction = function(actionName, options) {
}
};
- options.view.on('willRerender', function() {
+ options.view.on('willClearRender', function() {
delete ActionHelper.registeredActions[actionId];
});
| true |
Other | emberjs | ember.js | b0c4adb23fb6bce43291f217d45294fa486b09b8.json | Replace willRerender with willClearRender
This should also fix some memory leaks with
observers previously not torn down on parent
view destruction. | packages/ember-handlebars/lib/helpers/binding.js | @@ -59,11 +59,7 @@ function bind(property, options, preserveContext, shouldDisplay, valueNormalizer
if (path !== '') {
Ember.addObserver(pathRoot, path, observer);
- view.one('willRerender', function() {
- Ember.removeObserver(pathRoot, path, observer);
- });
-
- view.one('willDestroyElement', function() {
+ view.one('willClearRender', function() {
Ember.removeObserver(pathRoot, path, observer);
});
}
@@ -87,14 +83,15 @@ function simpleBind(property, options) {
// Set up observers for observable objects
if ('object' === typeof this) {
- var bindView = view.createChildView(Ember._SimpleHandlebarsView, {
+ var bindView = Ember._SimpleHandlebarsView.create().setProperties({
path: path,
pathRoot: pathRoot,
isEscaped: !options.hash.unescaped,
previousContext: currentContext,
templateData: options.data
});
+ view.createChildView(bindView);
view.appendChild(bindView);
var observer = function() {
@@ -108,12 +105,7 @@ function simpleBind(property, options) {
if (path !== '') {
Ember.addObserver(pathRoot, path, observer);
- // TODO: willClear
- view.one('willRerender', function() {
- Ember.removeObserver(pathRoot, path, observer);
- });
-
- view.one('willDestroyElement', function() {
+ view.one('willClearRender', function() {
Ember.removeObserver(pathRoot, path, observer);
});
}
@@ -385,7 +377,7 @@ EmberHandlebars.registerHelper('bindAttr', function(options) {
if (path !== 'this') {
Ember.addObserver(pathRoot, path, invoker);
- view.one('willRerender', function() {
+ view.one('willClearRender', function() {
Ember.removeObserver(pathRoot, path, invoker);
});
}
@@ -506,7 +498,7 @@ EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId,
if (path !== '' && path !== 'this') {
Ember.addObserver(pathRoot, path, invoker);
- view.one('willRerender', function() {
+ view.one('willClearRender', function() {
Ember.removeObserver(pathRoot, path, invoker);
});
} | true |
Other | emberjs | ember.js | b0c4adb23fb6bce43291f217d45294fa486b09b8.json | Replace willRerender with willClearRender
This should also fix some memory leaks with
observers previously not torn down on parent
view destruction. | packages/ember-views/lib/views/states/in_buffer.js | @@ -24,7 +24,7 @@ Ember.View.states.inBuffer = {
rerender: function(view) {
Ember.deprecate("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM. Because this is avoidable and the cause of significant performance issues in applications, this behavior is deprecated. If you want to use the debugger to find out what caused this, you can set ENV.RAISE_ON_DEPRECATION to true.");
- view._notifyWillRerender();
+ view._notifyWillClearRender();
view.clearRenderedChildren();
view.renderToBuffer(view.buffer, 'replaceWith'); | true |
Other | emberjs | ember.js | b0c4adb23fb6bce43291f217d45294fa486b09b8.json | Replace willRerender with willClearRender
This should also fix some memory leaks with
observers previously not torn down on parent
view destruction. | packages/ember-views/lib/views/states/in_dom.js | @@ -35,7 +35,7 @@ Ember.View.states.hasElement = {
// once the view has been inserted into the DOM, rerendering is
// deferred to allow bindings to synchronize.
rerender: function(view) {
- view._notifyWillRerender();
+ view._notifyWillClearRender();
view.clearRenderedChildren();
| true |
Other | emberjs | ember.js | b0c4adb23fb6bce43291f217d45294fa486b09b8.json | Replace willRerender with willClearRender
This should also fix some memory leaks with
observers previously not torn down on parent
view destruction. | packages/ember-views/lib/views/view.js | @@ -1276,7 +1276,7 @@ Ember.View = Ember.CoreView.extend(
addObserver(this, parsedPath.path, observer);
- this.one('willRerender', function() {
+ this.one('willClearRender', function() {
removeObserver(this, parsedPath.path, observer);
});
}, this);
@@ -1315,7 +1315,7 @@ Ember.View = Ember.CoreView.extend(
addObserver(this, property, observer);
- this.one('willRerender', function() {
+ this.one('willClearRender', function() {
removeObserver(this, property, observer);
});
@@ -1608,9 +1608,9 @@ Ember.View = Ember.CoreView.extend(
been torn down. This is a good opportunity to tear down any manual
observers you have installed based on the DOM state
- @event willRerender
+ @event willClearRender
*/
- willRerender: Ember.K,
+ willClearRender: Ember.K,
/**
@private
@@ -1673,14 +1673,14 @@ Ember.View = Ember.CoreView.extend(
/**
@private
- Invokes the receiver's willRerender() method if it exists and then
- invokes the same on all child views.
+ Triggers the `willClearRender` event (which invokes the `willClearRender()`
+ method if it exists) on this view and all child views.
- @method _notifyWillRerender
+ @method _notifyWillClearRender
*/
- _notifyWillRerender: function() {
+ _notifyWillClearRender: function() {
this.invokeRecursively(function(view) {
- view.trigger('willRerender');
+ view.trigger('willClearRender');
});
},
@@ -1718,11 +1718,14 @@ Ember.View = Ember.CoreView.extend(
/**
@private
- Invokes the `willDestroyElement` callback on the view and child views.
+ Triggers the `willClearRender` event (which invokes the `willClearRender()`
+ method if it exists) on this view and all child views.
@method _notifyWillDestroyElement
*/
_notifyWillDestroyElement: function() {
+ this._notifyWillClearRender();
+
this.invokeRecursively(function(view) {
view.trigger('willDestroyElement');
}); | true |
Other | emberjs | ember.js | 7a19600404fc75f5eb8b26f7c4c34cb4393d05ea.json | Consolidate CoreView a bit and fix leaks | packages/ember-handlebars/lib/helpers/binding.js | @@ -62,6 +62,10 @@ function bind(property, options, preserveContext, shouldDisplay, valueNormalizer
view.one('willRerender', function() {
Ember.removeObserver(pathRoot, path, observer);
});
+
+ view.one('willDestroyElement', function() {
+ Ember.removeObserver(pathRoot, path, observer);
+ });
}
} else {
// The object is not observable, so just render it out and
@@ -108,6 +112,10 @@ function simpleBind(property, options) {
view.one('willRerender', function() {
Ember.removeObserver(pathRoot, path, observer);
});
+
+ view.one('willDestroyElement', function() {
+ Ember.removeObserver(pathRoot, path, observer);
+ });
}
} else {
// The object is not observable, so just render it out and | true |
Other | emberjs | ember.js | 7a19600404fc75f5eb8b26f7c4c34cb4393d05ea.json | Consolidate CoreView a bit and fix leaks | packages/ember-views/lib/views/view.js | @@ -49,6 +49,14 @@ var invokeForState = {
};
Ember.CoreView = Ember.Object.extend(Ember.Evented, {
+ init: function() {
+ this._super();
+
+ // Register the view for event handling. This hash is used by
+ // Ember.EventDispatcher to dispatch incoming events.
+ if (!this.isVirtual) Ember.View.views[get(this, 'elementId')] = this;
+ },
+
/**
If the view is currently inserted into the DOM of a parent view, this
property will point to the parent of the view.
@@ -194,10 +202,29 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, {
return Ember.typeOf(this[name]) === 'function' || this._super(name);
},
+ willDestroy: function() {
+ var parent = get(this, '_parentView');
+
+ // destroy the element -- this will avoid each child view destroying
+ // the element over and over again...
+ if (!this.removedFromDOM) { this.destroyElement(); }
+
+ // remove from parent if found. Don't call removeFromParent,
+ // as removeFromParent will try to remove the element from
+ // the DOM again.
+ if (parent) { parent.removeChild(this); }
+
+ this.state = 'destroyed';
+
+ // next remove view from global hash
+ if (!this.isVirtual) delete Ember.View.views[get(this, 'elementId')];
+ },
+
clearRenderedChildren: Ember.K,
invokeRecursively: Ember.K,
invalidateRecursively: Ember.K,
transitionTo: Ember.K,
+ destroyElement: Ember.K,
_notifyWillInsertElement: Ember.K,
_notifyDidInsertElement: Ember.K
});
@@ -1902,10 +1929,6 @@ Ember.View = Ember.CoreView.extend(
init: function() {
this._super();
- // Register the view for event handling. This hash is used by
- // Ember.EventDispatcher to dispatch incoming events.
- if (!this.isVirtual) Ember.View.views[get(this, 'elementId')] = this;
-
// setup child views. be sure to clone the child views array first
this._childViews = this._childViews.slice();
| true |
Other | emberjs | ember.js | 12741f7e413687ccc73190d8ab041259256d4ba5.json | Fix instrumentation tests | packages/ember-metal/tests/instrumentation_test.js | @@ -22,7 +22,7 @@ test("subscribing to a simple path receives the listener", function() {
strictEqual(name, "render.handlebars");
}
- ok(timestamp instanceof Date);
+ ok(typeof timestamp === 'number');
strictEqual(payload, sentPayload);
},
@@ -33,7 +33,7 @@ test("subscribing to a simple path receives the listener", function() {
strictEqual(name, "render.handlebars");
}
- ok(timestamp instanceof Date);
+ ok(typeof timestamp === 'number');
strictEqual(payload, sentPayload);
count++;
@@ -111,7 +111,7 @@ test("it is possible to add a new subscriber after the first instrument", functi
}
});
- instrument.instrument("render.handlebars", function() {});
+ instrument.instrument("render.handlebars", null, function() {});
});
test("it is possible to remove a subscriber", function() {
@@ -131,9 +131,9 @@ test("it is possible to remove a subscriber", function() {
}
});
- instrument.instrument("render.handlebars", function() {});
+ instrument.instrument("render.handlebars", null, function() {});
instrument.unsubscribe(subscriber);
- instrument.instrument("render.handlebars", function() {});
+ instrument.instrument("render.handlebars", null, function() {});
}); | false |
Other | emberjs | ember.js | 0ddf21a77620b88ddd9a7f679c98f88df8a95b1a.json | Fix instrumentation patterns | packages/ember-metal/lib/instrumentation.js | @@ -98,22 +98,23 @@ Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
};
Ember.Instrumentation.subscribe = function(pattern, object) {
- var paths = pattern.split("."), path, regex = "^";
+ var paths = pattern.split("."), path, regex = [];
for (var i=0, l=paths.length; i<l; i++) {
path = paths[i];
if (path === "*") {
- regex = regex + "[^\\.]*";
+ regex.push("[^\\.]*");
} else {
- regex = regex + path;
+ regex.push(path);
}
}
+ regex = regex.join("\\.");
regex = regex + "(\\..*)?";
var subscriber = {
pattern: pattern,
- regex: new RegExp(regex + "$"),
+ regex: new RegExp("^" + regex + "$"),
object: object
};
| false |
Other | emberjs | ember.js | 50de50ea046009dc10c1c3e574581db77add3d1a.json | Add performance.now() and fix view stuff | packages/ember-metal/lib/instrumentation.js | @@ -58,6 +58,14 @@ var populateListeners = function(name) {
return listeners;
};
+var time = (function() {
+ var perf = window.performance || {};
+ var fn = perf.now || perf.mozNow || perf.webkitNow || perf.msNow || perf.oNow;
+ // fn.bind will be available in all the browsers that support the advanced window.performance... ;-)
+ return fn ? fn.bind(perf) : function() { return +new Date(); };
+})();
+
+
Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
var listeners = cache[name];
@@ -72,7 +80,7 @@ Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
try {
for (i=0, l=listeners.length; i<l; i++) {
listener = listeners[i];
- beforeValues[i] = listener.before(name, new Date(), payload);
+ beforeValues[i] = listener.before(name, time(), payload);
}
ret = callback.call(binding);
@@ -82,7 +90,7 @@ Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
} finally {
for (i=0, l=listeners.length; i<l; i++) {
listener = listeners[i];
- listener.after(name, new Date(), payload, beforeValues[i]);
+ listener.after(name, time(), payload, beforeValues[i]);
}
}
| true |
Other | emberjs | ember.js | 50de50ea046009dc10c1c3e574581db77add3d1a.json | Add performance.now() and fix view stuff | packages/ember-views/lib/views/view.js | @@ -1642,7 +1642,9 @@ Ember.View = Ember.Object.extend(Ember.Evented,
*/
renderToBuffer: function(parentBuffer, bufferOperation) {
var name = get(this, 'instrumentName'),
- details = this.instrumentDetails({});
+ details = {};
+
+ this.instrumentDetails(details);
return Ember.instrument(name, details, function() {
return this._renderToBuffer(parentBuffer, bufferOperation); | true |
Other | emberjs | ember.js | 299cdf8d5efd7107fc8c68869867402fa5b94421.json | Fix instrumentation and add render instruments | packages/ember-handlebars/lib/views/handlebars_bound_view.js | @@ -25,6 +25,7 @@ require('ember-handlebars/views/metamorph_view');
@private
*/
Ember._HandlebarsBoundView = Ember._MetamorphView.extend({
+ instrumentName: 'render.boundHandlebars',
/**
The function used to determine if the `displayTemplate` or | true |
Other | emberjs | ember.js | 299cdf8d5efd7107fc8c68869867402fa5b94421.json | Fix instrumentation and add render instruments | packages/ember-metal/lib/instrumentation.js | @@ -65,17 +65,17 @@ Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
listeners = populateListeners(name);
}
- if (listeners.length === 0) { return; }
+ if (listeners.length === 0) { return callback.call(binding); }
- var beforeValues = [], listener, i, l;
+ var beforeValues = [], listener, ret, i, l;
try {
for (i=0, l=listeners.length; i<l; i++) {
listener = listeners[i];
beforeValues[i] = listener.before(name, new Date(), payload);
}
- callback.call(binding);
+ ret = callback.call(binding);
} catch(e) {
payload = payload || {};
payload.exception = e;
@@ -85,6 +85,8 @@ Ember.Instrumentation.instrument = function(name, payload, callback, binding) {
listener.after(name, new Date(), payload, beforeValues[i]);
}
}
+
+ return ret;
};
Ember.Instrumentation.subscribe = function(pattern, object) { | true |
Other | emberjs | ember.js | 299cdf8d5efd7107fc8c68869867402fa5b94421.json | Fix instrumentation and add render instruments | packages/ember-views/lib/views/container_view.js | @@ -328,6 +328,8 @@ Ember.ContainerView = Ember.View.extend({
});
},
+ instrumentName: 'render.container',
+
/**
@private
| true |
Other | emberjs | ember.js | 299cdf8d5efd7107fc8c68869867402fa5b94421.json | Fix instrumentation and add render instruments | packages/ember-views/lib/views/view.js | @@ -1641,6 +1641,22 @@ Ember.View = Ember.Object.extend(Ember.Evented,
be used.
*/
renderToBuffer: function(parentBuffer, bufferOperation) {
+ var name = get(this, 'instrumentName'),
+ details = this.instrumentDetails({});
+
+ return Ember.instrument(name, details, function() {
+ return this._renderToBuffer(parentBuffer, bufferOperation);
+ }, this);
+ },
+
+ instrumentName: 'render.view',
+
+ instrumentDetails: function(hash) {
+ hash.template = get(this, 'templateName');
+ hash.type = this.constructor.toString();
+ },
+
+ _renderToBuffer: function(parentBuffer, bufferOperation) {
var buffer;
Ember.run.sync(); | true |
Other | emberjs | ember.js | 972d310aebd73a85bad819121617d5adb506fa50.json | Add Ember.String.classify() to string extensions | packages/ember-runtime/lib/ext/string.js | @@ -14,7 +14,8 @@ var fmt = Ember.String.fmt,
camelize = Ember.String.camelize,
decamelize = Ember.String.decamelize,
dasherize = Ember.String.dasherize,
- underscore = Ember.String.underscore;
+ underscore = Ember.String.underscore,
+ classify = Ember.String.classify;
if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
@@ -88,5 +89,14 @@ if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
return underscore(this);
};
+ /**
+ See {{#crossLink "Ember.String/classify"}}{{/crossLink}}
+
+ @method classify
+ @for String
+ */
+ String.prototype.classify = function() {
+ return classify(this);
+ };
}
| true |
Other | emberjs | ember.js | 972d310aebd73a85bad819121617d5adb506fa50.json | Add Ember.String.classify() to string extensions | packages/ember-runtime/tests/system/string/classify.js | @@ -0,0 +1,29 @@
+module('Ember.String.classify');
+
+test("classify normal string", function() {
+ deepEqual(Ember.String.classify('my favorite items'), 'MyFavoriteItems');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('my favorite items'.classify(), 'MyFavoriteItems');
+ }
+});
+
+test("classify dasherized string", function() {
+ deepEqual(Ember.String.classify('css-class-name'), 'CssClassName');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('css-class-name'.classify(), 'CssClassName');
+ }
+});
+
+test("classify underscored string", function() {
+ deepEqual(Ember.String.classify('action_name'), 'ActionName');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('action_name'.classify(), 'ActionName');
+ }
+});
+
+test("does nothing with classified string", function() {
+ deepEqual(Ember.String.classify('InnerHTML'), 'InnerHTML');
+ if (Ember.EXTEND_PROTOTYPES) {
+ deepEqual('InnerHTML'.classify(), 'InnerHTML');
+ }
+}); | true |
Other | emberjs | ember.js | 0c25a1c7b96f05b1db4993f4672cebdabeeec7d0.json | Add basic attributeBinding docs | packages/ember-handlebars/lib/controls/text_area.js | @@ -20,6 +20,20 @@ var get = Ember.get, set = Ember.set;
Because HTML `textarea` elements do not contain inner HTML the `layout` and `layoutName`
properties will not be applied. See `Ember.View`'s layout section for more information.
+ ## HTML Attributes
+
+ By default `Ember.TextArea` provides support for `rows`, `cols`, `placeholder`, `disabled`,
+ `maxlength` and `tabindex` attributes on a textarea. If you need to support more
+ attributes have a look at the `attributeBindings` property in `Ember.View`'s HTML Attributes section.
+
+ To globally add support for additional attributes you can reopen `Ember.TextArea` or `Ember.TextSupport`.
+
+ ``` javascript
+ Ember.TextSupport.reopen({
+ attributeBindings: ["required"]
+ })
+ ```
+
@class TextArea
@namespace Ember
@extends Ember.View | true |
Other | emberjs | ember.js | 0c25a1c7b96f05b1db4993f4672cebdabeeec7d0.json | Add basic attributeBinding docs | packages/ember-handlebars/lib/controls/text_field.js | @@ -25,6 +25,22 @@ var get = Ember.get, set = Ember.set;
Because HTML `input` elements are self closing `layout` and `layoutName` properties will
not be applied. See `Ember.View`'s layout section for more information.
+ ## HTML Attributes
+
+ By default `Ember.TextField` provides support for `type`, `value`, `size`, `placeholder`,
+ `disabled`, `maxlength` and `tabindex` attributes on a textarea. If you need to support
+ more attributes have a look at the `attributeBindings` property in `Ember.View`'s
+ HTML Attributes section.
+
+ To globally add support for additional attributes you can reopen `Ember.TextField` or
+ `Ember.TextSupport`.
+
+ ``` javascript
+ Ember.TextSupport.reopen({
+ attributeBindings: ["required"]
+ })
+ ```
+
@class TextField
@namespace Ember
@extends Ember.View | true |
Other | emberjs | ember.js | 1b34a2a115fa7fbc65de37f867ab8e4db410c5d1.json | Use rsvp.js in Deferred mixin | .jshintrc | @@ -5,6 +5,7 @@
"DS",
"Handlebars",
"Metamorph",
+ "RSVP",
"ember_assert",
"ember_warn",
"ember_deprecate", | true |
Other | emberjs | ember.js | 1b34a2a115fa7fbc65de37f867ab8e4db410c5d1.json | Use rsvp.js in Deferred mixin | Assetfile | @@ -85,7 +85,7 @@ end
distros = {
:runtime => %w(ember-metal ember-runtime),
- :full => %w(ember-metal ember-runtime ember-application ember-views ember-states ember-routing ember-viewstates metamorph ember-handlebars)
+ :full => %w(ember-metal rsvp ember-runtime ember-application ember-views ember-states ember-routing ember-viewstates metamorph ember-handlebars)
}
output "dist" | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.