fix(utils): update for Angular 1.4.1 compatibility

Fixes #3315, Fixes #3325.
angular · Jun 17, 2015 · 7ca139a · gkalpak · Jun 18, 2015 · gkalpak
1 parent 6315228
commit 7ca139a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/util/util.js b/src/core/util/util.js
@@ -334,19 +334,21 @@ angular.module('material.core')
     },
 
     /**
-     * Give optional properties with no value a boolean true by default
+     * Give optional properties with no value a boolean true if attr provided or false otherwise
      */
     initOptionalProperties: function (scope, attr, defaults ) {
        defaults = defaults || { };
        angular.forEach(scope.$$isolateBindings, function (binding, key) {
+         var normalizedAttrName = attr.$normalize(binding.attrName);
          if (binding.optional && angular.isUndefined(scope[key])) {
-           var hasKey = attr.hasOwnProperty(attr.$normalize(binding.attrName));
+           var attrIsDefined = normalizedAttrName in attr &&  !angular.isUndefined(attr[normalizedAttrName]);
 
-           scope[key] = angular.isDefined(defaults[key]) ? defaults[key] : hasKey;
+           scope[key] = angular.isDefined(defaults[key]) ? defaults[key] : attrIsDefined;
          }
        });
     }
 
+
   };
 
 });