From 3080b2a9c4fd7d39bd504c257ac97f2e1e7a9ef4 Mon Sep 17 00:00:00 2001 From: Maurice Gottlieb Date: Tue, 1 Nov 2011 14:34:53 +0100 Subject: [PATCH 01/15] removing now also the ui-btn-down-x class when button loses focus --- js/jquery.mobile.buttonMarkup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js index be891837..2ee8a5e3 100644 --- a/js/jquery.mobile.buttonMarkup.js +++ b/js/jquery.mobile.buttonMarkup.js @@ -165,7 +165,7 @@ var attachEvents = function() { if ( btn ) { $btn = $( btn ); theme = $btn.attr( "data-" + $.mobile.ns + "theme" ); - $btn.removeClass( "ui-btn-hover-" + theme ).addClass( "ui-btn-up-" + theme ); + $btn.removeClass( "ui-btn-hover-" + theme + " ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme ); } } }); From 97091702358d7a4fec11f17adabf63cda79fec15 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Tue, 8 Nov 2011 15:00:35 -0800 Subject: [PATCH 02/15] Step 1 Remove unneeded PHP hook files --- .gitignore | 2 -- gitposthook.php | 5 ----- gitpushlatest.php | 10 ---------- 3 files changed, 17 deletions(-) delete mode 100755 gitposthook.php delete mode 100755 gitpushlatest.php diff --git a/.gitignore b/.gitignore index ad8d0959..e2dec537 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,6 @@ cache/ combined/ combine/ compiled/ -gitstatus.log -refreshCDN *.swp .gitignore tests/speed/stats/stats.db diff --git a/gitposthook.php b/gitposthook.php deleted file mode 100755 index ee0578a1..00000000 --- a/gitposthook.php +++ /dev/null @@ -1,5 +0,0 @@ -> /dev/null 2>&1'); - exec('./refreshCDN >> /dev/null 2>&1'); -} - From 5535e24c46c95f16b437c0ebec8c19094caf18a7 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Tue, 8 Nov 2011 15:43:36 -0800 Subject: [PATCH 03/15] Update to add license to root, update individual files to not have license, add license to built and testing files --- GPL-LICENSE.txt | 278 ++++++++++++++++++ MIT-LICENSE.txt | 20 ++ Makefile | 6 +- css/structure/index.php | 1 + css/structure/jquery.mobile.button.css | 5 - css/structure/jquery.mobile.collapsible.css | 5 - css/structure/jquery.mobile.controlgroup.css | 5 - css/structure/jquery.mobile.core.css | 6 - css/structure/jquery.mobile.dialog.css | 5 - .../jquery.mobile.forms.checkboxradio.css | 5 - .../jquery.mobile.forms.fieldcontain.css | 5 - css/structure/jquery.mobile.forms.select.css | 5 - css/structure/jquery.mobile.forms.slider.css | 5 - .../jquery.mobile.forms.textinput.css | 5 - css/structure/jquery.mobile.grids.css | 6 - css/structure/jquery.mobile.headerfooter.css | 5 - css/structure/jquery.mobile.listview.css | 5 - css/structure/jquery.mobile.navbar.css | 5 - css/structure/jquery.mobile.transitions.css | 5 - css/themes/default/index.php | 1 + css/themes/default/jquery.mobile.theme.css | 6 - css/themes/valencia/index.php | 1 + css/themes/valencia/jquery.mobile.theme.css | 7 - js/index.php | 1 + js/jquery.mobile.buttonMarkup.js | 6 +- js/jquery.mobile.collapsible.js | 6 +- js/jquery.mobile.controlGroup.js | 8 +- js/jquery.mobile.core.js | 8 +- js/jquery.mobile.degradeInputs.js | 5 +- js/jquery.mobile.dialog.js | 4 +- js/jquery.mobile.event.js | 7 +- js/jquery.mobile.fieldContain.js | 5 +- js/jquery.mobile.fixHeaderFooter.js | 5 +- js/jquery.mobile.fixHeaderFooter.native.js | 5 +- js/jquery.mobile.forms.button.js | 5 +- js/jquery.mobile.forms.checkboxradio.js | 5 +- js/jquery.mobile.forms.select.custom.js | 5 +- js/jquery.mobile.forms.select.js | 5 +- js/jquery.mobile.forms.slider.js | 5 +- js/jquery.mobile.forms.textinput.js | 5 +- js/jquery.mobile.grid.js | 5 +- js/jquery.mobile.hashchange.js | 11 +- js/jquery.mobile.init.js | 5 +- js/jquery.mobile.intro.js | 9 + js/jquery.mobile.links.js | 5 +- js/jquery.mobile.listview.filter.js | 5 +- js/jquery.mobile.listview.js | 5 +- js/jquery.mobile.media.js | 5 +- js/jquery.mobile.navbar.js | 5 +- js/jquery.mobile.navigation.js | 5 +- js/jquery.mobile.navigation.pushstate.js | 5 +- js/jquery.mobile.nojs.js | 5 +- js/jquery.mobile.page.js | 5 +- js/jquery.mobile.page.sections.js | 5 +- js/jquery.mobile.support.js | 4 +- js/jquery.mobile.transition.js | 5 +- js/jquery.mobile.vmouse.js | 5 +- js/jquery.mobile.widget.js | 5 +- 58 files changed, 353 insertions(+), 233 deletions(-) create mode 100644 GPL-LICENSE.txt create mode 100644 MIT-LICENSE.txt create mode 100644 js/jquery.mobile.intro.js diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt new file mode 100644 index 00000000..11dddd00 --- /dev/null +++ b/GPL-LICENSE.txt @@ -0,0 +1,278 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt new file mode 100644 index 00000000..53270463 --- /dev/null +++ b/MIT-LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2011 John Resig, http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile index 55f403e8..eb22f56b 100644 --- a/Makefile +++ b/Makefile @@ -103,9 +103,9 @@ 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 js/jquery.mobile.intro.js | ${SED_VER} > ${OUTPUT}/${CSS} @@cat ${CSSFILES} >> ${OUTPUT}/${CSS} - @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} + @@cat js/jquery.mobile.intro.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} @@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE} # Build the minified CSS file @@ -119,7 +119,7 @@ cssmin: init css # Build the normal JS file js: init # Build the JavaScript file - @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${JS} + @@cat js/jquery.mobile.intro.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 diff --git a/css/structure/index.php b/css/structure/index.php index a6971970..2895eb18 100644 --- a/css/structure/index.php +++ b/css/structure/index.php @@ -1,5 +1,6 @@ Date: Tue, 8 Nov 2011 18:39:49 -0800 Subject: [PATCH 04/15] Unify css and js references for doc changes --- experiments/google-maps/index.html | 2 +- experiments/google-maps/map.html | 2 +- experiments/scrollview/index.html | 2 +- experiments/scrollview/lists-divider.html | 2 +- experiments/scrollview/scrollview-direction.html | 2 +- experiments/scrollview/scrollview-nested.html | 2 +- experiments/scrollview/sv-test-01.html | 2 +- experiments/scrollview/sv-test-02.html | 2 +- tests/unit/buttonMarkup/index.html | 2 +- tests/unit/collapsible/index.html | 2 +- tests/unit/core/index.html | 2 +- tests/unit/event/index.html | 2 +- tests/unit/init/index.html | 2 +- tests/unit/init/nopage.html | 2 +- tests/unit/listview/index.html | 2 +- tests/unit/listview/pushstate-tests.html | 2 +- tests/unit/select/cached-tests.html | 2 +- tests/unit/select/index.html | 2 +- tests/unit/textinput/index.html | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/experiments/google-maps/index.html b/experiments/google-maps/index.html index 7425b941..138651b8 100644 --- a/experiments/google-maps/index.html +++ b/experiments/google-maps/index.html @@ -6,7 +6,7 @@ Main Page - + diff --git a/experiments/google-maps/map.html b/experiments/google-maps/map.html index aca2141b..290569f0 100644 --- a/experiments/google-maps/map.html +++ b/experiments/google-maps/map.html @@ -6,7 +6,7 @@ Main Page - + diff --git a/experiments/scrollview/index.html b/experiments/scrollview/index.html index 336badb0..ee5d9140 100644 --- a/experiments/scrollview/index.html +++ b/experiments/scrollview/index.html @@ -20,7 +20,7 @@ } - + diff --git a/experiments/scrollview/lists-divider.html b/experiments/scrollview/lists-divider.html index 08207ba6..9a9ea0b7 100644 --- a/experiments/scrollview/lists-divider.html +++ b/experiments/scrollview/lists-divider.html @@ -20,7 +20,7 @@ } - + diff --git a/experiments/scrollview/scrollview-direction.html b/experiments/scrollview/scrollview-direction.html index beb5113e..26859af0 100644 --- a/experiments/scrollview/scrollview-direction.html +++ b/experiments/scrollview/scrollview-direction.html @@ -59,7 +59,7 @@ } - + diff --git a/experiments/scrollview/scrollview-nested.html b/experiments/scrollview/scrollview-nested.html index bc0ecd72..35f82851 100644 --- a/experiments/scrollview/scrollview-nested.html +++ b/experiments/scrollview/scrollview-nested.html @@ -83,7 +83,7 @@ - + diff --git a/experiments/scrollview/sv-test-01.html b/experiments/scrollview/sv-test-01.html index 69f63754..4c60b941 100644 --- a/experiments/scrollview/sv-test-01.html +++ b/experiments/scrollview/sv-test-01.html @@ -7,7 +7,7 @@ - + - + diff --git a/tests/unit/buttonMarkup/index.html b/tests/unit/buttonMarkup/index.html index 32f714f7..57bbb378 100644 --- a/tests/unit/buttonMarkup/index.html +++ b/tests/unit/buttonMarkup/index.html @@ -10,7 +10,7 @@ - + diff --git a/tests/unit/collapsible/index.html b/tests/unit/collapsible/index.html index 6eaac1fc..6741193c 100644 --- a/tests/unit/collapsible/index.html +++ b/tests/unit/collapsible/index.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html index 8cafe48d..eefc587c 100644 --- a/tests/unit/core/index.html +++ b/tests/unit/core/index.html @@ -11,7 +11,7 @@ - + diff --git a/tests/unit/event/index.html b/tests/unit/event/index.html index bdcc89de..a495c9f2 100644 --- a/tests/unit/event/index.html +++ b/tests/unit/event/index.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html index 6e0403b8..0cff9c32 100644 --- a/tests/unit/init/index.html +++ b/tests/unit/init/index.html @@ -13,7 +13,7 @@ - + diff --git a/tests/unit/init/nopage.html b/tests/unit/init/nopage.html index 3074b8b5..218b01c3 100644 --- a/tests/unit/init/nopage.html +++ b/tests/unit/init/nopage.html @@ -10,7 +10,7 @@ - + diff --git a/tests/unit/listview/index.html b/tests/unit/listview/index.html index 9a6ed594..92f42d67 100644 --- a/tests/unit/listview/index.html +++ b/tests/unit/listview/index.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/listview/pushstate-tests.html b/tests/unit/listview/pushstate-tests.html index 77126325..5ed009bf 100644 --- a/tests/unit/listview/pushstate-tests.html +++ b/tests/unit/listview/pushstate-tests.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/select/cached-tests.html b/tests/unit/select/cached-tests.html index 3f8f74b9..f001e83f 100644 --- a/tests/unit/select/cached-tests.html +++ b/tests/unit/select/cached-tests.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html index 047cce92..8043ab76 100644 --- a/tests/unit/select/index.html +++ b/tests/unit/select/index.html @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html index 849b38c5..738f2f07 100644 --- a/tests/unit/textinput/index.html +++ b/tests/unit/textinput/index.html @@ -10,7 +10,7 @@ - + From a213cfa28161d67cbaadf1fe38629829ae1f26e5 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Wed, 9 Nov 2011 01:39:25 -0800 Subject: [PATCH 05/15] Complete overhaul of Make process to be cleaner, clearer and server-friendly --- Makefile | 274 ++++++++++++++++++-------------------- js/jquery.mobile.intro.js | 9 ++ 2 files changed, 140 insertions(+), 143 deletions(-) create mode 100644 js/jquery.mobile.intro.js diff --git a/Makefile b/Makefile index 55f403e8..4306b10c 100644 --- a/Makefile +++ b/Makefile @@ -1,44 +1,3 @@ -# The system generated date in YYYYMMDD format -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) - -# 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//') - -# The directory to create the zipped files in and also serves as the filenames -DIR = jquery.mobile-${VER} -STRUCTUREFILE = jquery.mobile.structure-${VER} -nightly: DIR = jquery.mobile - -# The output folder for the finished files -OUTPUT = compiled - -# Command to remove the latest directory from the CDN before uploading, only if using latest target -RMLATEST = echo "" - -# The output folder for the nightly files. -NIGHTLY_OUTPUT = nightlies/${DATE} -ifeq (${NIGHTLY_OUTPUT}, latest) - RMLATEST = ssh jqadmin@code.origin.jquery.com 'rm -rf /var/www/html/code.jquery.com/mobile/latest' -endif -NIGHTLY_WEBPATH = http://code.jquery.com/mobile/${NIGHTLY_OUTPUT} - -# The filenames -JS = ${DIR}.js -MIN = ${DIR}.min.js -CSS = ${DIR}.css -CSSMIN = ${DIR}.min.css -CSSSTRUCTURE = ${STRUCTUREFILE}.css -CSSSTRUCTUREMIN = ${STRUCTUREFILE}.min.css -CSSTHEME = default - # The files to include when compiling the JS files JSFILES = js/jquery.ui.widget.js \ js/jquery.mobile.widget.js \ @@ -75,8 +34,8 @@ JSFILES = js/jquery.ui.widget.js \ js/jquery.mobile.fixHeaderFooter.native.js \ js/jquery.mobile.init.js -CSSTHEMEFILES = css/themes/${CSSTHEME}/jquery.mobile.theme.css -CSSSTRUCTUREFILES = css/structure/jquery.mobile.core.css \ +# The files to include when compiling the CSS files +CSSFILES = css/structure/jquery.mobile.core.css \ css/structure/jquery.mobile.transitions.css \ css/structure/jquery.mobile.grids.css \ css/structure/jquery.mobile.headerfooter.css \ @@ -91,129 +50,158 @@ CSSSTRUCTUREFILES = css/structure/jquery.mobile.core.css \ css/structure/jquery.mobile.forms.textinput.css \ css/structure/jquery.mobile.listview.css \ css/structure/jquery.mobile.forms.slider.css +CSSTHEMEFILES = css/themes/${THEME}/jquery.mobile.theme.css -# The files to include when compiling the CSS files -CSSFILES = ${CSSTHEMEFILES} ${CSSSTRUCTUREFILES} -# By default, this is what get runs when make is called without any arguments. -# Min and un-min CSS and JS files are the only things built -all: init js min css cssmin notify -# Build the normal CSS file. + +# Helper Variables +# The command to replace the @VERSION in the files with the actual version +VER = sed "s/v@VERSION/$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd")/" +VER_MIN = "/*! jQuery Mobile v${VER_OFFICIAL} jquerymobile.com | jquery.org/license */" +VER_OFFICIAL = $(shell cat version.txt) + +# The output folder for the finished files +OUTPUT = compiled + +# The name of the files +NAME = jquery.mobile +STRUCTURE = jquery.mobile.structure +deploy: NAME = jquery.mobile-${VER_OFFICIAL} +deploy: STRUCTURE = jquery.mobile.structure-${VER_OFFICIAL} + +# The CSS theme being used +THEME = default + + + + + +# Build Targets + +# When no build target is specified, all gets ran +all: init css js zip notify + + +# Build and minify the CSS files css: init - # Build the CSS file - @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSS} - @@cat ${CSSFILES} >> ${OUTPUT}/${CSS} - @@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} - @@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE} + # Build the CSS file with the theme included + @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.css + @@cat ${CSSTHEMEFILES} ${CSSFILES} >> ${OUTPUT}/${NAME}.css + # ..... and then minify it + @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css + @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${NAME}.css >> ${OUTPUT}/${NAME}.min.css + # Build the CSS Structure-only file + @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${STRUCTURE}.css + @@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css + # ..... and then minify it + @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.structure.min.css + @@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css + # ..... and then copy in the images + @@cp -R css/themes/${THEME}/images ${OUTPUT}/ + # Css portion is complete. + # ------------------------------------------------- -# 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} -# 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} +docs: init css js + # Create the Demos/Docs/Tests/Tools + @@mkdir -p tmp/${NAME} + @@cp -r index.html docs experiments external js/jquery.js tests tmp/${NAME}/ + @@cp ${OUTPUT}/${NAME}.min.css ${OUTPUT}/${NAME}.min.js tmp/${NAME}/ + # ... Update the JavaScript and CSS paths + @@find tmp/${NAME} -type f \ + \( -name '*.html' -o -name '*.php' \) \ + -exec sed -i '' 's|js/"|${NAME}.min.js"|g' {} \; \ + -exec sed -i '' 's|css/themes/default/|${NAME}.min.css|g' {} \; \ + -exec sed -i '' 's|js/jquery.js"|jquery.js"|g' {} \; + # ... And then move it the finished directory + @@mv tmp/${NAME} ${OUTPUT}/demos + # Last, zip up the the whole folder + @@zip -rq tmp/${NAME}.zip ${OUTPUT} + @@mv tmp/${NAME}.zip ${OUTPUT}/${NAME}.docs.zip + # Remove the temporary files + @@rm -rf tmp + # ------------------------------------------------- + # 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} + @@rm -rf tmp + @@mkdir -p ${OUTPUT} + # ------------------------------------------------- -# Build the minified JS file -min: init js - # Build the minified JavaScript file - @@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: +# Build and minify the JS files +js: init + # Build the JavaScript file + @@cat js/jquery.mobile.intro.js | ${VER} > ${OUTPUT}/${NAME}.js + @@cat ${JSFILES} >> ${OUTPUT}/${NAME}.js + # ..... and then minify it + @@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.js + @@java -jar build/google-compiler-20111003.jar --js ${OUTPUT}/${NAME}.js --warning_level QUIET >> ${OUTPUT}/${NAME}.min.js + # ------------------------------------------------- + + +# Output a message saying the process is complete +notify: init @@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: - @@git pull --quiet - -# Zip the 4 files and the theme images into one convenient package -zip: init js min css cssmin - @@mkdir -p ${DIR} - @@cp ${OUTPUT}/*.js ${DIR}/ - @@cp ${OUTPUT}/*.css ${DIR}/ - @@cp -R css/themes/${CSSTHEME}/images ${DIR}/ - @@zip -rq ${OUTPUT}/${DIR}.zip ${DIR} - @@rm -fr ${DIR} + # ------------------------------------------------- -# Used by the jQuery team to make the nightly builds -nightly: pull zip - # Create the folder to hold the files for the demos - @@mkdir -p ${VER} +# Zip up the jQm files without docs +zip: init css js + # Packaging up the files into a zip archive + @@zip -rq ${NAME}.tmp.zip ${OUTPUT} + @@mv ${NAME}.tmp.zip ${OUTPUT}/${NAME}.zip + # ------------------------------------------------- + - # Copy in the base stuff for the demos - @@cp -r index.html css experiments docs tools ${VER}/ - # First change all the paths from super deep to the same level for JS files - @@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../../../js|src="js|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../../js|src="js|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|src="../js|src="js|g' {} \; - # Then change all the paths from super deep to the same level for CSS files - @@find ${VER} -type f -name '*.html' -exec sed -i 's|media="only all"||g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet" href="../../../|rel="stylesheet" href="|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet" href="../../|rel="stylesheet" href="|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|rel="stylesheet" href="../|rel="stylesheet" href="|g' {} \; +# ------------------------------------------------- +# ------------------------------------------------- +# ------------------------------------------------- +# +# For jQuery Team Use Only +# +# ------------------------------------------------- - # Change the empty paths to the location of this nightly file - @@find ${VER} -type f -name '*.html' -exec sed -i 's|href="css/themes/${CSSTHEME}/"|href="${NIGHTLY_WEBPATH}/${DIR}.min.css"|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \; - - # Move the demos into the output folder - @@mv ${VER} ${OUTPUT}/demos - - # Copy the images as well - @@cp -R css/themes/${CSSTHEME}/images ${OUTPUT} - - @@${RMLATEST} - @@scp -r ${OUTPUT} jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/${NIGHTLY_OUTPUT} +# Push the latest git version to the CDN. This is done on a post commit hook +latest: init js css zip + # Time to put these on the CDN + @@scp -r ${OUTPUT}/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/latest/ + # Do some cleanup to wrap it up @@rm -rf ${OUTPUT} + # ------------------------------------------------- -# Used by the jQuery team to deploy a build to the CDN -deploy: zip - # Deploy to CDN - @@mv ${OUTPUT} ${VER} - @@scp -r ${VER} jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/ - @@mv ${VER} ${OUTPUT} +# Build the nightly backups. This is done on a server cronjob +nightlies: init js css zip docs + # Time to put these on the CDN + @@mkdir -p tmp/nightlies + @@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d") + @@scp -r nightlies/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/nightlies/ + # Do some cleanup to wrap it up + @@rm -rf tmp + # ------------------------------------------------- - # Deploy Demos to the jQueryMobile.com site - @@mkdir -p ${VER} - @@cp -r index.html css experiments docs tools ${VER}/ - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../../../js|src="js|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../../js|src="js|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="../js|src="js|g' {} \; +# Deploy a finished release. This is manually done. +deploy: init js css docs zip + # Deploying all the files to the CDN + @@mkdir tmp + @@cp -r ${OUTPUT} tmp/${VER_OFFICIAL} + @@scp -r tmp/* jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/mobile/ + @@rm -rf tmp/${VER_OFFICIAL} + # Create the Demos/Docs/Tests/Tools for jQueryMobile.com + @@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL} + # ... And copied to the CDN and the jquerymobile.com server + @@scp -r tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ + # Do some cleanup to wrap it up + @@rm -rf tmp + @@rm -rf ${OUTPUT} + # ------------------------------------------------- - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|media="only all"||g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet" href="../../../|rel="stylesheet" href="|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet" href="../../|rel="stylesheet" href="|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|rel="stylesheet" href="../|rel="stylesheet" href="|g' {} \; - - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|href="css/themes/${CSSTHEME}/"|href="http://code.jquery.com/mobile/${VER}/${DIR}.min.css"|g' {} \; - @@find ${VER} -type f -name '*.html' -exec sed -i "" -e 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \; - @@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} jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ - - # Clean up the local files - @@rm -rf ${VER} - @@echo "All Done" diff --git a/js/jquery.mobile.intro.js b/js/jquery.mobile.intro.js new file mode 100644 index 00000000..4b990893 --- /dev/null +++ b/js/jquery.mobile.intro.js @@ -0,0 +1,9 @@ +/* +* jQuery Mobile Framework v@VERSION +* http://jquerymobile.com +* +* Copyright 2011 (c) jQuery Project +* Dual licensed under the MIT or GPL Version 2 licenses. +* http://jquery.org/license +* +*/ From 6b5ca6311adfa60ed791bcd3373e77c70c244a21 Mon Sep 17 00:00:00 2001 From: "Eddie Monge Jr." Date: Wed, 9 Nov 2011 08:32:00 -0800 Subject: [PATCH 06/15] Remove unneeded css as height will suffice. Trigger the inputs keyup. Im not sure calling $(keyup) called the function on the element. --- js/jquery.mobile.forms.textinput.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/jquery.mobile.forms.textinput.js b/js/jquery.mobile.forms.textinput.js index d52084e4..1d1eb280 100644 --- a/js/jquery.mobile.forms.textinput.js +++ b/js/jquery.mobile.forms.textinput.js @@ -89,9 +89,7 @@ $.widget( "mobile.textinput", $.mobile.widget, { clientHeight = input[ 0 ].clientHeight; if ( clientHeight < scrollHeight ) { - input.css({ - height: (scrollHeight + extraLineHeight) - }); + input.height(scrollHeight + extraLineHeight); } }, keyupTimeout; @@ -103,8 +101,10 @@ $.widget( "mobile.textinput", $.mobile.widget, { // Issue 509: the browser is not giving scrollHeight properly until after the document // is ready. - if ($.trim(input.text())) { - $(keyup); + if ( $.trim( input.val() ) ) { + $(function() { + input.keyup() + }); } } }, From fb2544b8a1e8fcab4065eb4e71ef205ade8c8824 Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 10:10:57 -0800 Subject: [PATCH 07/15] add some maring to account for silly large number strings on our perf charts --- tests/speed/stats/visualize/visualize.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/speed/stats/visualize/visualize.css b/tests/speed/stats/visualize/visualize.css index 2999fe1d..01d40488 100644 --- a/tests/speed/stats/visualize/visualize.css +++ b/tests/speed/stats/visualize/visualize.css @@ -41,6 +41,6 @@ table { div.visualize { float: left; - margin-left: 50px; + margin-left: 100px; margin-right: 50px; } \ No newline at end of file From 3f52c482d0dccfe8e4c940a9ad6dcabb4ba3d633 Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 11:32:04 -0800 Subject: [PATCH 08/15] account for css load in initial document load and page transition with text area autogrow --- js/jquery.mobile.forms.textinput.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/js/jquery.mobile.forms.textinput.js b/js/jquery.mobile.forms.textinput.js index 1d1eb280..bcc3fe1d 100644 --- a/js/jquery.mobile.forms.textinput.js +++ b/js/jquery.mobile.forms.textinput.js @@ -99,12 +99,16 @@ $.widget( "mobile.textinput", $.mobile.widget, { keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer ); }); - // Issue 509: the browser is not giving scrollHeight properly until after the document - // is ready. + // Issue 509: the browser is not giving scrollHeight properly until the styles load + // for the input if ( $.trim( input.val() ) ) { - $(function() { - input.keyup() - }); + // bind to the window load to make sure the height is calculated + // the document as a whole on the initial page load + $(window).load(keyup); + + // after a page is loaded into the document the height has to be + // initially triggered to make sure it accomodates loaded content + $(document).one("pagechange", keyup); } } }, From 50204053bcf0da7af040a25a93c094ad83c4c692 Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 11:32:39 -0800 Subject: [PATCH 09/15] test for page load text area autogrow --- tests/unit/textinput/external.html | 38 ++++++++++++++++++++++++++ tests/unit/textinput/index.html | 1 + tests/unit/textinput/textinput_core.js | 19 +++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 tests/unit/textinput/external.html diff --git a/tests/unit/textinput/external.html b/tests/unit/textinput/external.html new file mode 100644 index 00000000..2d10dd62 --- /dev/null +++ b/tests/unit/textinput/external.html @@ -0,0 +1,38 @@ + + + + + +
+ +
+ + diff --git a/tests/unit/textinput/index.html b/tests/unit/textinput/index.html index 738f2f07..1e6add37 100644 --- a/tests/unit/textinput/index.html +++ b/tests/unit/textinput/index.html @@ -46,6 +46,7 @@ + external diff --git a/tests/unit/textinput/textinput_core.js b/tests/unit/textinput/textinput_core.js index 106e3975..41381f51 100644 --- a/tests/unit/textinput/textinput_core.js +++ b/tests/unit/textinput/textinput_core.js @@ -39,4 +39,23 @@ test.val("foo\n\n\n\n\n\n\n\n\n\n\n\n\n\n").trigger("keyup"); }); + + asyncTest( "text area should auto grow when the parent page is loaded via ajax", function() { + $.testHelper.pageSequence([ + function() { + $("#external").click(); + }, + + function() { + setTimeout(function() { + ok($.mobile.activePage.find( "textarea" )[0].clientHeight > 100, "text area's height has grown"); + window.history.back(); + }, 1000); + }, + + function() { + start(); + } + ]); + }); })(jQuery); \ No newline at end of file From d50aa91e6df45c645e2c5fc45cfd984f6be1d98b Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 11:42:57 -0800 Subject: [PATCH 10/15] comment clarification --- js/jquery.mobile.forms.textinput.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/js/jquery.mobile.forms.textinput.js b/js/jquery.mobile.forms.textinput.js index bcc3fe1d..ef21bb72 100644 --- a/js/jquery.mobile.forms.textinput.js +++ b/js/jquery.mobile.forms.textinput.js @@ -99,15 +99,14 @@ $.widget( "mobile.textinput", $.mobile.widget, { keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer ); }); - // Issue 509: the browser is not giving scrollHeight properly until the styles load - // for the input + // Issue 509: the browser is not providing scrollHeight properly until the styles load if ( $.trim( input.val() ) ) { - // bind to the window load to make sure the height is calculated - // the document as a whole on the initial page load + // bind to the window load to make sure the height is calculated based on BOTH + // the DOM and CSS $(window).load(keyup); - // after a page is loaded into the document the height has to be - // initially triggered to make sure it accomodates loaded content + // binding to pagechange here ensures that for pages loaded via + // ajax the height is recalculated without user input $(document).one("pagechange", keyup); } } From 1d4109295d2fed384b31db4359e1acfcd4213ccb Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 11:43:40 -0800 Subject: [PATCH 11/15] textinput whitespace --- js/jquery.mobile.forms.textinput.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.mobile.forms.textinput.js b/js/jquery.mobile.forms.textinput.js index ef21bb72..42109c74 100644 --- a/js/jquery.mobile.forms.textinput.js +++ b/js/jquery.mobile.forms.textinput.js @@ -103,11 +103,11 @@ $.widget( "mobile.textinput", $.mobile.widget, { if ( $.trim( input.val() ) ) { // bind to the window load to make sure the height is calculated based on BOTH // the DOM and CSS - $(window).load(keyup); + $( window ).load( keyup ); // binding to pagechange here ensures that for pages loaded via // ajax the height is recalculated without user input - $(document).one("pagechange", keyup); + $( document ).one( "pagechange", keyup ); } } }, From 75341c6ca70b665e3492774bddcd932dc3fbee15 Mon Sep 17 00:00:00 2001 From: Eddie Monge Date: Wed, 9 Nov 2011 14:56:38 -0800 Subject: [PATCH 12/15] Update the README to include instructions for including a custom theme --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index abd45ef9..6a4511dc 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,8 @@ theme's name. For testing locally, make sure the index.php file is copied as wel 2. Edit the `jquery.mobile.theme.css` file so it contains your custom fonts and colors. 3. Once you are done editing your files and saving them, open a terminal. 4. Navigate to the jQuery-Mobile folder's root. -5. Run the following command to build jQuery-Mobile. The CSSTHEME specifies what theme to include. If you leave it off, -it will build using the "default" theme. +5. Run the following command to build jQuery-Mobile (THEME is the name of the folder for your theme from step 1.): - make CSSTHEME=YourThemeName + make THEME=YourThemeName -6. The compiled files will be located in the "compiled" folder in the root of jQuery-Mobile. \ No newline at end of file +6. The compiled files will be located in the "compiled" folder in the root of jQuery-Mobile. From 01c77fa9e1006028c6d6182504687ad7e875cb82 Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Wed, 9 Nov 2011 18:25:06 -0500 Subject: [PATCH 13/15] =?UTF-8?q?Fixes=20#2588=20=E2=80=94=20When=20Window?= =?UTF-8?q?s=20Phone=207.5=20(Mango)=20tries=20to=20calculate=20a=20numeri?= =?UTF-8?q?c=20opacity=20for=20a=20select=E2=80=94including=20=E2=80=9Cinh?= =?UTF-8?q?erit=E2=80=9D=E2=80=94without=20explicitly=20specifying=20an=20?= =?UTF-8?q?opacity=20on=20the=20parent=20to=20give=20it=20context,=20a=20b?= =?UTF-8?q?ug=20appears=20where=20clicking=20elsewhere=20on=20the=20page?= =?UTF-8?q?=20after=20opening=20the=20select=20will=20open=20the=20select?= =?UTF-8?q?=20again.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/structure/jquery.mobile.forms.select.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/structure/jquery.mobile.forms.select.css b/css/structure/jquery.mobile.forms.select.css index 67580449..b77e396e 100644 --- a/css/structure/jquery.mobile.forms.select.css +++ b/css/structure/jquery.mobile.forms.select.css @@ -6,7 +6,13 @@ .ui-select { display: block; position: relative; } .ui-select select { position: absolute; left: -9999px; top: -9999px; } .ui-select .ui-btn { overflow: hidden; } + + +.ui-select .ui-btn { opacity: 1; } +/* Fixes #2588 — When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a select—including “inherit”—without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */ .ui-select .ui-btn select { cursor: pointer; -webkit-appearance: button; left: 0; top:0; width: 100%; min-height: 1.5em; min-height: 100%; height: 3em; max-height: 100%; opacity: 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); z-index: 2; } + + @-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }} .ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; } From 989f7f154261d12cd41352055bf775ae44b73480 Mon Sep 17 00:00:00 2001 From: John Bender Date: Wed, 9 Nov 2011 15:45:08 -0800 Subject: [PATCH 14/15] move intro to text for css combine, js combine, and makefile use --- INTRO.txt | 9 +++++++++ Makefile | 6 +++--- css/structure/index.php | 2 +- css/themes/valencia/index.php | 2 +- js/index.php | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 INTRO.txt diff --git a/INTRO.txt b/INTRO.txt new file mode 100644 index 00000000..4b990893 --- /dev/null +++ b/INTRO.txt @@ -0,0 +1,9 @@ +/* +* jQuery Mobile Framework v@VERSION +* http://jquerymobile.com +* +* Copyright 2011 (c) jQuery Project +* Dual licensed under the MIT or GPL Version 2 licenses. +* http://jquery.org/license +* +*/ diff --git a/Makefile b/Makefile index eb22f56b..f78eb3bb 100644 --- a/Makefile +++ b/Makefile @@ -103,9 +103,9 @@ all: init js min css cssmin notify # Build the normal CSS file. css: init # Build the CSS file - @@cat js/jquery.mobile.intro.js | ${SED_VER} > ${OUTPUT}/${CSS} + @@cat INTRO.txt | ${SED_VER} > ${OUTPUT}/${CSS} @@cat ${CSSFILES} >> ${OUTPUT}/${CSS} - @@cat js/jquery.mobile.intro.js | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} + @@cat INTRO.txt | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} @@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE} # Build the minified CSS file @@ -119,7 +119,7 @@ cssmin: init css # Build the normal JS file js: init # Build the JavaScript file - @@cat js/jquery.mobile.intro.js | ${SED_VER} > ${OUTPUT}/${JS} + @@cat INTRO.txt | ${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 diff --git a/css/structure/index.php b/css/structure/index.php index 2895eb18..44cd9bd2 100644 --- a/css/structure/index.php +++ b/css/structure/index.php @@ -1,6 +1,6 @@ Date: Wed, 9 Nov 2011 16:00:25 -0800 Subject: [PATCH 15/15] moved info text to license-info.txt --- INTRO.txt => LICENSE-INFO.txt | 0 Makefile | 6 +++--- css/structure/index.php | 2 +- css/themes/default/index.php | 2 +- css/themes/valencia/index.php | 2 +- js/index.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename INTRO.txt => LICENSE-INFO.txt (100%) diff --git a/INTRO.txt b/LICENSE-INFO.txt similarity index 100% rename from INTRO.txt rename to LICENSE-INFO.txt diff --git a/Makefile b/Makefile index f78eb3bb..42e0118c 100644 --- a/Makefile +++ b/Makefile @@ -103,9 +103,9 @@ all: init js min css cssmin notify # Build the normal CSS file. css: init # Build the CSS file - @@cat INTRO.txt | ${SED_VER} > ${OUTPUT}/${CSS} + @@cat LICENSE-INFO.txt | ${SED_VER} > ${OUTPUT}/${CSS} @@cat ${CSSFILES} >> ${OUTPUT}/${CSS} - @@cat INTRO.txt | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} + @@cat LICENSE-INFO.txt | ${SED_VER} > ${OUTPUT}/${CSSSTRUCTURE} @@cat ${CSSSTRUCTUREFILES} >> ${OUTPUT}/${CSSSTRUCTURE} # Build the minified CSS file @@ -119,7 +119,7 @@ cssmin: init css # Build the normal JS file js: init # Build the JavaScript file - @@cat INTRO.txt | ${SED_VER} > ${OUTPUT}/${JS} + @@cat LICENSE-INFO.txt | ${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 diff --git a/css/structure/index.php b/css/structure/index.php index 44cd9bd2..ab08918d 100644 --- a/css/structure/index.php +++ b/css/structure/index.php @@ -1,6 +1,6 @@