Merge branch 'master' of https://github.com/jquery/jquery-mobile

redaemn · Oct 26, 2011 · 3e0928f · 3e0928f
2 parents 1405a94 + bc97aa6
commit 3e0928f
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -7,6 +7,7 @@ VER = $(shell cat version.txt)
 # The command to replace the @VERSION in the files with the actual version
 SED_VER = sed "s/@VERSION/$(shell git log -1 --format=format:" Git > Date: %cd Info SHA1: %H")/"
 deploy:  SED_VER = sed "s/@VERSION/${VER}/"
+MIN_VER = "/*! jQuery Mobile v@VERSION jquerymobile.com | jquery.org/license */"
 
 # The version of jQuery core used
 JQUERY = $(shell grep Library js/jquery.js | sed s'/ \* jQuery JavaScript Library v//')
@@ -110,6 +111,8 @@ css: init
 # Build the minified CSS file
 cssmin: init css
 	# Build the minified CSS file
+	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${CSSMIN}
+	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTUREMIN}
 	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSS} >> ${OUTPUT}/${CSSMIN}
 	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${CSSSTRUCTURE} >> ${OUTPUT}/${CSSSTRUCTUREMIN}
 
@@ -128,14 +131,14 @@ init:
 # Build the minified JS file
 min: init js
 	# Build the minified JavaScript file
-	@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${MIN}
+	@@echo ${MIN_VER} | ${SED_VER} > ${OUTPUT}/${MIN}
 	@@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
 	@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}
 	@@rm -f ${MIN}.tmp
 
 # Let the user know the files were built and where they are
 notify:
-	@@echo "The files have been built and are in " $$(pwd)/${OUTPUT}
+	@@echo "The files have been built and are in: " $$(pwd)/${OUTPUT}
 
 # Pull the latest commits. This is used for the nightly build but can be used to save some keystrokes
 pull:

diff --git a/css/structure/jquery.mobile.dialog.css b/css/structure/jquery.mobile.dialog.css
@@ -4,7 +4,23 @@
 * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
 */
 .ui-dialog { min-height: 480px; }
-.ui-dialog .ui-header, .ui-dialog .ui-content,  .ui-dialog .ui-footer { max-width: 500px; margin: 10% auto 15px auto; padding: 15px; width: 85%; position: relative; }
-.ui-dialog .ui-header { padding: 0 15px; }
-.ui-dialog .ui-header, .ui-dialog .ui-footer { z-index: 10; }
-.ui-dialog .ui-content, .ui-dialog .ui-footer { margin-top: -15px;  }
+.ui-dialog .ui-header, 
+.ui-dialog .ui-content, 
+.ui-dialog .ui-footer { 
+	max-width: 500px; 
+	margin: 10% auto 15px auto; 
+	width: 85%; 
+	position: relative; 
+}
+.ui-dialog .ui-header, 
+.ui-dialog .ui-footer  { 
+	padding: 0 15px; 
+	z-index: 10; 
+}
+.ui-dialog .ui-content { 
+	padding: 15px; 
+}
+.ui-dialog .ui-content, 
+.ui-dialog .ui-footer { 
+	margin-top: -15px;  
+}
diff --git a/css/structure/jquery.mobile.forms.textinput.css b/css/structure/jquery.mobile.forms.textinput.css
@@ -4,7 +4,7 @@
 * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
 */
 label.ui-input-text { font-size: 16px; line-height: 1.4; display: block; font-weight: normal; margin: 0 0 .3em; }
-input.ui-input-text, textarea.ui-input-text { background-image: none; padding: .4em 1.5%; line-height: 1.4; font-size: 16px; display: block; width: 97%; }
+input.ui-input-text, textarea.ui-input-text { background-image: none; padding: .4em; line-height: 1.4; font-size: 16px; display: block; width: 97%; }
 input.ui-input-text { -webkit-appearance: none; }
 textarea.ui-input-text { height: 50px; -webkit-transition: height 200ms linear; -moz-transition: height 200ms linear; -o-transition: height 200ms linear; transition: height 200ms linear; }
 .ui-input-search { padding: 0 30px; background-image: none; position: relative; }

diff --git a/css/themes/default/jquery.mobile.theme.css b/css/themes/default/jquery.mobile.theme.css
@@ -1,4 +1,4 @@
-/*!
+/*
 * jQuery Mobile Framework
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
@@ -27,7 +27,7 @@
 .ui-bar-a select, 
 .ui-bar-a textarea, 
 .ui-bar-a button {
-	font-family: Helvetica, Arial, sans-serif /*{a-bar-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-bar-a .ui-link-inherit {
 	color: #fff /*{a-bar-color}*/;
