ember-source 2.18.2 → 2.18.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ember",
3
- "version": "2.18.2",
3
+ "version": "2.18.3+96faeee4",
4
4
  "license": "MIT",
5
5
  "homepage": "https://github.com/emberjs/ember.js",
6
6
  "main": [
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ember",
3
3
  "repo": "components/ember",
4
- "version": "2.18.2",
4
+ "version": "2.18.3+96faeee4",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/emberjs/ember.js",
7
7
  "main": "ember.debug.js",
@@ -25,5 +25,5 @@
25
25
  }
26
26
  }
27
27
  },
28
- "version": "2.18.2"
28
+ "version": "2.18.3+96faeee4"
29
29
  }
@@ -6,7 +6,7 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.18.2
9
+ * @version 2.18.3+96faeee4
10
10
  */
11
11
 
12
12
  /*global process */
@@ -4258,7 +4258,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
4258
4258
  }
4259
4259
  }
4260
4260
 
4261
- function _getPath(root, path) {
4261
+ function _getPath(root, path, forSet) {
4262
4262
  var obj = root;
4263
4263
  var parts = path.split('.');
4264
4264
 
@@ -4267,7 +4267,12 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
4267
4267
  return undefined;
4268
4268
  }
4269
4269
 
4270
- obj = get(obj, parts[i]);
4270
+ var part = parts[i];
4271
+ if (forSet && (part === '__proto__' || part === 'constructor')) {
4272
+ return;
4273
+ }
4274
+
4275
+ obj = get(obj, part);
4271
4276
 
4272
4277
  if (obj && obj.isDestroyed) {
4273
4278
  return undefined;
@@ -4394,7 +4399,7 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
4394
4399
 
4395
4400
  var newPath = parts.join('.');
4396
4401
 
4397
- var newRoot = _getPath(root, newPath);
4402
+ var newRoot = _getPath(root, newPath, true);
4398
4403
 
4399
4404
  if (newRoot) {
4400
4405
  return set(newRoot, keyName, value);