Merge pull request #2840 from eddiemonge/min_license

Standardize licenses in files and match jQuery core min license in min fi

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:

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.
@@ -1131,4 +1131,4 @@ a.ui-link-inherit {
 /* ...and bring back focus */
 .ui-mobile-nosupport-boxshadow .ui-focus {
 	outline-width: 2px;
-}
+}

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);

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

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 ) {
 

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()

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" ),

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);

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

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 );

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 ) {
 

js/jquery.ui.widget.js

@@ -7,6 +7,7 @@
  *
  * http://docs.jquery.com/UI/Widget
  */
+
 (function( $, undefined ) {
 
 // jQuery 1.4+