diff options
author | Marco Cecchetti <mrcekets@gmail.com> | 2012-06-28 23:17:33 +0200 |
---|---|---|
committer | Marco Cecchetti <mrcekets@gmail.com> | 2012-07-15 11:51:45 +0200 |
commit | 6bfaabf4fe0a1ccf55ae238f690cebd641e6c425 (patch) | |
tree | 72d9ccc12b3ff5318b3d61334d54c671d46a7bdc | |
parent | Now the skip effect feature is supported by the JavaScript presentation engine. (diff) | |
download | core-6bfaabf4fe0a1ccf55ae238f690cebd641e6c425.tar.gz core-6bfaabf4fe0a1ccf55ae238f690cebd641e6c425.zip |
Now a skip effect command cannot be executed if one skip effect is already running.
-rw-r--r-- | filter/source/svg/presentation_engine.js | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 528de4988866..0de9bea34ed3 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -11110,6 +11110,7 @@ function SlideShow() this.eDirection = FORWARD; this.bIsIdle = true; this.bIsEnabled = true; + this.bIsSkipping = false; this.bNoSlideTransition = false; } @@ -11236,12 +11237,26 @@ SlideShow.prototype.nextEffect = function() SlideShow.prototype.skipCurrentEffect = function() { + if( this.bIsSkipping ) + return; + + this.bIsSkipping = true; this.aEventMultiplexer.notifySkipEffectEvent(); this.update(); + this.bIsSkipping = false; }; SlideShow.prototype.skipEffect = function() { + if( this.bIsSkipping ) + return true; + + if( this.isRunning() ) + { + this.skipCurrentEffect(); + return true; + } + if( !this.aNextEffectEventArray ) return false; @@ -11249,11 +11264,13 @@ SlideShow.prototype.skipEffect = function() if( this.nCurrentEffect >= this.aNextEffectEventArray.size() ) return false; + this.bIsSkipping = true; this.eDirection = FORWARD; this.aNextEffectEventArray.at( this.nCurrentEffect ).fire(); this.aEventMultiplexer.notifySkipEffectEvent(); ++this.nCurrentEffect; this.update(); + this.bIsSkipping = false; return true; }; |