From e47a74dd90bfeb472e2efcaa606f481e95830f66 Mon Sep 17 00:00:00 2001 From: toddparker Date: Wed, 25 Jan 2012 14:58:17 -0500 Subject: [PATCH 01/10] Changed version flag to say "1.x Unstable" on master homepage --- docs/_assets/images/version.png | Bin 2179 -> 2444 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/_assets/images/version.png b/docs/_assets/images/version.png index 51dbb3e4be3523bd773a773aca4904c6cf95697b..02b6e4390354b69ac07a6c399a134b35a330452b 100644 GIT binary patch delta 2043 zcmV4;{pOkT<+uIhll|k4^5e7p;)wm=g8koo`rV!R+nD{`cm3RP`P!2G+H3CGn)%p` z`PYd2*=Ft8mHgOX{MK6e)P4NbR`$`A{M1tX)l~e`PyEzS{L@YK&yoDnN%hQz_|0AQ z$#?U_j`+w;?8;j8#%|qz%8U5NNAkmp^1_Akz<}(=O7g&b?8QX&z*O?PY4yED^}S2( zw}S4qdGWVf&b@{4wNml4P42R7+_^>ZvP9gtK<=+(>#Tq3t9$CFYwf5;?WaQOrDNuw zbj_rKz--B1*flr>1X04Dio{(ePdtcsuK%S0V-h4ZriALLVL7jy(*l$^#gD%%@Ro87( z*KA6TfKu0LMAv9O*Jn4^XF82`DUEh4(_TH(T{+WSHqci}&{js!R6)>DG=6C$%t}Jc zNj-06N6bh#%tta%%ttiHJ~_xeHf~!W$UHK|GBU+7G+t6F#4#_#F)&_E8^I?nPDLm` zIw?Li7Ctl*FDo7|DHbj$6D}tW9~=}94hjzp1ONa4Fby2i0002UlXLu1&$*kg7dyN6`~>^qdB2|L zIp_0yxj8vGxw&iBnk?2veibL`vYXefU6Y%elgUXE9)B#Y-nANplbK+ts9Oyn5peRQ4oF+SarBKqz0t^C&j| zpC~T=_QM;r3q1{+S@V!rMC#JO*xuXXR{?J;riLkmv+{mcABfw^dlC9ad>J9+<%67e zIMJ_Wx_%35rp-mrwX7p0hzQ;QhQ}e*r*qL9PRjojgFuxUXGZ2$r z_cH<+r>JWS>s=ysiRW9?-{yY#j37>j4){!Ucz>>HeCTmHm@{2cyK*hVzOKuH@J$E00C0?U zp~vlD%|l*M3)O4j*KiTw7Q{4Ba@v`7sjQB+e+l3N^fA7%bf&Y>B|=+U(J6rA&FC}; zyym#<%$cqr>Vvm0aomHB0E}n>(HaNiZ8cH4B)w&9|APN#7}w;X$;Rjd?w3?u!hiMQ z5Vns-U{?F$_!dYdd8)y_D`?U;>s#o$fUJFBTcAs1@}!kKO)RHJten;w+14MTJu+^o7}DyUF9 z<4EA(_4%_>g}WwbUL3nFnJgvb#DBhA;jRYuzc{QRFzXUMu|I~m7+mLl+^Lk?>Rcvd z1W29O!yNY$eANBL$&TlR1Pur^B%_oWAa!C7HV5MITUc3p&tdiU2Kd7&BB@Im0@6(E zo&I-Wy7w&1z%ktZT>&*2QFmp&DN}$PrDBy3=61|a`*%-60^9!{2mtPkZGV=G0dl6x z)i)jV?VG?sN_1=OOHp!U4p6oZ#Ki8wmL>a_wDxfYVgSf_*q~1Ak)8eH-H5v^bpzTe z$^uZ{G&!*+^DDfDKEYKq7$DS@381LAs!O>3e1_xGjGh9(75kttoE<>Uw3W~$U&oa2 zHbU26hC}-VNMs36-n6PqxPRxHm^(2Ia42cNKU;vD2Vw>aHcNE@j?nhm0qHi02hN{- zTw^~AfO1>OO=2(^{~KMtcZPHT$OLlF*DBeM``?;_6)&;@q;3*%M>ZAr4+2b_R@6Hy zfP7o2O=7^`9tR=b^*J2Y0U-OZfvBQeQ73>uej}j|K+Z!kp-WtI41b>JNPsROS|L=Z z6MK+*c0Tb!e{4u6fKq|f&N$fqiXdeFk~IWUmw3MafF2KxCXl*B9z6i5x}-Ni_Tiy) zKIj8jnSoM$&MdIFT*o7^Po z3rN)^y#eyKEOKJk8E}v~vFi;;nb>s)XeW040WzUb?u-opDBt6jE07TYYGOA8An%u~ zQUx*wpllMW4Fjl~M56#Qp}f&BfbxaIIDot}HW08(FcOd?7z&UG#sYFOT&b}Tj0PBg Z{s)aY(m1PEyp8|>002ovPDHLkV1j(Z4@Cd~ delta 1788 zcmVzPY`-w!OQxyScR6+0BuXIe+`- zsr2W&`{$?q=b!rLt^MYi^X0ew~X^}R*)y-V)3dCk0m@wHOiyHD}5MBKPQ&9!Ci zr$WuHNzJW9=b(4ypLFJ)aOt5`&8j=Ssb=Y%K)t3}=9pK#qfF+PRIZf%ttiHK03%eFke?aURF6?Q!vFcG{rJA#4#^kQ6^qdD8VN!PDd_I zLm*B;7d|x>J~R?9D;_T?7$z?&880XlE+-8i91|ZL5f2Rs4-N_s3@-{LL9F3P`dyY?J9pI7m@0X4guN}DhqWL)e_(>u z(WM2D@Vn}O1dGF`DF?sP3MACG1O*L%Way6F&{fh#m8(l`L(YS^!BeTxokSp#{<7g62@$bXPgT{4wsu+kUedm_u6`UwVaZ z&2y{d@36oKyDSZ=z7$8VQF?{@e*h;~_o?PE`U9nBxc7vo;}$5PLCu$bqVz-Mmr#cl zx=QvU*O*p|k0(6N-OwDG6@+)`8I|~1UpfHQq1MLv(&+F8Rg2FaPy4OV9Jp!~!oz>j zU)AC>Upfd?+G3Ndl@b0fRM7mDKQC}w&fgAJx}{&>2pf68vESKh(W^2cf9ZABL08G< zOUQ(Kr?;+R{OCWFE)Rc0zv7mu#|_P)wsAmKdi;S+`hxHqz5bFA`<7ndh48w-JI*ej zK;ykfp206t`VPiVUsr5t=1T{mwZ!|<_!y2a(_b)t@*3SJDyD8%y)M2KTc-2)z7xlz+&+;t2}{q#$aD+E$xi6@gIw>k_ArbYJ91< z=gY3oS}GDymn3~Zx@U$E`E%0i23D(?fA=LO#95Mg1bsqY zM{lPV-sH(WPGAnKU*ddeFnaEZI6|k;S&}Z&#_I+ut>}z}2(t||82^-zS7Wg_4@idY zgc6FBj-l8RATf#%Ed|5BDi*348K{iU2A%_CEArF8&;T`Hkq1Lg_$ml_~?2-q^=_ z(a`7F`1qsD#SvvYoAad#0i`!~Mpz_svn!t+n*4c15ufe2fA%_ar2ui28fAhI$1}|D zGMN)AWQx5n&B;m!oYsl~qS9^Lo)*IIk@wMCgskJ79#e7>es|>nF^5*pm%{gDE}l4@ zQzEA~r*t;}Anmv=t}~weAgvakJrICIkbOxAqwmz?!vKZZ4A&Wt%&Nu*0z{?loG%IL z@u2`|PxHQ%e@d&w2LnVMZ2XNqHCq}V4$wMDgaf2n`kzT+6#$XYy8WE58i2H?wH8|p!CMBH=yLkt~)@?VPB_V0FlrjcE$z(r2pgcCy)^U#f{w% zfH+^WXHOtw0MaC}(=dQMNi+%|654`>0i=I8j01=>V*>$sf{}n6!B9Y!U@X8?;YbZa eFdAU|7IOo;yO$?oYhC#O0000 Date: Wed, 25 Jan 2012 12:31:29 -0800 Subject: [PATCH 02/10] remove redundant compile output cleaning --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 3a948b70..bbfb2e91 100644 --- a/Makefile +++ b/Makefile @@ -153,8 +153,6 @@ zip: init css js latest: init css docs js zip # Time to put these on the CDN @@scp -qr ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/ - # Do some cleanup to wrap it up - @@rm -rf ${OUTPUT} # ------------------------------------------------- # Build the nightly backups. This is done on a server cronjob From b08ff1ec6a4ebbb6d619d8c1683302931e43ab69 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 14:33:45 -0800 Subject: [PATCH 03/10] Removed extra newline --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 7033b1f1..991f910e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1pre +1.1pre \ No newline at end of file From ae835d0af11e0e822933f127b82b19fbe84ee4de Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 15:20:44 -0800 Subject: [PATCH 04/10] Fixes #3479 Added $.mobile.version --- Makefile | 7 ++++--- js/jquery.mobile.core.js | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bbfb2e91..2534d26c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL} # The CSS theme being used THEME = default -RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main +RUN_JS = @@/usr/local/bin/node @@ -99,7 +99,8 @@ js: init ${RUN_JS} \ external/r.js/dist/r.js \ -o baseUrl="js" \ - include=jquery.mobile exclude=jquery,order \ + include=jquery.mobile \ + exclude=jquery,order,text,text!../version.txt \ out=${OUTPUT}/${NAME}.compiled.js \ pragmasOnSave.jqmBuildExclude=true \ wrap.startFile=build/wrap.start \ @@ -108,7 +109,7 @@ js: init skipModuleInsertion=true \ optimize=none @@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.js - @@cat ${OUTPUT}/${NAME}.compiled.js >> ${OUTPUT}/${NAME}.js + @@cat ${OUTPUT}/${NAME}.compiled.js | sed 's/__version__/"${VER_OFFICIAL}"/g' >> ${OUTPUT}/${NAME}.js @@rm ${OUTPUT}/${NAME}.compiled.js # ..... and then minify it @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 348f359d..af3b51a9 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -4,7 +4,7 @@ //>>group: core //>>required: true -define( [ "jquery", "./jquery.mobile.widget" ], function( $ ) { +define( [ "jquery", "text!../version.txt", "./jquery.mobile.widget" ], function( $, __version__ ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { @@ -13,6 +13,8 @@ define( [ "jquery", "./jquery.mobile.widget" ], function( $ ) { // jQuery.mobile configurable options $.mobile = $.extend( {}, { + version: __version__, + // Namespace used framework-wide for data-attrs. Default is no namespace ns: "", From 5ced7f81cd9ba391b68379841d2adcf7b0955394 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 15:36:49 -0800 Subject: [PATCH 05/10] Added AMD text plugin --- js/text.js | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) create mode 100644 js/text.js diff --git a/js/text.js b/js/text.js new file mode 100644 index 00000000..6ef7422e --- /dev/null +++ b/js/text.js @@ -0,0 +1,283 @@ +/** + * @license RequireJS text 1.0.2 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ +/*jslint regexp: false, nomen: false, plusplus: false, strict: false */ +/*global require: false, XMLHttpRequest: false, ActiveXObject: false, + define: false, window: false, process: false, Packages: false, + java: false, location: false */ + +(function () { + var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'], + xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, + bodyRegExp = /]*>\s*([\s\S]+)\s*<\/body>/im, + hasLocation = typeof location !== 'undefined' && location.href, + defaultProtocol = hasLocation && location.protocol && location.protocol.replace(/\:/, ''), + defaultHostName = hasLocation && location.hostname, + defaultPort = hasLocation && (location.port || undefined), + buildMap = []; + + define(function () { + var text, get, fs; + + if (typeof window !== "undefined" && window.navigator && window.document) { + get = function (url, callback) { + var xhr = text.createXhr(); + xhr.open('GET', url, true); + xhr.onreadystatechange = function (evt) { + //Do not explicitly handle errors, those should be + //visible via console output in the browser. + if (xhr.readyState === 4) { + callback(xhr.responseText); + } + }; + xhr.send(null); + }; + } else if (typeof process !== "undefined" && + process.versions && + !!process.versions.node) { + //Using special require.nodeRequire, something added by r.js. + fs = require.nodeRequire('fs'); + + get = function (url, callback) { + callback(fs.readFileSync(url, 'utf8')); + }; + } else if (typeof Packages !== 'undefined') { + //Why Java, why is this so awkward? + get = function (url, callback) { + var encoding = "utf-8", + file = new java.io.File(url), + lineSeparator = java.lang.System.getProperty("line.separator"), + input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)), + stringBuffer, line, + content = ''; + try { + stringBuffer = new java.lang.StringBuffer(); + line = input.readLine(); + + // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324 + // http://www.unicode.org/faq/utf_bom.html + + // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK: + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058 + if (line && line.length() && line.charAt(0) === 0xfeff) { + // Eat the BOM, since we've already found the encoding on this file, + // and we plan to concatenating this buffer with others; the BOM should + // only appear at the top of a file. + line = line.substring(1); + } + + stringBuffer.append(line); + + while ((line = input.readLine()) !== null) { + stringBuffer.append(lineSeparator); + stringBuffer.append(line); + } + //Make sure we return a JavaScript string and not a Java string. + content = String(stringBuffer.toString()); //String + } finally { + input.close(); + } + callback(content); + }; + } + + text = { + version: '1.0.2', + + strip: function (content) { + //Strips declarations so that external SVG and XML + //documents can be added to a document without worry. Also, if the string + //is an HTML document, only the part inside the body tag is returned. + if (content) { + content = content.replace(xmlRegExp, ""); + var matches = content.match(bodyRegExp); + if (matches) { + content = matches[1]; + } + } else { + content = ""; + } + return content; + }, + + jsEscape: function (content) { + return content.replace(/(['\\])/g, '\\$1') + .replace(/[\f]/g, "\\f") + .replace(/[\b]/g, "\\b") + .replace(/[\n]/g, "\\n") + .replace(/[\t]/g, "\\t") + .replace(/[\r]/g, "\\r"); + }, + + createXhr: function () { + //Would love to dump the ActiveX crap in here. Need IE 6 to die first. + var xhr, i, progId; + if (typeof XMLHttpRequest !== "undefined") { + return new XMLHttpRequest(); + } else { + for (i = 0; i < 3; i++) { + progId = progIds[i]; + try { + xhr = new ActiveXObject(progId); + } catch (e) {} + + if (xhr) { + progIds = [progId]; // so faster next time + break; + } + } + } + + if (!xhr) { + throw new Error("createXhr(): XMLHttpRequest not available"); + } + + return xhr; + }, + + get: get, + + /** + * Parses a resource name into its component parts. Resource names + * look like: module/name.ext!strip, where the !strip part is + * optional. + * @param {String} name the resource name + * @returns {Object} with properties "moduleName", "ext" and "strip" + * where strip is a boolean. + */ + parseName: function (name) { + var strip = false, index = name.indexOf("."), + modName = name.substring(0, index), + ext = name.substring(index + 1, name.length); + + index = ext.indexOf("!"); + if (index !== -1) { + //Pull off the strip arg. + strip = ext.substring(index + 1, ext.length); + strip = strip === "strip"; + ext = ext.substring(0, index); + } + + return { + moduleName: modName, + ext: ext, + strip: strip + }; + }, + + xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/, + + /** + * Is an URL on another domain. Only works for browser use, returns + * false in non-browser environments. Only used to know if an + * optimized .js version of a text resource should be loaded + * instead. + * @param {String} url + * @returns Boolean + */ + useXhr: function (url, protocol, hostname, port) { + var match = text.xdRegExp.exec(url), + uProtocol, uHostName, uPort; + if (!match) { + return true; + } + uProtocol = match[2]; + uHostName = match[3]; + + uHostName = uHostName.split(':'); + uPort = uHostName[1]; + uHostName = uHostName[0]; + + return (!uProtocol || uProtocol === protocol) && + (!uHostName || uHostName === hostname) && + ((!uPort && !uHostName) || uPort === port); + }, + + finishLoad: function (name, strip, content, onLoad, config) { + content = strip ? text.strip(content) : content; + if (config.isBuild) { + buildMap[name] = content; + } + onLoad(content); + }, + + load: function (name, req, onLoad, config) { + //Name has format: some.module.filext!strip + //The strip part is optional. + //if strip is present, then that means only get the string contents + //inside a body tag in an HTML string. For XML/SVG content it means + //removing the declarations so the content can be inserted + //into the current doc without problems. + + // Do not bother with the work if a build and text will + // not be inlined. + if (config.isBuild && !config.inlineText) { + onLoad(); + return; + } + + var parsed = text.parseName(name), + nonStripName = parsed.moduleName + '.' + parsed.ext, + url = req.toUrl(nonStripName), + useXhr = (config && config.text && config.text.useXhr) || + text.useXhr; + + //Load the text. Use XHR if possible and in a browser. + if (!hasLocation || useXhr(url, defaultProtocol, defaultHostName, defaultPort)) { + text.get(url, function (content) { + text.finishLoad(name, parsed.strip, content, onLoad, config); + }); + } else { + //Need to fetch the resource across domains. Assume + //the resource has been optimized into a JS module. Fetch + //by the module name + extension, but do not include the + //!strip part to avoid file system issues. + req([nonStripName], function (content) { + text.finishLoad(parsed.moduleName + '.' + parsed.ext, + parsed.strip, content, onLoad, config); + }); + } + }, + + write: function (pluginName, moduleName, write, config) { + if (moduleName in buildMap) { + var content = text.jsEscape(buildMap[moduleName]); + write.asModule(pluginName + "!" + moduleName, + "define(function () { return '" + + content + + "';});\n"); + } + }, + + writeFile: function (pluginName, moduleName, req, write, config) { + var parsed = text.parseName(moduleName), + nonStripName = parsed.moduleName + '.' + parsed.ext, + //Use a '.js' file name so that it indicates it is a + //script that can be loaded across domains. + fileName = req.toUrl(parsed.moduleName + '.' + + parsed.ext) + '.js'; + + //Leverage own load() method to load plugin value, but only + //write out values that do not have the strip argument, + //to avoid any potential issues with ! in file names. + text.load(nonStripName, req, function (value) { + //Use own write() method to construct full module value. + //But need to create shell that translates writeFile's + //write() to the right interface. + var textWrite = function (contents) { + return write(fileName, contents); + }; + textWrite.asModule = function (moduleName, contents) { + return write.asModule(moduleName, fileName, contents); + }; + + text.write(pluginName, nonStripName, textWrite, config); + }, config); + } + }; + + return text; + }); +}()); From b467dfb5369ac876a57a6a30476cc581f277476b Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 16:34:35 -0800 Subject: [PATCH 06/10] Revert unwanted change use rhino to run JavaScript --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2534d26c..89282609 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL} # The CSS theme being used THEME = default -RUN_JS = @@/usr/local/bin/node +RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main From e78c5ccf8babfa160feedd414e28c6a2970d110a Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 16:51:39 -0800 Subject: [PATCH 07/10] Added exclusions for the docs bundle --- build/docs.build.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/docs.build.js b/build/docs.build.js index 8f38ee18..23f2f564 100644 --- a/build/docs.build.js +++ b/build/docs.build.js @@ -19,7 +19,8 @@ modules: [ { - name: "jquery.mobile.docs" + name: "jquery.mobile.docs", + exclude: [ "jquery", "order" , "text", "text!../version.txt" ] } ], From 5062e566b8962985ceb608919f317d32589a05b1 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 16:52:16 -0800 Subject: [PATCH 08/10] Fixed version string in built bundles (docs and main) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 89282609..135caf23 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ VER = sed "s/v@VERSION/$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd")/" VER_MIN = "/*! jQuery Mobile v$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd") jquerymobile.com | jquery.org/license */" VER_OFFICIAL = $(shell cat version.txt) +SED_VER_API = sed 's/__version__/"${VER_OFFICIAL}"/g' deploy: VER = sed "s/v@VERSION/${VER_OFFICIAL}/" deploy: VER_MIN = "/*! jQuery Mobile v${VER_OFFICIAL} jquerymobile.com | jquery.org/license */" @@ -72,7 +73,7 @@ docs: init # ... Prepend versioned license @@cat LICENSE-INFO.txt | ${VER} > tmp/${NAME}/LICENSE-INFO.txt @@cat tmp/${NAME}/LICENSE-INFO.txt | cat - tmp/${NAME}/js/jquery.mobile.docs.js > tmp/${NAME}/js/jquery.mobile.docs.js.tmp - @@mv tmp/${NAME}/js/jquery.mobile.docs.js.tmp tmp/${NAME}/js/jquery.mobile.docs.js + @@cat tmp/${NAME}/js/jquery.mobile.docs.js.tmp | ${SED_VER_API} > tmp/${NAME}/js/jquery.mobile.docs.js @@cat tmp/${NAME}/LICENSE-INFO.txt | cat - tmp/${NAME}/css/themes/default/${NAME}.css > tmp/${NAME}/css/themes/default/${NAME}.css.tmp @@mv tmp/${NAME}/css/themes/default/${NAME}.css.tmp tmp/${NAME}/css/themes/default/${NAME}.css # ... Move and zip up the the whole folder @@ -109,7 +110,7 @@ js: init skipModuleInsertion=true \ optimize=none @@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.js - @@cat ${OUTPUT}/${NAME}.compiled.js | sed 's/__version__/"${VER_OFFICIAL}"/g' >> ${OUTPUT}/${NAME}.js + @@cat ${OUTPUT}/${NAME}.compiled.js | ${SED_VER_API} >> ${OUTPUT}/${NAME}.js @@rm ${OUTPUT}/${NAME}.compiled.js # ..... and then minify it @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js From e1d98a7e1b17fb4d615f13994ef5555b04d2998f Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 20:54:16 -0800 Subject: [PATCH 09/10] Removed use of order! plugin --- js/jquery.mobile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js index 071db495..57f9c7f9 100644 --- a/js/jquery.mobile.js +++ b/js/jquery.mobile.js @@ -10,8 +10,8 @@ define([ './jquery.mobile.hashchange', './jquery.mobile.page', './jquery.mobile.core', - 'order!./jquery.mobile.navigation', - 'order!./jquery.mobile.navigation.pushstate', + './jquery.mobile.navigation', + './jquery.mobile.navigation.pushstate', './jquery.mobile.transition', './jquery.mobile.transition.pop', './jquery.mobile.transition.slide', From 022b75d111d0811acc3324d611dbbf5401639927 Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Wed, 25 Jan 2012 21:05:02 -0800 Subject: [PATCH 10/10] Added comment --- js/jquery.mobile.core.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index af3b51a9..2bb3b6a0 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -13,6 +13,7 @@ define( [ "jquery", "text!../version.txt", "./jquery.mobile.widget" ], function( // jQuery.mobile configurable options $.mobile = $.extend( {}, { + // Version of the jQuery Mobile Framework version: __version__, // Namespace used framework-wide for data-attrs. Default is no namespace