new version

B-3PO · Dec 6, 2016 · 98fb8d4 · 98fb8d4
1 parent d48dd3e
commit 98fb8d4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-material-expansion-panel",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Material Design Expansion Panels.",
   "main": [
     "dist/md-expansion-panel.js",

diff --git a/dist/md-expansion-panel.css b/dist/md-expansion-panel.css
@@ -16,8 +16,11 @@ md-expansion-panel {
     border-color: #DDD; }
   md-expansion-panel .md-expansion-panel-icon svg {
     fill: #999; }
-  md-expansion-panel[disabled] md-expansion-panel-collapsed {
+  md-expansion-panel[disabled] md-expansion-panel-collapsed .md-title,
+  md-expansion-panel[disabled] md-expansion-panel-collapsed .md-summary {
     color: #DDD; }
+  md-expansion-panel[disabled] .md-expansion-panel-icon svg {
+    fill: #DDD; }
   md-expansion-panel:not(.md-open):not([disabled]):focus,
   md-expansion-panel:not(.md-open):not([disabled]):focus md-expansion-panel-collapsed {
     background: #EEE; }

diff --git a/dist/md-expansion-panel.js b/dist/md-expansion-panel.js
@@ -115,15 +115,15 @@ function expansionPanelDirective() {
     vm.onRemove = onRemove;
     vm.init = init;
 
-    $attrs.$observe('disabled', function(disabled) {
-      isDisabled = (typeof disabled === 'string' && disabled !== 'false') ? true : false;
-
-      if (isDisabled === true) {
-        $element.attr('tabindex', '-1');
-      } else {
-        $element.attr('tabindex', '0');
-      }
-    });
+    if ($attrs.ngDisabled !== undefined) {
+      $scope.$watch($attrs.ngDisabled, function(value) {
+        isDisabled = value;
+        $element.attr('tabindex', isDisabled ? -1 : 0);
+      });
+    } else if ($attrs.disabled !== undefined) {
+      isDisabled = ($attrs.disabled !== undefined && $attrs.disabled !== 'false' && $attrs.disabled !== false);
+      $element.attr('tabindex', isDisabled ? -1 : 0);
+    }
 
     $element
       .on('focus', function (ev) {

diff --git a/dist/md-expansion-panel.min.css b/dist/md-expansion-panel.min.css