diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-10 15:45:09 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-10 15:45:09 +0100 |
| commit | e2d2d63bcde7354c2e73b368e7c68d1f2b369562 (patch) | |
| tree | e87c113753abe1c5a1c20727e0680fb55dbfb09b | |
| parent | Upgrade angularjs to 1.3.0-rc1 since this is new development (diff) | |
| download | synapse-e2d2d63bcde7354c2e73b368e7c68d1f2b369562.tar.xz | |
Animation on call end icon.
Diffstat (limited to '')
| -rw-r--r-- | webclient/app-controller.js | 10 | ||||
| -rwxr-xr-x | webclient/app.css | 18 | ||||
| -rw-r--r-- | webclient/app.js | 1 | ||||
| -rw-r--r-- | webclient/index.html | 1 |
4 files changed, 14 insertions, 16 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index feda0f6b57..8383533cfb 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -160,13 +160,9 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even $rootScope.onCallHangup = function(call) { if (call == $rootScope.currentCall) { - $timeout(function() { - var icon = angular.element('#callEndedIcon'); - $animate.addClass(icon, 'callIconRotate'); - $timeout(function(){ - $rootScope.currentCall = undefined; - }, 4070); - }, 100); + $timeout(function(){ + $rootScope.currentCall = undefined; + }, 4070); } } }]); diff --git a/webclient/app.css b/webclient/app.css index 634fa6bcc1..2564ce3286 100755 --- a/webclient/app.css +++ b/webclient/app.css @@ -55,20 +55,20 @@ a:active { color: #000; } margin-left: 4px; margin-right: 4px; margin-top: 8px; - -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; - -moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; - -o-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; - transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; } -.callIconRotate { - -webkit-transform: rotateZ(45deg); - -moz-transform: rotateZ(45deg); - -ms-transform: rotateZ(45deg); - -o-transform: rotateZ(45deg); +#callEndedIcon { + transition:all linear 0.5s; +} + +#callEndedIcon { transform: rotateZ(45deg); } +#callEndedIcon.ng-hide { + transform: rotateZ(0deg); +} + #callPeerImage { width: 32px; height: 32px; diff --git a/webclient/app.js b/webclient/app.js index d25e2a6234..9370f773b3 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -16,6 +16,7 @@ limitations under the License. var matrixWebClient = angular.module('matrixWebClient', [ 'ngRoute', + 'ngAnimate', 'MatrixWebClientController', 'LoginController', 'RegisterController', diff --git a/webclient/index.html b/webclient/index.html index 150b7c4407..dd2393722c 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -15,6 +15,7 @@ <script src="js/angular.min.js"></script> <script src="js/angular-route.min.js"></script> <script src="js/angular-sanitize.min.js"></script> + <script src="js/angular-animate.min.js"></script> <script type='text/javascript' src='js/ng-infinite-scroll-matrix.js'></script> <script src="app.js"></script> <script src="config.js"></script> |