Fix $extend to exclude prototype properties.

Add fix for Firefox's Object.prototype.watch conflict. Fixes jdorn#256 Fixes jdorn#249
mbrodala · Sep 28, 2014 · 80a4d4e · 80a4d4e
1 parent a97cc2a
commit 80a4d4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/editor.js b/src/editor.js
@@ -87,7 +87,7 @@ JSONEditor.AbstractEditor = Class.extend({
     };
 
     this.register();
-    if(this.schema.watch) {
+    if(this.schema.hasOwnProperty('watch')) {
       var path,path_parts,first,root,adjusted_path;
 
       for(var name in this.schema.watch) {

diff --git a/src/utilities.js b/src/utilities.js
@@ -20,8 +20,9 @@ var $extend = function(destination) {
   for(i=1; i<arguments.length; i++) {
     source = arguments[i];
     for (property in source) {
+      if(!source.hasOwnProperty(property)) continue;
       if(source[property] && $isplainobject(source[property])) {
-        destination[property] = destination[property] || {};
+        if(!destination.hasOwnProperty(property)) destination[property] = {};
         $extend(destination[property], source[property]);
       }
       else {