liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加几个动画

This commit is contained in:
luchenqun 2017-06-24 20:52:28 +08:00
parent 0b54f08aef
commit ef68faa337
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/controllers/tags-controller.js
View File

@ -121,7 +121,9 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
dataService.transition($scope.showMode == 'item' ? '.js-tag-costomTag' : '.js-tags-table'); dataService.transition($scope.showMode == 'item' ? '.js-tag-costomTag' : '.js-tags-table');
} }
$timeout(function() { $timeout(function() {
dataService.transition('#' + addBookmarkId); dataService.transition('#' + addBookmarkId, {
duration: 1000,
});
addBookmarkId = -1; addBookmarkId = -1;
}, 1000); }, 1000);
forbidTransition = false; forbidTransition = false;
@ -508,7 +510,9 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
bookmark.description = data.description; bookmark.description = data.description;
find = true; find = true;
if ($scope.order[bookmark.type - 1]) { if ($scope.order[bookmark.type - 1]) {
dataService.transition('#' + bookmark.id); dataService.transition('#' + bookmark.id, {
duration: 1000,
});
} }
} }
}) })

6
public/scripts/services/data-service.js
View File

@ -47,8 +47,8 @@ app.factory('dataService', [function() {
animationIndex: 0, animationIndex: 0,
animation: function() { animation: function() {
var data = ['scale', 'fade', 'fade up', 'fade down', 'fade left', 'fade right', 'horizontal flip', 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', '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' '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]; var t = data[parseInt(Math.random() * 1000) % data.length];
@ -57,7 +57,7 @@ app.factory('dataService', [function() {
transition: function(selector, params) { transition: function(selector, params) {
var data = {}; var data = {};
data.animation = (params && params.animation) ? params.animation : service.animation(); 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() { data.onComplete = function() {
if (params) { if (params) {
if (params.state == 'hide') { if (params.state == 'hide') {