diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 324da4c..6273c43 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -121,7 +121,9 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim dataService.transition($scope.showMode == 'item' ? '.js-tag-costomTag' : '.js-tags-table'); } $timeout(function() { - dataService.transition('#' + addBookmarkId); + dataService.transition('#' + addBookmarkId, { + duration: 1000, + }); addBookmarkId = -1; }, 1000); forbidTransition = false; @@ -508,7 +510,9 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim bookmark.description = data.description; find = true; if ($scope.order[bookmark.type - 1]) { - dataService.transition('#' + bookmark.id); + dataService.transition('#' + bookmark.id, { + duration: 1000, + }); } } }) diff --git a/public/scripts/services/data-service.js b/public/scripts/services/data-service.js index 7e43f31..fdc402f 100644 --- a/public/scripts/services/data-service.js +++ b/public/scripts/services/data-service.js @@ -47,8 +47,8 @@ app.factory('dataService', [function() { animationIndex: 0, animation: function() { var data = ['scale', 'fade', 'fade up', 'fade down', 'fade left', 'fade right', 'horizontal flip', - 'vertical flip', 'drop', 'fly left', 'fly right', 'fly up', 'fly down', - 'browse', 'browse right', 'slide down', 'slide up', 'slide left', 'slide right' + 'vertical flip', 'drop', 'fly left', 'fly right', 'fly up', 'fly down', 'swing left', 'swing right', 'swing up', 'swing down', + 'browse', 'browse right', 'slide down', 'slide up', 'slide left', 'slide right', 'jiggle', 'shake', 'pulse', 'tada', 'bounce' ]; var t = data[parseInt(Math.random() * 1000) % data.length]; @@ -57,7 +57,7 @@ app.factory('dataService', [function() { transition: function(selector, params) { var data = {}; data.animation = (params && params.animation) ? params.animation : service.animation(); - data.duration = (params && params.duration) ? params.duration : 1000; + data.duration = (params && params.duration) ? params.duration : 500; data.onComplete = function() { if (params) { if (params.state == 'hide') {