update(ripple): renames 'md-active' to 'md-highlight' for ripples

Renmae ripple `md-active` since it conflicted with tabs attribute. Close angular#727.
gkalpak · Nov 22, 2014 · fca5376 · fca5376
1 parent 57f10f7
commit fca5376
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/config/template/index.template.html b/docs/config/template/index.template.html
@@ -30,7 +30,7 @@ <h1 class="md-toolbar-tools" style="padding-top:25px;">
 
         <button class="menu-item menu-title md-menu-item"
           ng-click="menu.toggleSelectSection(section)"
-          md-active="menu.isSectionSelected(section)"
+          md-highlight="menu.isSectionSelected(section)"
           md-ink-ripple="#bbb">
           {{section.name}}
         </button>
@@ -39,7 +39,7 @@ <h1 class="md-toolbar-tools" style="padding-top:25px;">
           ng-show="menu.isSectionSelected(section)"
           ng-repeat="page in section.pages"
           ng-href="#{{page.url}}"
-          md-active="menu.isPageSelected(section, page)"
+          md-highlight="menu.isPageSelected(section, page)"
           md-ink-ripple="#bbb">
           <span ng-bind="page | humanizeDoc"></span>
         </a>

diff --git a/src/core/services/ripple/ripple.js b/src/core/services/ripple/ripple.js
@@ -51,7 +51,7 @@ function InkRippleService($window, $timeout) {
         counter = 0,
         ripples = [],
         states = [],
-        isActiveExpr = element.attr('md-active'),
+        isActiveExpr = element.attr('md-highlight'),
         isActive = false,
         isHeld = false,
         node = element[0],