Browse Source

Adds #1873, stop, stop all, clear queue

pull/1896/head
jlukic 9 years ago
parent
commit
835b7555dc
2 changed files with 34 additions and 8 deletions
  1. 1
      RELEASE-NOTES.md
  2. 41
      src/definitions/modules/transition.js

1
RELEASE-NOTES.md

@ -8,6 +8,7 @@
**Enhancements** **Enhancements**
- **Loader** - `inline loader` now has a `centered` variation - **Loader** - `inline loader` now has a `centered` variation
- **Transition** - transition now has `stop`, `stop all`, and `clear queue` for removing transitions, (undocumented method `stop`, and `start` renamed to `enable` and `disable`)
**Bugs** **Bugs**
- **Menu** - Fix vertical pointing menu, sub menu arrow color - **Menu** - Fix vertical pointing menu, sub menu arrow color

41
src/definitions/modules/transition.js

@ -187,7 +187,7 @@ $.fn.transition = function() {
reset: function() { reset: function() {
module.debug('Resetting animation to beginning conditions'); module.debug('Resetting animation to beginning conditions');
module.remove.animationEndCallback();
module.remove.animationCallbacks();
module.restore.conditions(); module.restore.conditions();
module.remove.animating(); module.remove.animating();
}, },
@ -196,7 +196,7 @@ $.fn.transition = function() {
module.debug('Queueing animation of', animation); module.debug('Queueing animation of', animation);
module.queuing = true; module.queuing = true;
$module $module
.one(animationEnd + eventNamespace, function() {
.one(animationEnd + '.queue' + eventNamespace, function() {
module.queuing = false; module.queuing = false;
module.repaint(); module.repaint();
module.animate.apply(this, settings); module.animate.apply(this, settings);
@ -206,7 +206,7 @@ $.fn.transition = function() {
complete: function (event) { complete: function (event) {
module.verbose('CSS animation complete', settings.animation); module.verbose('CSS animation complete', settings.animation);
module.remove.animationEndCallback();
module.remove.completeCallback();
module.remove.failSafe(); module.remove.failSafe();
if(!module.is.looping()) { if(!module.is.looping()) {
if( module.is.outward() ) { if( module.is.outward() ) {
@ -262,7 +262,7 @@ $.fn.transition = function() {
module.save.conditions(); module.save.conditions();
} }
module.remove.direction(); module.remove.direction();
module.remove.animationEndCallback();
module.remove.completeCallback();
if(module.can.transition() && !module.has.direction()) { if(module.can.transition() && !module.has.direction()) {
module.set.direction(); module.set.direction();
} }
@ -430,8 +430,15 @@ $.fn.transition = function() {
}) })
; ;
}, },
animationEndCallback: function() {
$module.off('.complete');
animationCallbacks: function() {
module.remove.queueCallback();
module.remove.completeCallback();
},
queueCallback: function() {
$module.off('.queue' + eventNamespace)
}
completeCallback: function() {
$module.off('.complete' + eventNamespace);
}, },
display: function() { display: function() {
$module.css('display', ''); $module.css('display', '');
@ -734,12 +741,30 @@ $.fn.transition = function() {
module.repaint(); module.repaint();
}, },
start: function() {
stop: function() {
module.debug('Stopping current animation');
module.complete();
},
stopAll: function() {
module.debug('Stopping all animation');
module.remove.animationCallbacks();
module.complete();
},
clear: {
queue: function() {
module.debug('Clearing animation queue')
module.remove.queueCallback();
}
},
enable: function() {
module.verbose('Starting animation'); module.verbose('Starting animation');
$module.removeClass(className.disabled); $module.removeClass(className.disabled);
}, },
stop: function() {
disable: function() {
module.debug('Stopping animation'); module.debug('Stopping animation');
$module.addClass(className.disabled); $module.addClass(className.disabled);
}, },

Loading…
Cancel
Save