Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions packages/ember-runtime/lib/system/core_object.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ var finishPartial = Mixin.finishPartial;
var reopen = Mixin.prototype.reopen;
var hasCachedComputedProperties = false;

const FALSE_DESCRIPTOR = {
configurable: true,
writable: true,
enumerable: false,
value: false
};

function makeCtor() {
// Note: avoid accessing any properties on the object since it makes the
// method a lot faster. This is glue code so we want it to be as fast as
Expand All @@ -67,7 +74,18 @@ function makeCtor() {
initProperties = [arguments[0]];
}

this.__defineNonEnumerable({
name: 'isDestroying',
descriptor: FALSE_DESCRIPTOR
});

this.__defineNonEnumerable({
name: 'isDestroyed',
descriptor: FALSE_DESCRIPTOR
});

this.__defineNonEnumerable(GUID_KEY_PROPERTY);

var m = meta(this);
var proto = m.proto;
m.proto = this;
Expand Down
9 changes: 4 additions & 5 deletions packages/ember/tests/routing/query_params_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import RSVP from 'ember-runtime/ext/rsvp';
import Route from 'ember-routing/system/route';
import run from 'ember-metal/run_loop';
import get from 'ember-metal/property_get';
import EmberObject from 'ember-runtime/system/object';
import isEnabled from 'ember-metal/features';
import { computed } from 'ember-metal/computed';
import { compile } from 'ember-template-compiler/tests/utils/helpers';
Expand Down Expand Up @@ -2551,11 +2550,11 @@ if (isEnabled('ember-routing-route-configured-query-params')) {

let indexModelCount = 0;
App.IndexRoute = Route.extend({
queryParams: EmberObject.create({
queryParams: {
unknownProperty(keyName) {
return { refreshModel: true };
}
}),
},
model(params) {
indexModelCount++;

Expand Down Expand Up @@ -2745,12 +2744,12 @@ if (isEnabled('ember-routing-route-configured-query-params')) {
});

App.ApplicationRoute = Route.extend({
queryParams: EmberObject.create({
queryParams: {
unknownProperty(keyName) {
// We are simulating all qps requiring refresh
return { replace: true };
}
})
}
});

bootApplication();
Expand Down