Filterable: As part of backcompat, listview refresh refreshes filterable

.travis.yml

@@ -1,12 +1,13 @@
-language: node_js
-node_js:
-  - 0.8
+language: php
+php:
+  - "5.5"
 before_script: 
   - npm install -g grunt-cli
+  - npm install
 script: npm run-script ci
 branches:
   only:
-    - master
+    - 1.4-stable
 env:
   - TYPES=unit
     JQUERIES=1.8.3

Gruntfile.js

@@ -70,6 +70,7 @@ module.exports = function( grunt ) {
 		},
 		path = require( "path" ),
 		httpPort =  Math.floor( 9000 + Math.random()*1000 ),
+		phpPort = Math.floor( 8000 + Math.random()*1000 ),
 		name = "jquery.mobile",
 		dist = "dist" + path.sep,
 		copyrightYear = grunt.template.today( "UTC:yyyy" ),
@@ -693,6 +694,37 @@ module.exports = function( grunt ) {
 			}
 		},
 
+		php: {
+			server: {
+				options: {
+					port: phpPort,
+					baseUrl: "."
+				}
+			}
+		},
+
+		casper: {
+			options: {
+				test: true,
+				verbose : false,
+				"log-level": "error",
+				parallel: true,
+				concurrency: 5
+			},
+			"demos.src": {
+				options: {
+					args: [ "--port=" + phpPort ]
+				},
+				src: [ "tests/casperjs/**/*.js" ]
+			},
+			"demos.dist": {
+				options: {
+					args: [ "--port=" + phpPort ]
+				},
+				src: [ "tests/casperjs/**/*.js" ]
+			}
+		},
+
 		connect: {
 			server: {
 				options: {
@@ -987,13 +1019,21 @@ module.exports = function( grunt ) {
 
 	grunt.registerTask( "updateDependencies", [ "bowercopy" ] );
 
+	grunt.registerTask( "test:demos:src", [ "php", "casper:demos.src" ] );
+
+	grunt.registerTask( "test:demos:dist", [ "casper:demos.dist" ] );
+
 	grunt.registerTask( "test",
 		[
 			"clean:testsOutput",
 			"jshint",
+			"test:demos:src",
 			"config:fetchHeadHash",
 			"js:release",
-			"connect", "qunit:http"
+			"demos",
+			"connect",
+			"test:demos:dist",
+			"qunit:http"
 		]
 	);
 	grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] );

bower.json

@@ -17,7 +17,7 @@
 		"jquery": "1.10.2",
 		"jquery-ui": "jquery/jquery-ui#c0ab71056b936627e8a7821f03c044aec6280a40",
 		"jquery-ui-tabs": "jquery/jquery-ui#fadf2b312a05040436451c64bbfaf4814bc62c56",
-		"jquery-hashchange": "gseguin/jquery-hashchange#77c4b3551fc6bdc2ac6b22b2641cfd7ac6b212d2"
+		"jquery-hashchange": "gseguin/jquery-hashchange#2da0c56fd418fa323c136254f971b6176f1ae135"
 	},
 	"devDependencies": {
 		"requirejs": "2.1.2",

build/release.js

@@ -1,12 +1,9 @@
-var cheerio = require( "cheerio" ),
-	fs = require( "fs" ),
-	scp = require( "scp" ),
-	path = require( "path" ),
-	semver = require( "semver" ),
-	shell = require( "shelljs" );
-
 module.exports = function( Release ) {
-	var clonedRepos = {};
+	var cheerio = require( "cheerio" ),
+		fs = require( "fs" ),
+		semver = require( "semver" ),
+		shell = require( "shelljs" ),
+		clonedRepos = {};
 
 	Release.define({
 		issueTracker: "github",
@@ -15,9 +12,7 @@ module.exports = function( Release ) {
 		},
 
 		generateArtifacts: function( done ) {
-			Release.exec(
-				"grunt dist:release"
-			);
+			Release.exec( "grunt dist:release" );
 			done([]);
 		},
 
@@ -27,7 +22,7 @@ module.exports = function( Release ) {
 
 			if ( !clonedRepos[ remote ] ) {
 				console.log( "Cloning " + remote.cyan + "..." );
-				Release.git( "clone " + remote + " " + local, "Error cloning Demos repo." );
+				Release.exec( "git clone " + remote + " " + local, "Error cloning Demos repo." );
 				console.log();
 
 				clonedRepos[ remote ] = local;
@@ -48,17 +43,18 @@ module.exports = function( Release ) {
 
 			if (!Release.preRelease) {
 				console.log( "Updating demos index..." );
-				fs.writeFileSync( repo + "/index.php", "<?php header('Location: " + Release.newVersion + "');" );
+				fs.writeFileSync( repo + "/index.php",
+					"<?php header('Location: " + Release.newVersion + "');" );
 			}
 
 			console.log( "Adding files..." );
 			process.chdir( repo );
-			Release.git( "add ." , "Error adding files." );
-			Release.git( "commit -m '" + commitMessage + "'" , "Error commiting demos files." );
+			Release.exec( "git add .", "Error adding files." );
+			Release.exec( "git commit -m '" + commitMessage + "'", "Error commiting demos files." );
 			Release.exec( "npm version patch" );
 			if ( !Release.isTest ) {
 				console.log( "Pushing to github..." );
-				Release.git( "push --tags origin master", "Error pushing demos to github." );
+				Release.exec( "git push --tags origin master", "Error pushing demos to github." );
 			}
 			console.log();
 		},
@@ -69,7 +65,7 @@ module.exports = function( Release ) {
 
 			if ( !clonedRepos[ remote ] ) {
 				console.log( "Cloning " + remote.cyan + "..." );
-				Release.git( "clone " + remote + " " + local, "Error cloning website repo." );
+				Release.exec( "git clone " + remote + " " + local, "Error cloning website repo." );
 				console.log();
 
 				clonedRepos[ remote ] = local;
@@ -119,11 +115,12 @@ module.exports = function( Release ) {
 
 			console.log( "Adding files..." );
 			process.chdir( repo );
-			Release.git( "add ." , "Error adding files." );
-			Release.git( "commit -m '" + commitMessage + "'" , "Error commiting builder files." );
+			Release.exec( "git add .", "Error adding files." );
+			Release.exec( "git commit -m '" + commitMessage + "'",
+				"Error commiting builder files." );
 			if ( !Release.isTest ) {
 				console.log( "Pushing to github..." );
-				Release.git( "push", "Error pushing builder update to github." );
+				Release.exec( "git push", "Error pushing builder update to github." );
 			}
 			console.log();
 		},
@@ -141,11 +138,11 @@ module.exports = function( Release ) {
 
 			console.log( "Adding files..." );
 			process.chdir( repo );
-			Release.git( "add ." , "Error adding zip files." );
-			Release.git( "commit -m '" + commitMessage + "'" , "Error commiting zip files." );
+			Release.exec( "git add .", "Error adding zip files." );
+			Release.exec( "git commit -m '" + commitMessage + "'", "Error commiting zip files." );
 			if ( !Release.isTest ) {
 				console.log( "Pushing to github..." );
-				Release.git( "push", "Error pushing zip files to github." );
+				Release.exec( "git push", "Error pushing zip files to github." );
 			}
 			console.log();
 		},
@@ -168,3 +165,8 @@ module.exports = function( Release ) {
 		}
 	});
 };
+
+module.exports.dependencies = [
+	"semver@2.2.1",
+	"shelljs@0.2.6"
+];

css/structure/jquery.mobile.forms.fieldcontain.css

@@ -48,7 +48,6 @@
 		width: 78%;
 		-webkit-box-sizing: border-box;
 		-moz-box-sizing: border-box;
-		-ms-box-sizing: border-box;
 		box-sizing: border-box;
 	}
 	/* ui-hide-label deprecated in 1.4. TODO: Remove in 1.5 */

css/structure/jquery.mobile.forms.flipswitch.css

@@ -54,7 +54,6 @@
 	border-style: solid;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
-	-ms-box-sizing: border-box;
 	box-sizing: border-box;
 	border-radius: inherit;
 	overflow: visible;
@@ -72,7 +71,6 @@ html .ui-popup .ui-field-contain > label + .ui-flipswitch {
 	width: 5.875em; /* If you override the width for .ui-flipswitch you should repeat the same value here */
 	-webkit-box-sizing: content-box;
 	-moz-box-sizing: content-box;
-	-ms-box-sizing: content-box;
 	box-sizing: content-box;
 }
 .ui-field-contain .ui-flipswitch.ui-flipswitch-active,

css/structure/jquery.mobile.forms.slider.css

@@ -32,7 +32,6 @@ input.ui-slider-input {
 	appearance: none;
 	-webkit-box-sizing: content-box;
 	-moz-box-sizing: content-box;
-	-ms-box-sizing: content-box;
 	box-sizing: content-box;
 }
 .ui-slider-input::-webkit-outer-spin-button,

css/structure/jquery.mobile.forms.textinput.css

@@ -13,7 +13,6 @@ textarea.ui-input-text {
 	width: 100%;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
-	-ms-box-sizing: border-box;
 	box-sizing: border-box;
 	outline: 0;
 }

demos/jqm-contents.php

@@ -4,9 +4,9 @@
 <li data-filtertext="form button widget input button submit reset"><a href="../button/" data-ajax="false">Button widget</a></li>
 <li data-role="collapsible" data-enhanced="true" data-collapsed-icon="carat-d" data-expanded-icon="carat-u" data-iconpos="right" data-inset="false" class="ui-collapsible ui-collapsible-themed-content ui-collapsible-collapsed">
 	<h3 class="ui-collapsible-heading ui-collapsible-heading-collapsed">
-		<a href="#" class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-right ui-btn-inherit ui-icon-carat-d">
-			Checkboxradio widget<span class="ui-collapsible-heading-status"> click to expand contents</span>
-		</a>
+		<a href="#" class="ui-collapsible-heading-toggle ui-btn ui-btn-icon-right ui-btn-inherit ui-icon-carat-d"
+		    >Checkboxradio widget<span class="ui-collapsible-heading-status"> click to expand contents</span><
+		/a>
 	</h3>
 	<div class="ui-collapsible-content ui-body-inherit ui-collapsible-content-collapsed" aria-hidden="true">
 		<ul>

demos/listview-grid/listview-grid.css

@@ -20,7 +20,6 @@
 	.my-page .ui-listview li > .ui-btn {
 		-webkit-box-sizing: border-box; /* include padding and border in height so we can set it to 100% */
 		-moz-box-sizing: border-box;
-		-ms-box-sizing: border-box;
 		box-sizing: border-box;
 		height: 100%;
 	}

demos/popup-dynamic/index.php

@@ -22,22 +22,27 @@
 					closebtn = '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>',
 					header = '<div data-role="header"><h2>' + brand + ' ' + model + '</h2></div>',
 					img = '<img src="../_assets/img/' + short + '.jpg" alt="' + brand + '" class="photo">',
-					popup = '<div data-role="popup" id="popup-' + short + '" data-short="' + short +'" data-theme="none" data-overlay-theme="a" data-corners="false" data-tolerance="15">' + closebtn + header + img + '</div>';
+					popup = '<div data-role="popup" id="popup-' + short + '" data-short="' + short +'" data-theme="none" data-overlay-theme="a" data-corners="false" data-tolerance="15"></div>';
+
+				// Create the popup.
+				$( header )
+					.appendTo( $( popup )
+						.appendTo( $.mobile.activePage )
+						.popup() )
+					.toolbar()
+					.before( closebtn )
+					.after( img );
 
-				// Create the popup. Trigger "pagecreate" instead of "create" because currently the framework doesn't bind the enhancement of toolbars to the "create" event (js/widgets/page.sections.js).
-				$.mobile.activePage.append( popup ).trigger( "pagecreate" );
 				// Wait with opening the popup until the popup image has been loaded in the DOM.
 				// This ensures the popup gets the correct size and position
 				$( ".photo", "#popup-" + short ).load(function() {
-					var height = $( this ).height(),
-						width = $( this ).width();
-					// Set height and width attribute of the image
-					$( this ).attr({ "height": height, "width": width });
 					// Open the popup
 					$( "#popup-" + short ).popup( "open" );
+
 					// Clear the fallback
 					clearTimeout( fallback );
 				});
+
 				// Fallback in case the browser doesn't fire a load event
 				var fallback = setTimeout(function() {
 					$( "#popup-" + short ).popup( "open" );
@@ -46,6 +51,13 @@
 
 			// Set a max-height to make large images shrink to fit the screen.
 			$( document ).on( "popupbeforeposition", ".ui-popup", function() {
+				var image = $( this ).children( "img" ),
+					height = image.height(),
+					width = image.width();
+
+				// Set height and width attribute of the image
+				$( this ).attr({ "height": height, "width": width });
+
 				// 68px: 2 * 15px for top/bottom tolerance, 38px for the header.
 				var maxHeight = $( window ).height() - 68 + "px";
 

demos/toolbar-fixed-persistent/index.php

@@ -17,11 +17,11 @@
 			$( "[data-role='header'], [data-role='footer']" ).toolbar();
 		});
 		// Update the contents of the toolbars
-		$( document ).on( "pageshow", "[data-role='page']", function() {
+		$( document ).on( "pagecontainershow", function() {
 			// Each of the four pages in this demo has a data-title attribute
 			// which value is equal to the text of the nav button
 			// For example, on first page: <div data-role="page" data-title="Info">
-			var current = $( this ).jqmData( "title" );
+			var current = $( ".ui-page-active" ).jqmData( "title" );
 			// Change the heading
 			$( "[data-role='header'] h1" ).text( current );
 			// Remove active class from nav buttons

demos/toolbar-fixed/index.php

@@ -15,7 +15,7 @@
 <body>
 	<div data-role="page" class="jqm-demos" data-quicklinks="true">
 
-	    <div data-role="header" data-position="fixed" data-fullscreen="true">
+	    <div data-role="header" data-position="fixed">
 			<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 	        <h1>Fixed header</h1>
 	    </div><!-- /header -->

external/jquery/plugins/jquery.hashchange.js

@@ -370,7 +370,7 @@
           iframe_doc.open();
 
           // Set document.domain for the Iframe document as well, if necessary.
-          domain && iframe_doc.write( '<script>document.domain="' + domain + '"</script>' );
+          domain && iframe_doc.write( '\x3cscript>document.domain="' + domain + '"\x3c/script>' );
 
           iframe_doc.close();
 

js/jquery.mobile.js

@@ -11,7 +11,7 @@ define([
 	"./navigation/method",
 	"./transitions/handlers",
 	"./transitions/visuals",
-	"./jquery.mobile.animationComplete.js",
+	"./jquery.mobile.animationComplete",
 	"./jquery.mobile.navigation",
 	"./jquery.mobile.degradeInputs",
 	"./widgets/page.dialog",