Permalink
Browse files

mismatch commits, revert

  • Loading branch information...
1 parent 6eb0d2c commit 3efca9eeccbd3affe8bcc36768fea7e4e400e95d @davidhellsing davidhellsing committed Sep 11, 2012
Showing with 32 additions and 32 deletions.
  1. +32 −32 src/galleria.js
View
@@ -4591,38 +4591,6 @@ this.prependChild( 'info', 'myElement' );
// stall the queue
self._queue.stalled = true;
- var transition = self._options.transition;
-
- // can JavaScript loop through objects in order? yes.
- $.each({
- initial: active.image === null,
- touch: Galleria.TOUCH,
- fullscreen: self.isFullscreen()
- }, function( type, arg ) {
- if ( arg && self._options[ type + 'Transition' ] !== undef ) {
- transition = self._options[ type + 'Transition' ];
- return false;
- }
- });
-
- // validate the transition
- if ( transition in _transitions.effects === false ) {
- complete();
- } else {
- var params = {
- prev: active.container,
- next: next.container,
- rewind: queue.rewind,
- speed: self._options.transitionSpeed || 400
- };
-
- _transitions.active = true;
-
- // call the transition function and send some stuff
- _transitions.init.call( self, transition, params, complete );
-
- }
-
// begin loading the next image
next.load( src, function( next ) {
@@ -4656,6 +4624,38 @@ this.prependChild( 'info', 'myElement' );
}
}
+ var transition = self._options.transition;
+
+ // can JavaScript loop through objects in order? yes.
+ $.each({
+ initial: active.image === null,
+ touch: Galleria.TOUCH,
+ fullscreen: self.isFullscreen()
+ }, function( type, arg ) {
+ if ( arg && self._options[ type + 'Transition' ] !== undef ) {
+ transition = self._options[ type + 'Transition' ];
+ return false;
+ }
+ });
+
+ // validate the transition
+ if ( transition in _transitions.effects === false ) {
+ complete();
+ } else {
+ var params = {
+ prev: active.container,
+ next: next.container,
+ rewind: queue.rewind,
+ speed: self._options.transitionSpeed || 400
+ };
+
+ _transitions.active = true;
+
+ // call the transition function and send some stuff
+ _transitions.init.call( self, transition, params, complete );
+
+ }
+
// trigger the LOADFINISH event
self.trigger({
type: Galleria.LOADFINISH,

0 comments on commit 3efca9e

Please sign in to comment.