From 92cf8d62c4badaa3a9047d6074d623081ffba307 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 23 Jan 2012 15:33:59 -0500 Subject: [PATCH 1/5] Issue #1524 - Taphold event fired while scrolling on Blackberry Playbook Cause: The vmousecancel event was not being fired for 'this'. How Fixed: Bound vmousecancel event to document instead of 'this'. How Tested: Ran the example provided with the issue (http://jsbin.com/oruhu4/) with this change on BlackBerry Playbook v2.0 and iPad iOS 5.0.1 --- js/jquery.mobile.event.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js index d9041748..4b0b9b7e 100644 --- a/js/jquery.mobile.event.js +++ b/js/jquery.mobile.event.js @@ -92,8 +92,8 @@ $.event.special.tap = { clearTapTimer(); $this.unbind( "vclick", clickHandler ) - .unbind( "vmouseup", clearTapTimer ) - .unbind( "vmousecancel", clearTapHandlers ); + .unbind( "vmouseup", clearTapTimer ); + $(document).unbind("vmousecancel", clearTapHandlers); } function clickHandler(event) { @@ -106,9 +106,9 @@ $.event.special.tap = { } } - $this.bind( "vmousecancel", clearTapHandlers ) - .bind( "vmouseup", clearTapTimer ) + $this.bind( "vmouseup", clearTapTimer ) .bind( "vclick", clickHandler ); + $(document).bind("vmousecancel", clearTapHandlers); timer = setTimeout(function() { triggerCustomEvent( thisObject, "taphold", $.Event( "taphold" ) ); From a215d4c13e69c1f435ed7e8ea8c53e1304fe6cce Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 23 Jan 2012 20:00:54 -0500 Subject: [PATCH 2/5] Issue #1524 - Fixing style - Missing white space --- js/jquery.mobile.event.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js index 4b0b9b7e..e9c1b512 100644 --- a/js/jquery.mobile.event.js +++ b/js/jquery.mobile.event.js @@ -93,7 +93,7 @@ $.event.special.tap = { $this.unbind( "vclick", clickHandler ) .unbind( "vmouseup", clearTapTimer ); - $(document).unbind("vmousecancel", clearTapHandlers); + $( document ).unbind( "vmousecancel", clearTapHandlers ); } function clickHandler(event) { @@ -108,7 +108,7 @@ $.event.special.tap = { $this.bind( "vmouseup", clearTapTimer ) .bind( "vclick", clickHandler ); - $(document).bind("vmousecancel", clearTapHandlers); + $( document ).bind( "vmousecancel", clearTapHandlers ); timer = setTimeout(function() { triggerCustomEvent( thisObject, "taphold", $.Event( "taphold" ) ); From 5c0429463a1a7b66a0e07306e29d2cfdfa710929 Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 26 Jan 2012 08:20:16 -0800 Subject: [PATCH 3/5] TODO update jquery version in tag replace --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 135caf23..a722f544 100644 --- a/Makefile +++ b/Makefile @@ -178,6 +178,7 @@ deploy: init css js docs zip @@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL} # Create the Demos/Docs/Tests/Tools for jQueryMobile.com # ... By first replacing the paths + # TODO update jQuery Version replacement on deploy @@find tmp/${VER_OFFICIAL} -type f \ \( -name '*.html' -o -name '*.php' \) \ -exec perl -pi -e \ From 45b71e1a88c85efab2ad510256d96c1778302203 Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 26 Jan 2012 12:37:56 -0800 Subject: [PATCH 4/5] Makefile whitespace --- Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a722f544..2c101796 100644 --- a/Makefile +++ b/Makefile @@ -130,18 +130,15 @@ notify: init # Zip up the jQm files without docs -zip: init css js +zip: init css js # Packaging up the files into a zip archive @@mkdir tmp - @@cp -R ${OUTPUT} tmp/${NAME} + @@cp -R ${OUTPUT} tmp/${NAME} # ... And remove the Zipped docs so they aren't included twice (for deploy scripts) - @@rm -rf tmp/${NAME}/${NAME}.docs.zip + @@rm -rf tmp/${NAME}/${NAME}.docs.zip @@cd tmp; zip -rq ../${OUTPUT}/${NAME}.zip ${NAME} @@rm -rf tmp # ------------------------------------------------- - - - # ------------------------------------------------- # ------------------------------------------------- @@ -158,7 +155,7 @@ latest: init css docs js zip # ------------------------------------------------- # Build the nightly backups. This is done on a server cronjob -nightlies: init css js docs zip +nightlies: init css js docs zip # Time to put these on the CDN @@mkdir -p tmp/nightlies @@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d") @@ -184,7 +181,7 @@ deploy: init css js docs zip -exec perl -pi -e \ 's|src="(.*)${NAME}.min.js"|src="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.js"|g;s|href="(.*)${NAME}.min.css"|href="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.css"|g;s|src="(.*)jquery.js"|src="//code.jquery.com/jquery-1.6.4.js"|g' {} \; # ... So they can be copied to jquerymobile.com - @@scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ + @@scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ # Do some cleanup to wrap it up @@rm -rf tmp @@rm -rf ${OUTPUT} From beaf693c23f72aed86fb24318e44104cb6f3f7a3 Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 26 Jan 2012 12:39:59 -0800 Subject: [PATCH 5/5] use jquery min for deploy build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c101796..2e7808fc 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,7 @@ deploy: init css js docs zip @@find tmp/${VER_OFFICIAL} -type f \ \( -name '*.html' -o -name '*.php' \) \ -exec perl -pi -e \ - 's|src="(.*)${NAME}.min.js"|src="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.js"|g;s|href="(.*)${NAME}.min.css"|href="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.css"|g;s|src="(.*)jquery.js"|src="//code.jquery.com/jquery-1.6.4.js"|g' {} \; + 's|src="(.*)${NAME}.min.js"|src="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.js"|g;s|href="(.*)${NAME}.min.css"|href="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.css"|g;s|src="(.*)jquery.js"|src="//code.jquery.com/jquery-1.6.4.min.js"|g' {} \; # ... So they can be copied to jquerymobile.com @@scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/ # Do some cleanup to wrap it up