Pagecontainer: updating transitions for bootstrap

arschmitz · arschmitz · commit 7b475e829259 · 2016-07-04T09:32:25.000-04:00
diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js
@@ -38,11 +38,6 @@
 		// Browser globals
 		factory( jQuery );
 	}
-<<<<<<< 55d1ef47bd2f60ed10701a2e519bcfa3b0d80404
-})( function( $ ) {
-	$.widget( "mobile.pagecontainer", {
-		version: "@VERSION",
-=======
 } )( function( $ ) {
 
 // These variables make all page containers use the same queue and only navigate one at a time
@@ -54,7 +49,6 @@ var pageTransitionQueue = [],
 
 $.widget( "mobile.pagecontainer", {
 	version: "@VERSION",
->>>>>>> Page: Style fixes powered by esformatter
 
 	options: {
 		theme: "a",
diff --git a/js/widgets/pagecontainer.transitions.js b/js/widgets/pagecontainer.transitions.js
@@ -1,18 +1,38 @@
-//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
-//>>description: Extension that adds transition management support to pagecontainer widget
-//>>label: Transitions Support for Pagecontainer
+/*!
+ * jQuery Mobile Page Container @VERSION
+ * http://jquerymobile.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Content Management
 //>>group: Navigation
-define( [
-	"jquery",
-	"./pagecontainer",
+//>>description: Widget to create page container which manages pages and transitions
+//>>docs: http://api.jquerymobile.com/pagecontainer/
+//>>demos: http://demos.jquerymobile.com/@VERSION/navigation/
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
+//>>css.theme: ../css/themes/default/jquery.mobile.theme.css
+
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [
+			"jquery",
+			"./pagecontainer",
 
-	// For $.mobile.navigate.history
-	"../navigation/method",
-	"../transitions/handlers" ], function( jQuery ) {
-//>>excludeEnd("jqmBuildExclude");
-(function( $, undefined ) {
+			// For $.mobile.navigate.history
+			"../navigation/method",
+			"../transitions/handlers" ], factory );
+	} else {
 
-$.widget( "mobile.pagecontainer", $.mobile.pagecontainer, {
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+return $.widget( "mobile.pagecontainer", $.mobile.pagecontainer, {
 	_getTransitionHandler: function( transition ) {
 		transition = $.mobile._maybeDegradeTransition( transition );
 
@@ -28,9 +48,5 @@ $.widget( "mobile.pagecontainer", $.mobile.pagecontainer, {
 		return ( new TransitionHandler( transition, reverse, to, from ) ).transition(
 			$.mobile.navigate.history.getActive().lastScroll || $.mobile.defaultHomeScroll );
 	}
-});
-
-})( jQuery );
-//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
-});
-//>>excludeEnd("jqmBuildExclude");
+} );
+} );
diff --git a/tests/unit/init/no-autoinit-page-transitions-tests.html b/tests/unit/init/no-autoinit-page-transitions-tests.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html lang="en">
 <head>
+	<title>Transition test</title>
 	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
 	<script>
diff --git a/tests/unit/init/no_autoinit_page_core.js b/tests/unit/init/no_autoinit_page_core.js
@@ -3,7 +3,7 @@ define( [ "qunit", "jquery" ], function( QUnit, $ ) {
 QUnit.asyncTest( "resetActivePageHeight() will be called when page is initialized late", function( assert ) {
 var resetActivePageHeightCallCount = 0;
 
-expect( 1 );
+assert.expect( 1 );
 
 $( document ).on( "mobileinit", function() {
 	$.mobile.autoInitializePage = false;
