From ae3f6eb3994316817dbc58d2984a59290400c33a Mon Sep 17 00:00:00 2001
From: Israel Abramov <abris01@ca.com>
Date: Tue, 21 Nov 2017 11:34:28 +0200
Subject: [PATCH 1/2] feat(navBar): add disabled attribute

---
 src/components/navBar/navBar.js      |  5 +++++
 src/components/navBar/navBar.scss    |  5 +++++
 src/components/navBar/navBar.spec.js | 33 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/src/components/navBar/navBar.js b/src/components/navBar/navBar.js
index 1d976fc2563..c084e8da777 100644
--- a/src/components/navBar/navBar.js
+++ b/src/components/navBar/navBar.js
@@ -429,6 +429,7 @@ function MdNavItem($mdAria, $$rAF) {
           '<md-button class="_md-nav-button md-accent" ' +
             'ng-class="ctrl.getNgClassMap()" ' +
             'ng-blur="ctrl.setFocused(false)" ' +
+            'ng-disabled="ctrl.disabled"' +
             'tabindex="-1" ' +
             navigationOptions +
             navigationAttribute + '>' +
@@ -469,6 +470,10 @@ function MdNavItem($mdAria, $$rAF) {
           scope.$apply();
         });
 
+        attrs.$observe('disabled', function (value) {
+          mdNavItem.disabled = !!value;
+        });
+
         $mdAria.expectWithText(element, 'aria-label');
       });
     }
diff --git a/src/components/navBar/navBar.scss b/src/components/navBar/navBar.scss
index 33e5cba48c1..94bf5b0b0f1 100644
--- a/src/components/navBar/navBar.scss
+++ b/src/components/navBar/navBar.scss
@@ -38,6 +38,11 @@ $md-nav-bar-height: 48px;
   &:hover {
     background-color: inherit;
   }
+
+  &[disabled] {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
 }
 
 md-nav-ink-bar {
diff --git a/src/components/navBar/navBar.spec.js b/src/components/navBar/navBar.spec.js
index b48c5e2de80..5767df2e405 100644
--- a/src/components/navBar/navBar.spec.js
+++ b/src/components/navBar/navBar.spec.js
@@ -176,6 +176,39 @@ describe('mdNavBar', function() {
               .toBe('{"reload":true,"notify":true}');
         });
 
+      it('should set the disabled attribute', function() {
+          create('<md-nav-bar>' +
+              '  <md-nav-item md-nav-href="#1" name="tab1">' +
+              '    tab1' +
+              '  </md-nav-item>' +
+              '  <md-nav-item md-nav-href="#2" name="tab2" disabled="1">' +
+              '    tab2' +
+              '  </md-nav-item>' +
+              '</md-nav-bar>');
+
+          var tabCtrl = getTabCtrl('tab2');
+          expect(tabCtrl.disabled).toBe(true);
+      });
+
+      it('should observe the disabled attribute', function() {
+          $scope.tabDisabled = false;
+          create('<md-nav-bar>' +
+              '  <md-nav-item md-nav-href="#1" name="tab1">' +
+              '    tab1' +
+              '  </md-nav-item>' +
+              '  <md-nav-item md-nav-href="#2" name="tab2" ng-disabled="tabDisabled">' +
+              '    tab2' +
+              '  </md-nav-item>' +
+              '</md-nav-bar>');
+          var tabCtrl = getTabCtrl('tab2');
+          expect(tabCtrl.disabled).toBe(false);
+          $scope.tabDisabled = true;
+          $scope.$apply();
+          expect(tabCtrl.disabled).toBe(true);
+      });
+
+
+
     it('does not update tabs if tab controller is undefined', function() {
       $scope.selectedTabRoute = 'tab1';
 

From 045b9dba728d7b6a9927f77c7f312121c7a76618 Mon Sep 17 00:00:00 2001
From: Israel Abramov <abris01@ca.com>
Date: Tue, 21 Nov 2017 12:15:33 +0200
Subject: [PATCH 2/2] feat(navBar): add disabled attribute

Update demo to showcase ng-disabled and disabled usage, fixed test and wrong boolean evaluation
---
 src/components/navBar/demoBasicUsage/index.html | 11 +++++++++--
 src/components/navBar/navBar.js                 |  2 +-
 src/components/navBar/navBar.spec.js            |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/navBar/demoBasicUsage/index.html b/src/components/navBar/demoBasicUsage/index.html
index d30fb0dc1c8..23d6cca9361 100644
--- a/src/components/navBar/demoBasicUsage/index.html
+++ b/src/components/navBar/demoBasicUsage/index.html
@@ -7,12 +7,15 @@
       <md-nav-item md-nav-click="goto('page1')" name="page1">
         Page One
       </md-nav-item>
-      <md-nav-item md-nav-click="goto('page2')" name="page2">
+      <md-nav-item md-nav-click="goto('page2')" name="page2" ng-disabled="secondTabDisabled">
         Page Two
       </md-nav-item>
       <md-nav-item md-nav-click="goto('page3')" name="page3">
         Page Three
       </md-nav-item>
+      <md-nav-item md-nav-click="goto('page4')" name="page4" disabled>
+        Page Four
+      </md-nav-item>
       <!-- these require actual routing with ui-router or ng-route, so they
       won't work in the demo
       <md-nav-item md-nav-href="#page4" name="page5">Page Four</md-nav-item>
@@ -29,5 +32,9 @@
 
     <md-checkbox ng-model="disableInkBar">Disable Ink Bar</md-checkbox>
 
+    <md-checkbox ng-model="secondTabDisabled" aria-label="Disable Second Tab" style="margin: 5px;">
+      Disable Second Tab
+    </md-checkbox>
+
   </md-content>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/navBar/navBar.js b/src/components/navBar/navBar.js
index c084e8da777..3eb3d22f6af 100644
--- a/src/components/navBar/navBar.js
+++ b/src/components/navBar/navBar.js
@@ -471,7 +471,7 @@ function MdNavItem($mdAria, $$rAF) {
         });
 
         attrs.$observe('disabled', function (value) {
-          mdNavItem.disabled = !!value;
+          mdNavItem.disabled = value.length === 0 ? true : !!value;
         });
 
         $mdAria.expectWithText(element, 'aria-label');
diff --git a/src/components/navBar/navBar.spec.js b/src/components/navBar/navBar.spec.js
index 5767df2e405..31942c64b97 100644
--- a/src/components/navBar/navBar.spec.js
+++ b/src/components/navBar/navBar.spec.js
@@ -181,7 +181,7 @@ describe('mdNavBar', function() {
               '  <md-nav-item md-nav-href="#1" name="tab1">' +
               '    tab1' +
               '  </md-nav-item>' +
-              '  <md-nav-item md-nav-href="#2" name="tab2" disabled="1">' +
+              '  <md-nav-item md-nav-href="#2" name="tab2" disabled>' +
               '    tab2' +
               '  </md-nav-item>' +
               '</md-nav-bar>');