linting settings.js

src/settings.js

@@ -1,8 +1,11 @@
+"use strict";
+
 var meta = require('./meta');
 
 function expandObjBy(obj1, obj2) {
 	var key, val1, val2, changed = false;
 	for (key in obj2) {
+		if (obj2.hasOwnProperty(key)) {
 			val2 = obj2[key];
 			val1 = obj1[key];
 			if (!obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
@@ -12,12 +15,14 @@ function expandObjBy(obj1, obj2) {
 				changed = true;
 			}
 		}
+	}
 	return changed;
 }
 
 function trim(obj1, obj2) {
 	var key, val1;
 	for (key in obj1) {
+		if (obj1.hasOwnProperty(key)) {
 			val1 = obj1[key];
 			if (!obj2.hasOwnProperty(key)) {
 				delete obj1[key];
@@ -26,6 +31,7 @@ function trim(obj1, obj2) {
 			}
 		}	
 	}
+}
 
 function mergeSettings(cfg, defCfg) {
 	if (typeof defCfg !== 'object') {