From d8f0ab2a16886113839ab8346f8b7b8a3b172e28 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 12 Dec 2014 16:56:02 +0400
Subject: [PATCH] fix regression in setDefaultValues

---
 lib/ace/config_test.js    | 11 +++++++++--
 lib/ace/lib/app_config.js |  7 +++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/ace/config_test.js b/lib/ace/config_test.js
index ac664fae..2883d9e5 100644
--- a/lib/ace/config_test.js
+++ b/lib/ace/config_test.js
@@ -117,12 +117,19 @@ module.exports = {
         assert.equal(o.getOption("initialValue"), 8);
         o.setOption("initialValue", 7);
         assert.equal(o.getOption("opt2"), 7);
-
+        
+        config.setDefaultValues("test_object", {
+            opt1: 1,
+            forwarded: 2
+        });
+        config.resetOptions(o);
+        assert.equal(o.getOption("opt1"), 1);
+        assert.equal(o.getOption("forwarded"), 2);
     }
 };
 
 });
 
 if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec()
+    require("asyncjs").test.testcase(module.exports).exec();
 }
diff --git a/lib/ace/lib/app_config.js b/lib/ace/lib/app_config.js
index 84b9e70c..4fe78a1d 100644
--- a/lib/ace/lib/app_config.js
+++ b/lib/ace/lib/app_config.js
@@ -31,7 +31,6 @@
 define(function(require, exports, module) {
 "no use strict";
 
-var lang = require("./lang");
 var oop = require("./oop");
 var EventEmitter = require("./event_emitter").EventEmitter;
 
@@ -91,10 +90,10 @@ function reportError(msg, data) {
     if (typeof console == "object" && console.error)
         console.error(e);
     setTimeout(function() { throw e; });
-};
+}
 
 var AppConfig = function() {
-    this.$defaultOptions = {};    
+    this.$defaultOptions = {};
 };
 
 (function() {
@@ -145,7 +144,7 @@ var AppConfig = function() {
     this.setDefaultValues = function(path, optionHash) {
         Object.keys(optionHash).forEach(function(key) {
             this.setDefaultValue(path, key, optionHash[key]);
-        });
+        }, this);
     };
     
     this.warn = warn;