@@ -67,7 +67,7 @@
 .ui-body-a select,
 .ui-body-a textarea,
 .ui-body-a button {
-	font-family: Helvetica, Arial, sans-serif /*{a-body-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-body-a .ui-link-inherit {
 	color: 	#fff /*{a-body-color}*/;
@@ -141,7 +141,7 @@
 .ui-btn-up-a,
 .ui-btn-hover-a,
 .ui-btn-down-a {
-	font-family: Helvetica, Arial, sans-serif /*{a-button-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 	text-decoration: none;
 }
 
@@ -167,7 +167,7 @@
 .ui-bar-b select,
 .ui-bar-b textarea,
 .ui-bar-b button {
-	font-family: Helvetica, Arial, sans-serif /*{b-bar-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-bar-b .ui-link-inherit {
 	color: 	#fff /*{b-bar-color}*/;
@@ -206,7 +206,7 @@
 .ui-body-b select,
 .ui-body-b textarea,
 .ui-body-b button {
-	font-family: Helvetica, Arial, sans-serif /*{b-body-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-body-b .ui-link-inherit {
 	color: 	#333333 /*{b-body-color}*/;
@@ -280,7 +280,7 @@
 .ui-btn-up-b,
 .ui-btn-hover-b,
 .ui-btn-down-b {
-	font-family: Helvetica, Arial, sans-serif /*{b-button-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 	text-decoration: none;
 }
 
@@ -327,7 +327,7 @@
 .ui-bar-c select,
 .ui-bar-c textarea,
 .ui-bar-c button {
-	font-family: Helvetica, Arial, sans-serif /*{c-bar-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-body-c {
 	border: 1px solid 		#B3B3B3 /*{c-body-border}*/;
@@ -346,7 +346,7 @@
 .ui-body-c select,
 .ui-body-c textarea,
 .ui-body-c button {
-	font-family: Helvetica, Arial, sans-serif /*{c-body-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 
 .ui-body-c .ui-link-inherit {
@@ -422,7 +422,7 @@
 .ui-btn-up-c,
 .ui-btn-hover-c,
 .ui-btn-down-c {
-	font-family: Helvetica, Arial, sans-serif /*{c-button-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 	text-decoration: none;
 }
 
@@ -447,7 +447,7 @@
 .ui-bar-d select,
 .ui-bar-d textarea,
 .ui-bar-d button {
-	font-family: Helvetica, Arial, sans-serif /*{d-bar-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 
 .ui-bar-d .ui-link-inherit {
@@ -487,7 +487,7 @@
 .ui-body-d select,
 .ui-body-d textarea,
 .ui-body-d button {
-	font-family: Helvetica, Arial, sans-serif /*{d-body-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 
 .ui-body-d .ui-link-inherit {
@@ -563,7 +563,7 @@
 .ui-btn-up-d,
 .ui-btn-hover-d,
 .ui-btn-down-d {
-	font-family: Helvetica, Arial, sans-serif /*{d-button-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 	text-decoration: none;
 }
 
@@ -588,7 +588,7 @@
 .ui-bar-e select,
 .ui-bar-e textarea,
 .ui-bar-e button {
-	font-family: Helvetica, Arial, sans-serif /*{e-bar-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-bar-e .ui-link-inherit {
 	color: 	#333333 /*{e-bar-color}*/;
@@ -627,7 +627,7 @@
 .ui-body-e select,
 .ui-body-e textarea,
 .ui-body-e button {
-	font-family: Helvetica, Arial, sans-serif /*{e-body-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-body-e .ui-link-inherit {
 	color: 	#333333 /*{e-body-color}*/;
@@ -702,7 +702,7 @@
 .ui-btn-up-e,
 .ui-btn-hover-e,
 .ui-btn-down-e {
-	font-family: Helvetica, Arial, sans-serif /*{e-button-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 	text-decoration: none;
 }
 
@@ -733,7 +733,7 @@ a.ui-link-inherit {
 	background-image:     -ms-linear-gradient(top, #85bae4 /*{global-active-background-start}*/, #5393c5 /*{global-active-background-end}*/); /* IE10 */
 	background-image:      -o-linear-gradient(top, #85bae4 /*{global-active-background-start}*/, #5393c5 /*{global-active-background-end}*/); /* Opera 11.10+ */
 	background-image:         linear-gradient(top, #85bae4 /*{global-active-background-start}*/, #5393c5 /*{global-active-background-end}*/);
-	font-family: Helvetica, Arial, sans-serif /*{global-active-font}*/;
+	font-family: Helvetica, Arial, sans-serif /*{global-font-family}*/;
 }
 .ui-btn-active a.ui-link-inherit {
 	color: 					#fff /*{global-active-color}*/;
@@ -1131,4 +1131,4 @@ a.ui-link-inherit {
 /* ...and bring back focus */
 .ui-mobile-nosupport-boxshadow .ui-focus {
 	outline-width: 2px;
-}
+}
diff --git a/js/jquery.js b/js/jquery.js
@@ -13,6 +13,7 @@
  *
  * Date: Mon Sep 12 18:54:48 2011 -0400
  */
+
 (function( window, undefined ) {
 
 // Use the correct document accordingly with window argument (sandbox)
@@ -9043,4 +9044,4 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
-})(window);
+})(window);
diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js
@@ -1,5 +1,5 @@
 /*
-* jQuery Mobile Framework : plugin for making button-like links
+* jQuery Mobile Framework : "buttons" plugin - for making button-like links
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license

diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js
@@ -1,11 +1,10 @@
-/*!
- * jQuery Mobile v@VERSION
- * http://jquerymobile.com/
- *
- * Copyright 2010, jQuery Project
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- */
+/*
+* jQuery Mobile Framework : "core" - The base file for jQm
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+
 
 (function( $, window, undefined ) {
 

diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
@@ -1,9 +1,10 @@
 /*
-* jQuery Mobile Framework : events
+* jQuery Mobile Framework : "events" plugin - Handles events
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 */
+
 (function( $, window, undefined ) {
 
 // add new event shortcuts
@@ -238,7 +239,7 @@ $.event.special.swipe = {
 			last_orientation = orientation;
 			win.trigger( "orientationchange" );
 		}
-	};
+	}
 
 	// Get the current page orientation. This method is exposed publicly, should it
 	// be needed, as jQuery.event.special.orientationchange.orientation()

diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js
@@ -1,11 +1,9 @@
-/*!
- * jQuery Mobile v@VERSION
- * http://jquerymobile.com/
- *
- * Copyright 2010, jQuery Project
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- */
+/*
+* jQuery Mobile Framework : "init" - Initialize the framework
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
 
 (function( $, window, undefined ) {
 	var	$html = $( "html" ),

diff --git a/js/jquery.mobile.media.js b/js/jquery.mobile.media.js
@@ -4,6 +4,7 @@
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 */
+
 (function( $, undefined ) {
 
 var $window = $( window ),
@@ -44,4 +45,4 @@ $.mobile.media = (function() {
 	};
 })();
 
-})(jQuery);
+})(jQuery);
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
@@ -4,6 +4,7 @@
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 */
+
 ( function( $, undefined ) {
 
 	//define vars for interal use
@@ -739,7 +740,7 @@
 		// attribute and in need of enhancement.
 		if ( page.length === 0 && dataUrl && !path.isPath( dataUrl ) ) {
 			page = settings.pageContainer.children( "#" + dataUrl )
-				.attr( "data-" + $.mobile.ns + "url", dataUrl )
+				.attr( "data-" + $.mobile.ns + "url", dataUrl );
 		}
 
 		// If we failed to find a page in the DOM, check the URL to see if it

diff --git a/js/jquery.mobile.navigation.pushstate.js b/js/jquery.mobile.navigation.pushstate.js
@@ -4,6 +4,7 @@
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 */
+
 ( function( $, window ) {
 	// For now, let's Monkeypatch this onto the end of $.mobile._registerInternalEvents
 	// Scope self to pushStateHandler so we can reference it sanely within the
@@ -133,4 +134,4 @@
 			pushStateHandler.init();
 		}
 	});
-})( jQuery, this );
+})( jQuery, this );
diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js
@@ -1,11 +1,9 @@
-/*!
- * jQuery Mobile v@VERSION
- * http://jquerymobile.com/
- *
- * Copyright 2010, jQuery Project
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- */
+/*
+* jQuery Mobile Framework : "transitions" plugin - Page change tranistions
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
 
 (function( $, window, undefined ) {
 

diff --git a/js/jquery.ui.widget.js b/js/jquery.ui.widget.js
@@ -7,6 +7,7 @@
  *
  * http://docs.jquery.com/UI/Widget
  */
+
 (function( $, undefined ) {
 
 // jQuery 1.4+