Browse Source

added queue setting to transition module

Former-commit-id: b9586d14b0
Former-commit-id: edca1e0e01
pull/258/head
Jonas Trevisan 11 years ago
parent
commit
2c05cb6150
2 changed files with 18 additions and 3 deletions
  1. 14
      src/modules/dropdown.js
  2. 7
      src/modules/transition.js

14
src/modules/dropdown.js

@ -349,7 +349,12 @@ $.fn.dropdown = function(parameters) {
callback(); callback();
} }
else if($.fn.transition !== undefined) { else if($.fn.transition !== undefined) {
$currentMenu.transition(settings.transition + ' in', settings.duration, callback);
$currentMenu.transition({
animation : settings.transition + ' in',
duration : settings.duration,
complete : callback,
queue : false
})
} }
else if(settings.transition == 'slide down') { else if(settings.transition == 'slide down') {
$currentMenu $currentMenu
@ -392,7 +397,12 @@ $.fn.dropdown = function(parameters) {
if(dropdown.is.visible($currentMenu) ) { if(dropdown.is.visible($currentMenu) ) {
dropdown.verbose('Doing menu hide animation', $currentMenu); dropdown.verbose('Doing menu hide animation', $currentMenu);
if($.fn.transition !== undefined) { if($.fn.transition !== undefined) {
$currentMenu.transition(settings.transition + ' out', settings.duration, callback);
$currentMenu.transition({
animation : settings.transition + ' out',
duration : settings.duration,
complete : callback,
queue : false
})
} }
else if(settings.transition == 'none') { else if(settings.transition == 'none') {
callback(); callback();

7
src/modules/transition.js

@ -101,7 +101,9 @@ $.fn.transition = function() {
settings = overrideSettings || settings; settings = overrideSettings || settings;
module.debug('Preparing animation', settings.animation); module.debug('Preparing animation', settings.animation);
if(module.is.animating()) { if(module.is.animating()) {
module.queue(settings.animation);
if(settins.queue) {
module.queue(settings.animation);
}
return false; return false;
} }
module.save.conditions(); module.save.conditions();
@ -621,6 +623,9 @@ $.fn.transition.settings = {
animation : 'fade', animation : 'fade',
duration : '700ms', duration : '700ms',
// queue up animations
queue : true,
className : { className : {
transition : 'ui transition', transition : 'ui transition',
animating : 'animating', animating : 'animating',

Loading…
Cancel
Save