Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 3a51edf

Browse files
topherfangioThomasBurleson
authored andcommitted
fix(fabController): Properly namespace FabController.
The FabController was not properly namespaced for Material Design. Fix by adding `Md` to the beginning to ensure we do not override users controllers. Fixes #6881. Closes #6919.
1 parent 82625cf commit 3a51edf

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/components/fabSpeedDial/fabController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
'use strict';
33

44
angular.module('material.components.fabShared', ['material.core'])
5-
.controller('FabController', FabController);
5+
.controller('MdFabController', MdFabController);
66

7-
function FabController($scope, $element, $animate, $mdUtil, $mdConstant, $timeout) {
7+
function MdFabController($scope, $element, $animate, $mdUtil, $mdConstant, $timeout) {
88
var vm = this;
99

1010
// NOTE: We use async eval(s) below to avoid conflicts with any existing digest loops

src/components/fabSpeedDial/fabSpeedDial.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
},
107107

108108
bindToController: true,
109-
controller: 'FabController',
109+
controller: 'MdFabController',
110110
controllerAs: 'vm',
111111

112112
link: FabSpeedDialLink

src/components/fabToolbar/fabToolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585

8686
bindToController: true,
87-
controller: 'FabController',
87+
controller: 'MdFabController',
8888
controllerAs: 'vm',
8989

9090
link: link

0 commit comments

Comments
 (0)