fix: undefined newValue watched

angular-ui · Jul 11, 2014 · f506149 · f506149
1 parent 0f5802e
commit f506149
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/ui-codemirror.js b/src/ui-codemirror.js
@@ -41,8 +41,16 @@ angular.module('ui.codemirror', [])
           if (iAttrs.uiCodemirror || iAttrs.uiCodemirrorOpts) {
             var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
             scope.$watch(iAttrs.uiCodemirror || iAttrs.uiCodemirrorOpts, function updateOptions(newValues, oldValue) {
+              if (! angular.isObject(newValues)){
+                return;
+              }
               codemirrorDefaultsKeys.forEach(function (key) {
-                if (newValues.hasOwnProperty(key) && newValues[key] !== oldValue[key]) {
+                if (newValues.hasOwnProperty(key)) {
+
+                  if (oldValue && newValues[key] === oldValue[key]){
+                    return;
+                  }
+
                   codeMirror.setOption(key, newValues[key]);
                 }
               });