This repository has been archived by the owner on Sep 5, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(fabSpeedDial): fix many visual issues
* maintain state when focusing/bluring/tabbing through actions speed dial would previously show a very short and erroneous animation when tabbing, or rapidly blurring/focusing, through child items * add demo showing tooltip usage * fix $digest in-progress error when opening a dialog cebor reported a $digest in progress bug when trying to open a dialog from within the speed dial; haven't figured out how to create a test that demonstrates it, but I added a demo which shows failure * animations fail on Safari update webkitTransform styles and set height to initial instead of 100% closes #3213, closes #3338, closes #3277, closes #3236, closes #3375
- Loading branch information
1 parent
98e91ae
commit 9335f61
Showing
10 changed files
with
185 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
<div ng-controller="AppCtrl" layout="column"> | ||
<md-content class="md-padding" layout="column"> | ||
<p> | ||
You can also use the buttons to open a dialog. | ||
</p> | ||
|
||
<div class="lock-size" layout="row" layout-align="center center"> | ||
<md-fab-speed-dial md-direction="down" class="md-fling"> | ||
<md-fab-trigger> | ||
<md-button aria-label="Menu" class="md-fab md-warn"> | ||
<md-tooltip md-direction="top">Menu</md-tooltip> | ||
<md-icon md-svg-src="img/icons/menu.svg"></md-icon> | ||
</md-button> | ||
</md-fab-trigger> | ||
|
||
<md-fab-actions> | ||
<md-button aria-label="Open dialog" class="md-fab md-raised md-mini" | ||
ng-click="demo.openDialog($event)"> | ||
<md-tooltip md-direction="left">Open dialog</md-tooltip> | ||
<md-icon md-svg-src="img/icons/launch.svg"></md-icon> | ||
</md-button> | ||
</md-fab-actions> | ||
</md-fab-speed-dial> | ||
</div> | ||
</md-content> | ||
|
||
<script type="text/ng-template" id="dialog.html"> | ||
<md-dialog> | ||
<md-dialog-content>Hello User!!!</md-dialog-content> | ||
|
||
<div class="md-actions"> | ||
<md-button aria-label="Close dialog" ng-click="dialog.close()" class="md-primary"> | ||
Close Greeting | ||
</md-button> | ||
|
||
<md-button aria-label="Submit dialog" ng-click="dialog.submit()" class="md-primary"> | ||
Submit | ||
</md-button> | ||
</div> | ||
</md-dialog> | ||
</script> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
(function() { | ||
'use strict'; | ||
|
||
angular.module('fabSpeedDialModalDemo', ['ngMaterial']) | ||
.controller('AppCtrl', function($scope, $mdDialog) { | ||
$scope.demo = { | ||
openDialog: function($event) { | ||
$mdDialog.show({ | ||
clickOutsideToClose: true, | ||
controller: function($mdDialog) { | ||
this.close = function() { | ||
$mdDialog.cancel(); | ||
}; | ||
this.submit = function() { | ||
$mdDialog.hide(); | ||
}; | ||
}, | ||
controllerAs: 'dialog', | ||
templateUrl: 'dialog.html', | ||
targetEvent: $event | ||
}); | ||
} | ||
}; | ||
}); | ||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
.md-fab.md-mini { | ||
background-color: #aaa !important; | ||
} | ||
|
||
.md-fab:hover, .md-fab.md-focused { | ||
background-color: #333 !important; | ||
} | ||
|
||
.lock-size { | ||
min-width: 300px; | ||
min-height: 300px; | ||
width: 300px; | ||
height: 300px; | ||
margin-left: auto; | ||
margin-right: auto; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
<div ng-controller="AppCtrl" layout="column"> | ||
<md-content class="md-padding" layout="column"> | ||
<p> | ||
You may add tooltips to both the trigger and actions. | ||
</p> | ||
|
||
<div class="lock-size" layout="row" layout-align="center center"> | ||
<md-fab-speed-dial md-direction="down" class="md-fling"> | ||
<md-fab-trigger> | ||
<md-button aria-label="menu" class="md-fab md-warn"> | ||
<md-tooltip md-direction="top">Menu</md-tooltip> | ||
<md-icon md-svg-src="img/icons/menu.svg"></md-icon> | ||
</md-button> | ||
</md-fab-trigger> | ||
|
||
<md-fab-actions> | ||
<md-button aria-label="twitter" class="md-fab md-raised md-mini"> | ||
<md-tooltip md-direction="left">Twitter</md-tooltip> | ||
<md-icon md-svg-src="img/icons/twitter.svg"></md-icon> | ||
</md-button> | ||
|
||
<md-button aria-label="facebook" class="md-fab md-raised md-mini"> | ||
<md-tooltip md-direction="right">Facebook</md-tooltip> | ||
<md-icon md-svg-src="img/icons/facebook.svg"></md-icon> | ||
</md-button> | ||
|
||
<md-button aria-label="Google Hangout" class="md-fab md-raised md-mini"> | ||
<md-tooltip md-direction="left">Google Hangout</md-tooltip> | ||
<md-icon md-svg-src="img/icons/hangout.svg"></md-icon> | ||
</md-button> | ||
</md-fab-actions> | ||
</md-fab-speed-dial> | ||
</div> | ||
</md-content> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
(function() { | ||
'use strict'; | ||
|
||
angular.module('fabSpeedDialTooltipDemo', ['ngMaterial']) | ||
.controller('AppCtrl', function($scope) { | ||
$scope.demo = { | ||
}; | ||
}); | ||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
.text-capitalize { | ||
text-transform: capitalize; | ||
} | ||
|
||
.md-fab:hover, .md-fab.md-focused { | ||
background-color: #000 !important; | ||
} | ||
|
||
p.note { | ||
font-size: 1.2rem; | ||
} | ||
|
||
.lock-size { | ||
min-width: 300px; | ||
min-height: 300px; | ||
width: 300px; | ||
height: 300px; | ||
margin-left: auto; | ||
margin-right: auto; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters