Merge remote branch 'upstream/master' into beta-pre

Conflicts:
	js/jquery.mobile.navigation.js

Author: asyraf9

.gitignore

@@ -8,3 +8,4 @@ combined/
 combine/
 compiled/
 gitstatus.log
+refreshCDN

Makefile

@@ -3,11 +3,10 @@ DATE = $(shell date "+%Y%m%d")
 
 # The version according to the source file. If this is the nightly build, use a different version
 VER = $(shell cat version.txt)
-nightly: VER = nightly
 
 # The command to replace the @VERSION in the files with the actual version
-SED_VER = sed "s/@VERSION/${VER}/"
-nightly: SED_VER = sed "s/@VERSION/Nightly-${DATE}/"
+SED_VER = sed "s/@VERSION/$(shell git log -1 --format=format:" Git Build\n * Git Info SHA1: %H Date: %cd")/"
+deploy:  SED_VER = sed "s/@VERSION/${VER}/"
 
 # The version of jQuery core used
 JQUERY = $(shell grep Library js/jquery.js | sed s'/ \* jQuery JavaScript Library v//')
@@ -26,7 +25,6 @@ NIGHTLY_OUTPUT = nightlies/${DATE}
 ifeq (${NIGHTLY_OUTPUT}, latest)
 	RMLATEST = ssh [email protected] 'rm -rf /var/www/html/code.jquery.com/mobile/latest'
 	DIR = jquery.mobile
-	SED_VER = sed "s/@VERSION/ LatestBuild/"
 endif
 NIGHTLY_WEBPATH = http://code.jquery.com/mobile/${NIGHTLY_OUTPUT}
 
@@ -89,21 +87,30 @@ all: init js min css cssmin notify
 
 # Build the normal CSS file.
 css: init
+	# Build the CSS file
 	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSS}
 	@@cat ${CSSFILES} >> ${OUTPUT}/${CSS}
 
 # Build the minified CSS file
 cssmin: init css
-	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSMIN}
+	# Build the minified CSS file
 	@@java -jar build/yuicompressor-2.4.4.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
 
 # Build the normal JS file
 js: init
+	# Build the JavaScript file
 	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${JS}
 	@@cat ${JSFILES} >> ${OUTPUT}/${JS}
 
+# Create the output directory. This is in a separate step so its not dependant on other targets
+init:
+	# Building jQuery Mobile in the "${OUTPUT}" folder
+	@@rm -rf ${OUTPUT}
+	@@mkdir ${OUTPUT}
+
 # Build the minified JS file
 min: init js
+	# Build the minified Javascript file
 	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${MIN}
 	@@java -jar build/google-compiler-20110405.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
 	@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}
@@ -113,18 +120,12 @@ min: init js
 notify:
 	@@echo "The files have been built and are in " $$(pwd)/${OUTPUT}
 
-# Create the output directory. This is in a separate step so its not dependant on other targets
-init:
-	@@rm -rf ${OUTPUT}
-	@@mkdir ${OUTPUT}
-
 # Pull the latest commits. This is used for the nightly build but can be used to save some keystrokes
 pull: 
 	@@git pull --quiet
 
 # Zip the 4 files and the theme images into one convenient package
 zip: init js min css cssmin
-	@@rm -rf ${DIR}
 	@@mkdir -p ${DIR}
 	@@cp ${OUTPUT}/${DIR}*.js ${DIR}/
 	@@cp ${OUTPUT}/${DIR}*.css ${DIR}/
@@ -139,7 +140,7 @@ nightly: pull zip
 	@@echo $$"\nGit Release Version: " >> ${OUTPUT}/log.txt
 	@@cat version.txt >> ${OUTPUT}/log.txt
 	@@echo $$"\nGit Information for this build:" >> ${OUTPUT}/log.txt
-	@@git log -1 --format=format:"SHA1: %H %nDate: %cd %nTitle: %s" >> ${OUTPUT}/log.txt
+	@@git log -1 --format=format:"SHA1: %H \nDate: %cd \nTitle: %s" >> ${OUTPUT}/log.txt
 
 	# Create the folder to hold the files for the demos
 	@@mkdir -p ${VER}
@@ -176,12 +177,11 @@ nightly: pull zip
 # Used by the jQuery team to deploy a build to the CDN
 deploy: zip
 	# Deploy to CDN
-	@@mv ${DIR} ${VER}
-	@@cp ${DIR}.zip ${VER}/
+	@@mv ${OUTPUT} ${VER}
 	@@scp -r ${VER} [email protected]:/var/www/html/code.jquery.com/mobile/
-	@@mv ${VER} ${DIR}
+	@@mv ${VER} ${OUTPUT}
 
-	# Deploy Demos
+	# Deploy Demos to the jQueryMobile.com site
 	@@mkdir -p ${VER}
 	@@cp -r index.html themes experiments docs ${VER}/
 
@@ -199,3 +199,7 @@ deploy: zip
 	@@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="js/"|src="http://code.jquery.com/mobile/${VER}/${DIR}.min.js"|g' {} \;
 
 	@@scp -r ${VER} [email protected]:/srv/jquerymobile.com/htdocs/demos/
+
+	# Clean up the local files
+	@@rm -rf ${VER}
+	@@echo "All Done"

docs/about/accessibility.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Accessibility</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/about/features.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Features</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/about/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Mobile Framework - About</title>
 	<link rel="stylesheet" href="../../themes/default/" />
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/about/intro.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Intro</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/about/platforms.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Supported platforms</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
@@ -38,7 +38,7 @@ <h2>Target platform additions for beta</h2>
 
 				<p>Since jQuery Mobile is built on the jQuery core, all pages should also work great on most recent versions of desktop browsers too - Firefox, Chrome, Safari, Internet Explorer, Opera, etc.</p>
 
