move duplcate event triggering to one method, transition degredation to _getTransitionHandler

Author: johnbender

js/jquery.mobile.navigation.js

@@ -686,35 +686,42 @@ define( [
 		},
 
 		_getTransitionHandler: function( transition ) {
+			transition = $.mobile._maybeDegradeTransition( transition );
+
+			//find the transition handler for the specified transition. If there
+			//isn't one in our transitionHandlers dictionary, use the default one.
+			//call the handler immediately to kick-off the transition.
 			return $.mobile.transitionHandlers[ transition ] || $.mobile.defaultTransitionHandler;
 		},
 
-		// TODO make private once change has been defined in the widget1
-		transition: function( toPage, fromPage, options ) {
-			var transition = options.transition,
-				reverse = options.reverse,
-				deferred = options.deferred,
-				TransitionHandler,
-				promise;
+		// TODO move into transition handlers?
+		_triggerTransitionEvents: function( to, from, prefix ) {
+			prefix = prefix || "";
 
 			// TODO decide if these events should in fact be triggered on the container
-			if ( fromPage ) {
+			if ( from ) {
 				//trigger before show/hide events
 				// TODO deprecate nextPage in favor of next
-				this._triggerWithDeprecated( "beforehide", {nextPage: toPage}, fromPage );
+				this._triggerWithDeprecated( prefix + "hide", {nextPage: to}, from );
 			}
 
 			// TODO deprecate prevPage in favor of previous
-			this._triggerWithDeprecated( "beforeshow", {prevPage: fromPage || $( "" )}, toPage );
+			this._triggerWithDeprecated( prefix + "show", {prevPage: from || $( "" )}, to );
+		},
+
+		// TODO make private once change has been defined in the widget
+		transition: function( toPage, fromPage, options ) {
+			var transition = options.transition,
+				reverse = options.reverse,
+				deferred = options.deferred,
+				TransitionHandler,
+				promise;
+
+			this._triggerTransitionEvents( toPage, fromPage, "before" );
 
 			// TODO maybe put this in a binding to events above *outside* the widget
 			this._hideLoading();
 
-			transition = $.mobile._maybeDegradeTransition( transition );
-
-			//find the transition handler for the specified transition. If there
-			//isn't one in our transitionHandlers dictionary, use the default one.
-			//call the handler immediately to kick-off the transition.
 			TransitionHandler = this._getTransitionHandler( transition );
 
 			promise = (new TransitionHandler( transition, reverse, toPage, fromPage ))
@@ -726,15 +733,7 @@ define( [
 			});
 
 			promise.done($.proxy(function() {
-				//trigger show/hide events
-				if ( fromPage ) {
-					// TODO deprecate nextPage in favor of next
-					this._triggerWithDeprecated( "hide", {nextPage: toPage}, fromPage );
-				}
-
-				// TODO deprecate prevPage in favor of previous
-				//trigger pageshow, define prevPage as either fromPage or empty jQuery obj
-				this._triggerWithDeprecated( "show", {prevPage: fromPage || $( "" )}, toPage );
+				this._triggerTransitionEvents( toPage, fromPage );
 			}, this));
 		}