mergeDefaults fails for null values

Fixes katzer#72
Telerik-Verified-Plugins · Nov 10, 2014 · 45b4101 · 45b4101
1 parent 6560fb3
commit 45b4101
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/www/email_composer.js b/www/email_composer.js
@@ -142,6 +142,11 @@ exports.mergeWithDefaults = function (options) {
         var custom_  = options[key],
             default_ = defaults[key];
 
+        if (custom_ === null || custom_ === undefined) {
+            options[key] = default_;
+            continue;
+        }
+
         if (typeof default_ != typeof custom_) {
 
             if (typeof default_ == 'string') {