-				<p>For more information about browser support, view the <a href="https://github.com/jquery/jquery-mobile/wiki/Current-development-status-">current browser support status and known issues</a> and the project's target <a href="http://jquerymobile.com/gbs/" rel="external"><strong>graded browser matrix</strong>.</p>
+				<p>For more information about browser support, view the <a href="https://github.com/jquery/jquery-mobile/wiki/Current-development-status">current browser support status and known issues</a> and the project's target <a href="http://jquerymobile.com/gbs/" rel="external"><strong>graded browser matrix</strong>.</p>
 
 
 
@@ -48,4 +48,4 @@ <h2>Target platform additions for beta</h2>
 </div><!-- /page -->
 
 </body>
-</html>
+</html>

docs/api/events.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Events</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/api/globalconfig.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Configuring default settings</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/api/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Mobile Framework - API</title>
 	<link rel="stylesheet" href="../../themes/default/" />
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/api/mediahelpers.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Responsive Layout Helpers</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
@@ -22,9 +22,11 @@ <h1>Responsive Layout Helpers</h1>
 
 
 			<h2>Media Query Helper Classes</h2>
+<p class="ui-bar-e ui-body"><strong>Note: This feature is deprecated in beta, and will be removed after that. We recommend using CSS3 Media Queries instead.</strong></p>
 			<p>jQuery Mobile adds classes to the <code>HTML</code> element that mimic browser orientation and common min/max-width CSS media queries. These classes are updated on load, resize and orientationchange, allowing you to key off these classes in your CSS, to create <a href="http://www.alistapart.com/articles/responsive-web-design/">responsive layouts</a> - even in browsers that don't support media queries! </p>
 
-			<h3>Orientation Classes</h3>
+			<h3>Orientation Classes </h3>
+
 			<p>The HTML element will always have a class of either "portrait" or "landscape", depending on the orientation of the browser or device. You can utilize these in your CSS like this:</p>
 			<pre>
 			<code>

docs/api/methods.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Methods</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/api/themes.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Framework - Static Containers, States</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
@@ -154,7 +154,7 @@ <h2>Lists &amp; Buttons</h2>
 		<p>If you want to add visual emphasis to a button and help it stand out visually from its parent toolbar, an alternate swatch color can be set by adding a <code> data-theme="a"</code> to the anchor. Once an alternate swatch color is set on a button in the markup, the framework won't override that color if the parent theme is changed, because you made a conscious decision to set it.</p>
 
 		<div class="swatch-bars">
-			<div data-role="header" data-theme="a" class="ui-bar" data-backbtn="false">
+			<div data-role="header" data-theme="a" class="ui-bar" >
 				<div><!-- wrapper div to have control over butttons -->
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="a">A</a>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="b">B</a>
@@ -163,7 +163,7 @@ <h2>Lists &amp; Buttons</h2>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="e">E</a>
 				</div>
 			</div>
-			<div data-role="header" data-theme="b" class="ui-bar" data-backbtn="false">
+			<div data-role="header" data-theme="b" class="ui-bar" >
 				<div><!-- wrapper div to have control over butttons -->
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="a">A</a>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="b">B</a>
@@ -172,7 +172,7 @@ <h2>Lists &amp; Buttons</h2>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="e">E</a>
 				</div>
 			</div>
-			<div data-role="header" data-theme="c" class="ui-bar" data-backbtn="false">
+			<div data-role="header" data-theme="c" class="ui-bar" >
 				<div><!-- wrapper div to have control over butttons -->
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="a">A</a>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="b">B</a>
@@ -181,7 +181,7 @@ <h2>Lists &amp; Buttons</h2>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="e">E</a>
 				</div>
 			</div>
-			<div data-role="header" data-theme="d" class="ui-bar" data-backbtn="false">
+			<div data-role="header" data-theme="d" class="ui-bar" >
 				<div><!-- wrapper div to have control over butttons -->
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="a">A</a>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="b">B</a>
@@ -190,7 +190,7 @@ <h2>Lists &amp; Buttons</h2>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="e">E</a>
 				</div>
 			</div>
-			<div data-role="header" data-theme="e" class="ui-bar" data-backbtn="false">
+			<div data-role="header" data-theme="e" class="ui-bar" >
 				<div><!-- wrapper div to have control over butttons -->
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="a">A</a>
 					<a href="index.html" data-role="button" data-icon="arrow-l" data-theme="b">B</a>

docs/buttons/api-buttons.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Buttons</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/buttons/buttons-grouped.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Grouped Buttons</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/> 

docs/buttons/buttons-icons.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Button icons</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/buttons/buttons-inline.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Inline buttons</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/buttons/buttons-themes.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Button Theming</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/buttons/buttons-types.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Button types</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/buttons/index.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Buttons</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/content/api-content.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Content formatting</title> 
 	<link rel="stylesheet"  href="../../themes/default/" /> 
 	<script src="../../js/jquery.js"></script>

docs/content/content-collapsible.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Collapsible Content</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/content/content-grids.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Content Grids</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/content/content-html.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - HTML formatting</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>

docs/content/content-themes.html

@@ -2,7 +2,7 @@
 <html> 
 	<head>
 	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1"> 
+	<meta name="viewport" content="width=device-width, initial-scale=1"> 
 	<title>jQuery Mobile Docs - Content Themes</title> 
 	<link rel="stylesheet"  href="../../themes/default/" />  
 	<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>