From: Youmin Ha Date: Thu, 17 Jan 2013 01:24:11 +0000 (+0900) Subject: build: Remove JQM1.1.0 patches X-Git-Tag: accepted/tizen_2.1/20130425.023924~7^2~222 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e65261797a246e91c933bdfe02aeb523a327606;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git build: Remove JQM1.1.0 patches Change-Id: I38cc4285184f236252eb2a3c8813540584be79ac --- diff --git a/libs/patch/jqm-1.1.0/0001-JQM-fix-vclick-trigger-twice-after-pageChange.patch b/libs/patch/jqm-1.1.0/0001-JQM-fix-vclick-trigger-twice-after-pageChange.patch deleted file mode 100644 index 996499e..0000000 --- a/libs/patch/jqm-1.1.0/0001-JQM-fix-vclick-trigger-twice-after-pageChange.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f95cf2987e50119260db1763a1b52b4bc34d57b2 Mon Sep 17 00:00:00 2001 -From: "wongi11.lee" -Date: Thu, 21 Jun 2012 17:35:28 +0900 -Subject: [PATCH] JQM:fix vclick trigger twice after pageChange. - -Signed-off-by: Wongi Lee ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -index 6e9b504..b608460 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -@@ -195,6 +195,10 @@ function triggerVirtualEvent( eventType, event, flags ) { - function mouseEventCallback( event ) { - var touchID = $.data(event.target, touchTargetPropertyName); - -+ if ( ( $.support.touch === true ) && ( touchID === undefined ) ) { -+ return; -+ } -+ - if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ){ - var ve = triggerVirtualEvent( "v" + event.type, event ); - if ( ve ) { --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0002-JQM-nolabel-n-favorite-class-for-check-support.patch b/libs/patch/jqm-1.1.0/0002-JQM-nolabel-n-favorite-class-for-check-support.patch deleted file mode 100644 index 4e57495..0000000 --- a/libs/patch/jqm-1.1.0/0002-JQM-nolabel-n-favorite-class-for-check-support.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5f35008c978c291f67778bb72d39709109682d0c Mon Sep 17 00:00:00 2001 -From: Koeun Choi -Date: Fri, 15 Jun 2012 17:11:51 +0900 -Subject: [PATCH] JQM:nolabel n favorite class for check support - -Signed-off-by: Koeun Choi -Signed-off-by: Youmin Ha ---- - .../js/jquery.mobile.forms.checkboxradio.js | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -index eb4731b..08556cf 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -@@ -26,7 +26,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, { - // NOTE: Windows Phone could not find the label through a selector - // filter works though. - parentLabel = $( input ).closest( "label" ), -- label = parentLabel.length ? parentLabel : $( input ).closest( "form,fieldset,:jqmData(role='page'),:jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ), -+ label = parentLabel.length ? parentLabel : ( input[0].id ? $( input ).closest( "form,fieldset,:jqmData(role='page'),:jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ) : [ ] ), - inputtype = input[0].type, - mini = inheritAttr( input, "mini" ), - checkedState = inputtype + "-on", -@@ -43,6 +43,12 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, { - return; - } - -+ // Support fake label -+ if ( label.length == 0 ) { -+ label = $( "" ); -+ } -+ - // Expose for other methods - $.extend( this, { - label: label, -@@ -70,6 +76,10 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, { - var wrapper = document.createElement('div'); - wrapper.className = 'ui-' + inputtype; - -+ if ( input.hasClass( "favorite" ) ) { -+ wrapper.className += ' favorite'; -+ } -+ - input.add( label ).wrapAll( wrapper ); - - label.bind({ --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0003-JQM-trigger-the-pageshow-event-after-transitionPages.patch b/libs/patch/jqm-1.1.0/0003-JQM-trigger-the-pageshow-event-after-transitionPages.patch deleted file mode 100644 index efee893..0000000 --- a/libs/patch/jqm-1.1.0/0003-JQM-trigger-the-pageshow-event-after-transitionPages.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c9edd80183fa459dff180d7f51e9cd03143473b4 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Mon, 11 Jun 2012 15:19:06 +0900 -Subject: [PATCH] JQM:trigger the pageshow event after transitionPages - function at none transition - -Signed-off-by: Minkyu Kang ---- - .../js/jquery.mobile.transition.js | 2 +- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -index 9a099dc..4476bfd 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -@@ -89,7 +89,7 @@ var createHandler = function( sequential ){ - $to.addClass( name + " in" + reverseClass ); - - if( none ){ -- doneIn(); -+ setTimeout( doneIn, 0 ); - } - - }, --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0004-JQM-move-pagelayout-to-winset.patch b/libs/patch/jqm-1.1.0/0004-JQM-move-pagelayout-to-winset.patch deleted file mode 100644 index dbc5ab2..0000000 --- a/libs/patch/jqm-1.1.0/0004-JQM-move-pagelayout-to-winset.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 12f7cdd3e6a427c777eb5b4c48b33fdd0ba1ef15 Mon Sep 17 00:00:00 2001 -From: Jun Jinhyuk -Date: Thu, 5 Jul 2012 01:00:43 -0400 -Subject: [PATCH] JQM move pagelayout to winset - -Change-Id: I38777266f0e4d30bce2db5057e2675f35221096a ---- - .../js/jquery.mobile.fixedToolbar.js | 2 +- - .../js/jquery.mobile.page.sections.js | 16 ++-------------- - 2 files changed, 3 insertions(+), 15 deletions(-) - mode change 100644 => 100755 libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js -index 0f9c23d..6a40ac5 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js -@@ -65,7 +65,7 @@ define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.core", "./jquery. - - return false; - }, -- initSelector: ":jqmData(position='fixed')" -+ initSelector: ":jqmData(position='dummy')" - }, - - _create: function() { -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -old mode 100644 -new mode 100755 -index e0a718d..e78af6a ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -@@ -8,11 +8,12 @@ define( [ "jquery", "./jquery.mobile.page", "./jquery.mobile.core", "./jquery.mo - (function( $, undefined ) { - - $.mobile.page.prototype.options.backBtnText = "Back"; --$.mobile.page.prototype.options.addBackBtn = false; -+$.mobile.page.prototype.options.addBackBtn = "footer"; - $.mobile.page.prototype.options.backBtnTheme = null; - $.mobile.page.prototype.options.headerTheme = "a"; - $.mobile.page.prototype.options.footerTheme = "a"; - $.mobile.page.prototype.options.contentTheme = null; -+$.mobile.page.prototype.options.footerExist = true; - - $( document ).delegate( ":jqmData(role='page'), :jqmData(role='dialog')", "pagecreate", function( e ) { - -@@ -58,19 +59,6 @@ $( document ).delegate( ":jqmData(role='page'), :jqmData(role='dialog')", "pagec - rightbtn = rightbtn || $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length; - } - -- // Auto-add back btn on pages beyond first view -- if ( o.addBackBtn && -- role === "header" && -- $( ".ui-page" ).length > 1 && -- $page.jqmData( "url" ) !== $.mobile.path.stripHash( location.hash ) && -- !leftbtn ) { -- -- backBtn = $( ""+ o.backBtnText +"" ) -- // If theme is provided, override default inheritance -- .attr( "data-"+ $.mobile.ns +"theme", o.backBtnTheme || thisTheme ) -- .prependTo( $this ); -- } -- - // Page title - $this.children( "h1, h2, h3, h4, h5, h6" ) - .addClass( "ui-title" ) --- -1.7.4.1 - diff --git a/libs/patch/jqm-1.1.0/0005-JQM-Fix-bug-on-live-firing-custom-events.patch b/libs/patch/jqm-1.1.0/0005-JQM-Fix-bug-on-live-firing-custom-events.patch deleted file mode 100644 index f319944..0000000 --- a/libs/patch/jqm-1.1.0/0005-JQM-Fix-bug-on-live-firing-custom-events.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3548a6e0000943da605e6cbb00c1ec51ba82cf12 Mon Sep 17 00:00:00 2001 -From: Youmin Ha -Date: Tue, 5 Jun 2012 16:47:59 +0900 -Subject: [PATCH] JQM:Fix bug on live firing custom events - -Signed-off-by: Youmin Ha ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.event.js | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.event.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.event.js -index f9d1744..0dc5428 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.event.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.event.js -@@ -28,6 +28,11 @@ var supportTouch = $.support.touch, - function triggerCustomEvent( obj, eventType, event ) { - var originalType = event.type; - event.type = eventType; -+ -+ // event.liveFired is already set by basic events, e.g. vclick, which is fired already. -+ // To fire this custom event, event.liveFired must be cleared. -+ event.liveFired = undefined; -+ - $.event.handle.call( obj, event ); - event.type = originalType; - } --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0006-JQM-Apply-Tizen-button-style.patch b/libs/patch/jqm-1.1.0/0006-JQM-Apply-Tizen-button-style.patch deleted file mode 100644 index 4080525..0000000 --- a/libs/patch/jqm-1.1.0/0006-JQM-Apply-Tizen-button-style.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 3fea934afc1252e6476750d86e450a61e6d8b816 Mon Sep 17 00:00:00 2001 -From: wongi11.lee -Date: Fri, 8 Jun 2012 19:58:19 +0900 -Subject: [PATCH] JQM:Apply Tizen button style. - -Signed-off-by: Wongi Lee -Signed-off-by: Hyunjung Kim ---- - .../js/jquery.mobile.buttonMarkup.js | 59 ++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -index c5f32b4..d1b992b 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -@@ -1,3 +1,22 @@ -+/* -+* "buttons" plugin - for making button-like links -+*/ -+ -+/* -+ * Button Markup modified for TIZEN style. -+ * -+ * HTML Attributes: -+ * -+ * data-role: button -+ * data-style: circle, nobg, edit -+ * -+ * Examples: -+ * -+ *
-+ *
-+ *
-+ */ -+ - //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); - //>>description: Applies button styling to links - //>>label: Buttons: Link-based -@@ -74,6 +93,63 @@ $.fn.buttonMarkup = function( options ) { - buttonClass += o.shadow ? " ui-shadow" : ""; - buttonClass += o.corners ? " ui-btn-corner-all" : ""; - -+ // To distinguish real buttons -+ if( el.jqmData("role") == "button" || e.tagName == "BUTTON" || e.tagName == "DIV" ){ -+ buttonClass += " ui-btn-box-" + o.theme; -+ } -+ -+ /* TIZEN style markup */ -+ buttonStyle = el.jqmData("style"); -+ -+ if ( buttonStyle == "circle" ) { -+ /* style : no text, Icon only */ -+ buttonClass += " ui-btn-corner-circle"; -+ buttonClass += " ui-btn-icon_only"; -+ } else if ( buttonStyle == "nobg" ) { -+ /* style : no text, Icon only, no bg */ -+ buttonClass += " ui-btn-icon-nobg"; -+ buttonClass += " ui-btn-icon_only"; -+ } else if ( buttonStyle == "edit" ) { -+ buttonClass += " ui-btn-edit"; -+ } -+ -+ if ( o.icon ) { -+ if ( $(el).text().length > 0 ) { -+ /* o.iconpos == "right" ? -+ textClass += " ui-btn-text-padding-right" : -+ textClass += " ui-btn-text-padding-left"; */ -+ -+ switch ( o.iconpos ) { -+ case "right" : -+ case "left" : -+ case "top" : -+ case "bottom" : -+ textClass += " ui-btn-text-padding-" + o.iconpos; -+ break; -+ default: -+ textClass += " ui-btn-text-padding-left"; -+ break; -+ } -+ -+ innerClass += " ui-btn-hastxt"; -+ } else { -+ if ( buttonStyle == "circle" ) { -+ /* style : no text, Icon only */ -+ innerClass += " ui-btn-corner-circle"; -+ } else if ( buttonStyle == "nobg" ) { -+ /* style : no text, Icon only, no bg */ -+ innerClass += " ui-btn-icon-nobg"; -+ } -+ -+ buttonClass += " ui-btn-icon_only"; -+ innerClass += " ui-btn-icon-only"; -+ } -+ } else { -+ if ( $(el).text().length > 0 ) { -+ innerClass += " ui-btn-hastxt"; -+ } -+ } -+ - if ( o.mini !== undefined ) { - // Used to control styling in headers/footers, where buttons default to `mini` style. - buttonClass += o.mini ? " ui-mini" : " ui-fullsize"; --- -1.7.0.4 - diff --git a/libs/patch/jqm-1.1.0/0007-JQM-remove-search-from-forms.textinput.patch b/libs/patch/jqm-1.1.0/0007-JQM-remove-search-from-forms.textinput.patch deleted file mode 100644 index 0d19286..0000000 --- a/libs/patch/jqm-1.1.0/0007-JQM-remove-search-from-forms.textinput.patch +++ /dev/null @@ -1,91 +0,0 @@ -From c70b1f818389c9703af17bb59e1f78f4eefa7c65 Mon Sep 17 00:00:00 2001 -From: wongi11.lee -Date: Fri, 29 Jun 2012 13:24:49 +0900 -Subject: [PATCH] JQM remove 'search' from forms.textinput. - -Change-Id: I3de28a38dad8cfcc40a6e98273107e5beabb836e -Signed-off-by: wongi11.lee ---- - .../js/jquery.mobile.forms.textinput.js | 49 +++---------------- - 1 files changed, 8 insertions(+), 41 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -index f444522..a06d54d 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -@@ -13,8 +13,7 @@ $.widget( "mobile.textinput", $.mobile.widget, { - theme: null, - // This option defaults to true on iOS devices. - preventFocusZoom: /iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1, -- initSelector: "input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type])", -- clearSearchButtonText: "clear text" -+ initSelector: "input[type='text'], input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type])" - }, - - _create: function() { -@@ -46,41 +45,7 @@ $.widget( "mobile.textinput", $.mobile.widget, { - } - - -- //"search" input widget -- if ( input.is( "[type='search'],:jqmData(type='search')" ) ) { -- -- focusedEl = input.wrap( "
" ).parent(); -- clearbtn = $( "" + o.clearSearchButtonText + "" ) -- .bind('click', function( event ) { -- input -- .val( "" ) -- .focus() -- .trigger( "change" ); -- clearbtn.addClass( "ui-input-clear-hidden" ); -- event.preventDefault(); -- }) -- .appendTo( focusedEl ) -- .buttonMarkup({ -- icon: "delete", -- iconpos: "notext", -- corners: true, -- shadow: true, -- mini: mini -- }); -- -- function toggleClear() { -- setTimeout(function() { -- clearbtn.toggleClass( "ui-input-clear-hidden", !input.val() ); -- }, 0); -- } -- -- toggleClear(); -- -- input.bind('paste cut keyup focus change blur', toggleClear); -- -- } else { -- input.addClass( "ui-corner-all ui-shadow-inset" + themeclass + miniclass ); -- } -+ input.addClass( "ui-corner-all ui-shadow-inset" + themeclass + miniclass ); - - input.focus(function() { - focusedEl.addClass( $.mobile.focusClass ); -@@ -133,13 +98,15 @@ $.widget( "mobile.textinput", $.mobile.widget, { - }, - - disable: function(){ -- ( this.element.attr( "disabled", true ).is( "[type='search'],:jqmData(type='search')" ) ? -- this.element.parent() : this.element ).addClass( "ui-disabled" ); -+ if ( this.element.attr( "disabled", true ) ) { -+ this.element.addClass( "ui-disabled" ); -+ } - }, - - enable: function(){ -- ( this.element.attr( "disabled", false).is( "[type='search'],:jqmData(type='search')" ) ? -- this.element.parent() : this.element ).removeClass( "ui-disabled" ); -+ if ( this.element.attr( "disabled", false) ) { -+ this.element.removeClass( "ui-disabled" ); -+ } - } - }); - --- -1.7.0.4 - diff --git a/libs/patch/jqm-1.1.0/0008-JQM-remove-auto-populated-right-arrow-button.patch b/libs/patch/jqm-1.1.0/0008-JQM-remove-auto-populated-right-arrow-button.patch deleted file mode 100644 index f70c25c..0000000 --- a/libs/patch/jqm-1.1.0/0008-JQM-remove-auto-populated-right-arrow-button.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c0960209ffd4540404d680331f54bdac872476ac Mon Sep 17 00:00:00 2001 -From: wongi11.lee -Date: Fri, 29 Jun 2012 14:25:03 +0900 -Subject: [PATCH] JQM remove auto populated right-arrow button. - -Change-Id: I57c6583aee484c8dedb4a49f12e9dfa2b1bf6b85 -Signed-off-by: wongi11.lee ---- - .../js/jquery.mobile.listview.js | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -index f3fabfa..4ccdd73 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -@@ -188,6 +188,11 @@ $.widget( "mobile.listview", $.mobile.widget, { - if ( a.length ) { - icon = item.jqmData("icon"); - -+ /* Remove auto populated right-arrow button. */ -+ if ( icon === undefined ) { -+ icon = false; -+ } -+ - item.buttonMarkup({ - wrapperEls: "div", - shadow: false, --- -1.7.0.4 - diff --git a/libs/patch/jqm-1.1.0/0009-JQM-change-button-hoverDelay-to-0-to-improve-respons.patch b/libs/patch/jqm-1.1.0/0009-JQM-change-button-hoverDelay-to-0-to-improve-respons.patch deleted file mode 100644 index b0f0b85..0000000 --- a/libs/patch/jqm-1.1.0/0009-JQM-change-button-hoverDelay-to-0-to-improve-respons.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b4ca5396f3d90e5f7ce05fba7f4d4182a6921e4b Mon Sep 17 00:00:00 2001 -From: wongi11.lee -Date: Mon, 2 Jul 2012 16:01:35 +0900 -Subject: [PATCH] JQM change button hoverDelay to 0 to improve response. - -Change-Id: Ie37bc90d86a94a2ea48819386a76fe976b91aa79 -Signed-off-by: wongi11.lee ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.core.js | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -index 7bde672..9007c36 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -@@ -87,7 +87,7 @@ define( [ "jquery", "../external/requirejs/text!../version.txt", "./jquery.mobil - orientationChangeEnabled: true, - - buttonMarkup: { -- hoverDelay: 200 -+ hoverDelay: 0 - }, - - // TODO might be useful upstream in jquery itself ? --- -1.7.0.4 - diff --git a/libs/patch/jqm-1.1.0/0010-JQM-Prevent-blinking-on-page-transition.patch b/libs/patch/jqm-1.1.0/0010-JQM-Prevent-blinking-on-page-transition.patch deleted file mode 100644 index 6479b70..0000000 --- a/libs/patch/jqm-1.1.0/0010-JQM-Prevent-blinking-on-page-transition.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bf9dc02776446faee9e5587360584d9d9b9b135e Mon Sep 17 00:00:00 2001 -From: Youmin Ha -Date: Tue, 3 Jul 2012 15:07:07 +0900 -Subject: [PATCH] JQM:Prevent blinking on page transition - -Signed-off-by: Minkyu Kang -Signed-off-by: Youmin Ha ---- - .../js/jquery.mobile.transition.js | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -index 56f93a6..e5555e8 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.transition.js -@@ -29,6 +29,15 @@ var createHandler = function( sequential ){ - $.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + name ); - }, - scrollPage = function(){ -+ // Prevent blinking on page scrolling in Tizen/Android devices. -+ // Don't scoll window, when current scroll top(scrollTop()) is already at toScroll, -+ // or when current scroll top is 0 and toScroll is same to defaultHomeScroll -+ // (which means the top position of page). In these case, page scrolling is not needed. -+ var st = $( window ).scrollTop(); -+ if( st === toScroll || ( $.mobile.defaultHomeScroll === toScroll && st == 0 ) ) { -+ return; -+ } -+ - // By using scrollTo instead of silentScroll, we can keep things better in order - // Just to be precautios, disable scrollstart listening like silentScroll would - $.event.special.scrollstart.enabled = false; -@@ -150,4 +159,4 @@ $.mobile.transitionFallbacks = {}; - })( jQuery, this ); - //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); - }); --//>>excludeEnd("jqmBuildExclude"); -\ No newline at end of file -+//>>excludeEnd("jqmBuildExclude"); --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0011-JQM-add-refresh-api-to-page.patch b/libs/patch/jqm-1.1.0/0011-JQM-add-refresh-api-to-page.patch deleted file mode 100644 index 238642c..0000000 --- a/libs/patch/jqm-1.1.0/0011-JQM-add-refresh-api-to-page.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 15b17c830a4d9737b23da195e23ed02aabcf2c36 Mon Sep 17 00:00:00 2001 -From: Jun Jinhyuk -Date: Fri, 6 Jul 2012 07:15:19 -0400 -Subject: [PATCH] JQM add refresh api to page - ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.page.js | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -index d2bd195..85c77fe 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -@@ -15,9 +15,9 @@ $.widget( "mobile.page", $.mobile.widget, { - }, - - _create: function() { -- -+ - var self = this; -- -+ - // if false is returned by the callbacks do not create the page - if( self._trigger( "beforecreate" ) === false ){ - return false; -@@ -34,11 +34,15 @@ $.widget( "mobile.page", $.mobile.widget, { - } ); - - }, -- -+ -+ refresh : function() { -+ $( ".ui-page-active" ).children( ".ui-content" ).trigger("updatelayout", ["external"]); -+ }, -+ - removeContainerBackground: function(){ - $.mobile.pageContainer.removeClass( "ui-overlay-" + $.mobile.getInheritedTheme( this.element.parent() ) ); - }, -- -+ - // set the page container background to the page theme - setContainerBackground: function( theme ){ - if( this.options.theme ){ --- -1.7.4.1 - diff --git a/libs/patch/jqm-1.1.0/0012-JQM-set-default-page-transition-to-none.patch b/libs/patch/jqm-1.1.0/0012-JQM-set-default-page-transition-to-none.patch deleted file mode 100644 index 71a6477..0000000 --- a/libs/patch/jqm-1.1.0/0012-JQM-set-default-page-transition-to-none.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 55dcac86989fdc737ea6894ca136bb250bdc5f95 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Tue, 17 Jul 2012 09:12:49 +0900 -Subject: [PATCH] JQM: set default page transition to none - -Signed-off-by: Minkyu Kang ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.core.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -index 9007c36..ae576b1 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.core.js -@@ -44,7 +44,7 @@ define( [ "jquery", "../external/requirejs/text!../version.txt", "./jquery.mobil - linkBindingEnabled: true, - - // Set default page transition - 'none' for no transitions -- defaultPageTransition: "fade", -+ defaultPageTransition: "none", - - // Set maximum window width for transitions to apply - 'false' for no limit - maxTransitionWidth: false, --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0013-JQM-remove-filter-Placeholder-of-listview.patch b/libs/patch/jqm-1.1.0/0013-JQM-remove-filter-Placeholder-of-listview.patch deleted file mode 100644 index f585b71..0000000 --- a/libs/patch/jqm-1.1.0/0013-JQM-remove-filter-Placeholder-of-listview.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 731daf9729c9163dd0db78d72acc0c21ff334ca8 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Mon, 20 Aug 2012 15:48:11 +0900 -Subject: [PATCH] JQM: remove filter Placeholder of listview - -Change-Id: I03d5e62e33d3e1fe7455e9b30d2cc479c092503f -Signed-off-by: Minkyu Kang ---- - .../js/jquery.mobile.listview.filter.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.filter.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.filter.js -index a2420d8..929b221 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.filter.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.filter.js -@@ -9,7 +9,7 @@ define( [ "jquery", "./jquery.mobile.listview", "./jquery.mobile.forms.textinput - (function( $, undefined ) { - - $.mobile.listview.prototype.options.filter = false; --$.mobile.listview.prototype.options.filterPlaceholder = "Filter items..."; -+$.mobile.listview.prototype.options.filterPlaceholder = ""; - $.mobile.listview.prototype.options.filterTheme = "c"; - $.mobile.listview.prototype.options.filterCallback = function( text, searchValue ){ - return text.toLowerCase().indexOf( searchValue ) === -1; --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0014-JQM-Add-default-theme-on-buttonMarkup.patch b/libs/patch/jqm-1.1.0/0014-JQM-Add-default-theme-on-buttonMarkup.patch deleted file mode 100644 index 501ed5a..0000000 --- a/libs/patch/jqm-1.1.0/0014-JQM-Add-default-theme-on-buttonMarkup.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b0b89011ffeb68fc9a207f67558048217912025c Mon Sep 17 00:00:00 2001 -From: Youmin Ha -Date: Wed, 25 Jul 2012 10:15:08 +0900 -Subject: [PATCH] JQM: Add default theme on buttonMarkup - -Signed-off-by: Youmin Ha ---- - .../js/jquery.mobile.buttonMarkup.js | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -index d523ad9..9ca2366 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.buttonMarkup.js -@@ -38,7 +38,7 @@ $.fn.buttonMarkup = function( options ) { - o = $.extend( {}, $.fn.buttonMarkup.defaults, { - icon: options.icon !== undefined ? options.icon : el.jqmData( "icon" ), - iconpos: options.iconpos !== undefined ? options.iconpos : el.jqmData( "iconpos" ), -- theme: options.theme !== undefined ? options.theme : el.jqmData( "theme" ) || $.mobile.getInheritedTheme( el, "c" ), -+ theme: options.theme !== undefined ? options.theme : el.jqmData( "theme" ) || $.mobile.getInheritedTheme( el, $.fn.buttonMarkup.defaults["theme"] ), - inline: options.inline !== undefined ? options.inline : el.jqmData( "inline" ), - shadow: options.shadow !== undefined ? options.shadow : el.jqmData( "shadow" ), - corners: options.corners !== undefined ? options.corners : el.jqmData( "corners" ), -@@ -235,6 +235,7 @@ $.fn.buttonMarkup = function( options ) { - }; - - $.fn.buttonMarkup.defaults = { -+ theme: "c", - corners: true, - shadow: true, - iconshadow: true, --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0015-JQM-If-height-of-textarea-is-bigger-than-window.inne.patch b/libs/patch/jqm-1.1.0/0015-JQM-If-height-of-textarea-is-bigger-than-window.inne.patch deleted file mode 100644 index 25291e7..0000000 --- a/libs/patch/jqm-1.1.0/0015-JQM-If-height-of-textarea-is-bigger-than-window.inne.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c8f2ce6d45c42d572ef96cc166a64c8d60bc5ef8 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Thu, 9 Aug 2012 17:36:11 +0900 -Subject: [PATCH] JQM: If height of textarea is bigger than - window.innerHeight/2, don't grow up anymore - -Signed-off-by: Minkyu Kang ---- - .../js/jquery.mobile.forms.textinput.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -index f444522..681b9b4 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.textinput.js -@@ -73,7 +73,7 @@ $.widget( "mobile.textinput", $.mobile.widget, { - var scrollHeight = input[ 0 ].scrollHeight, - clientHeight = input[ 0 ].clientHeight; - -- if ( clientHeight < scrollHeight ) { -+ if ( clientHeight < scrollHeight && window.innerHeight / 2 > scrollHeight ) { - input.height(scrollHeight + extraLineHeight); - } - }, --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0016-apply-tizen-default-button-order-in-title-bar-ui-btn.patch b/libs/patch/jqm-1.1.0/0016-apply-tizen-default-button-order-in-title-bar-ui-btn.patch deleted file mode 100644 index 3038d34..0000000 --- a/libs/patch/jqm-1.1.0/0016-apply-tizen-default-button-order-in-title-bar-ui-btn.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ea0849395563ced0fab0ce5d4b0c947b49b4b152 Mon Sep 17 00:00:00 2001 -From: Koeun Choi -Date: Fri, 17 Aug 2012 21:05:05 +0900 -Subject: [PATCH] apply tizen default button order in title bar: ui-btn-right. - -Change-Id: I3ad4b706982090e2b1efa28227fe8e40ac9ee039 ---- - .../js/jquery.mobile.page.sections.js | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -index e78af6a..5e289b5 100755 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js -@@ -54,9 +54,13 @@ $( document ).delegate( ":jqmData(role='page'), :jqmData(role='dialog')", "pagec - leftbtn = $headeranchors.hasClass( "ui-btn-left" ); - rightbtn = $headeranchors.hasClass( "ui-btn-right" ); - -+ // when button position is not declared, make it "right" button on Tizen. -+ rightbtn = $headeranchors.not( ".ui-btn-left" ).addClass( "ui-btn-right" ); -+ /* - leftbtn = leftbtn || $headeranchors.eq( 0 ).not( ".ui-btn-right" ).addClass( "ui-btn-left" ).length; - - rightbtn = rightbtn || $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length; -+ */ - } - - // Page title --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0017-JQM-generate-checkbox-radio-has-class-in-list.patch b/libs/patch/jqm-1.1.0/0017-JQM-generate-checkbox-radio-has-class-in-list.patch deleted file mode 100644 index cd771b9..0000000 --- a/libs/patch/jqm-1.1.0/0017-JQM-generate-checkbox-radio-has-class-in-list.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cdada84aa4444504a17346146a8b08c9e633eaaa Mon Sep 17 00:00:00 2001 -From: Jun Jinhyuk -Date: Tue, 21 Aug 2012 14:45:17 +0900 -Subject: [PATCH] JQM generate checkbox radio has class in list - -Change-Id: Ie958c0a960d14494f476e2354677fcc588b7a32c ---- - .../js/jquery.mobile.listview.js | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -index 4ccdd73..a290e32 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -@@ -151,6 +151,19 @@ $.widget( "mobile.listview", $.mobile.widget, { - } - } - }, -+ -+ _addCheckboxRadioClasses: function( containers ) -+ { -+ var i, inputAttr, len = containers.length; -+ for ( i = 0; i < len; i++ ) { -+ inputAttr = $( containers[ i ] ).find( "input" ); -+ if ( inputAttr.attr( "type" ) == "checkbox" ) { -+ $( containers[ i ] ).addClass( "ui-li-has-checkbox" ); -+ } else if ( inputAttr.attr( "type" ) == "radio" ) { -+ $( containers[ i ] ).addClass( "ui-li-has-radio" ); -+ } -+ } -+ }, - - refresh: function( create ) { - this.parentPage = this.element.closest( ".ui-page" ); -@@ -313,6 +326,9 @@ $.widget( "mobile.listview", $.mobile.widget, { - this._addThumbClasses( li ); - this._addThumbClasses( $list.find( ".ui-link-inherit" ) ); - -+ this._addCheckboxRadioClasses( li ); -+ this._addCheckboxRadioClasses( $list.find( ".ui-link-inherit" ) ); -+ - this._refreshCorners( create ); - }, - --- -1.7.4.1 - diff --git a/libs/patch/jqm-1.1.0/0018-JQM-merge-navigation-from-1.2.0a-for-popup.patch b/libs/patch/jqm-1.1.0/0018-JQM-merge-navigation-from-1.2.0a-for-popup.patch deleted file mode 100644 index 4746f2f..0000000 --- a/libs/patch/jqm-1.1.0/0018-JQM-merge-navigation-from-1.2.0a-for-popup.patch +++ /dev/null @@ -1,233 +0,0 @@ -From dc926a4b6bd820cc6fa50dabba5066073a56c9b5 Mon Sep 17 00:00:00 2001 -From: Daehyeon Jung -Date: Thu, 9 Aug 2012 10:53:27 +0900 -Subject: [PATCH] JQM: merge navigation from 1.2.0a for popup - -Signed-off-by: Jung, Daehyeon ---- - .../js/jquery.mobile.navigation.js | 96 ++++++++++++++++++-- - 1 file changed, 86 insertions(+), 10 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -index ad2f67c..f6e11b3 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -@@ -138,6 +138,10 @@ define( [ - return relUrl; - } - -+ if ( absUrl === undefined ) { -+ absUrl = documentBase; -+ } -+ - var relObj = path.parseUrl( relUrl ), - absObj = path.parseUrl( absUrl ), - protocol = relObj.protocol || absObj.protocol, -@@ -168,7 +172,8 @@ define( [ - } else if ( path.isSameDomain( u, documentBase ) ) { - return u.hrefNoHash.replace( documentBase.domain, "" ); - } -- return absUrl; -+ -+ return window.decodeURIComponent(absUrl); - }, - - //get path from current hash, or from a file path -@@ -211,6 +216,10 @@ define( [ - return path.stripHash( hash.replace( /\?.*$/, "" ).replace( dialogHashKey, "" ) ); - }, - -+ isHashValid: function( hash ) { -+ return ( /^#[^#]+$/ ).test( hash ); -+ }, -+ - //check whether a url is referencing the same domain, or an external domain or different protocol - //could be mailto, etc - isExternal: function( url ) { -@@ -253,7 +262,20 @@ define( [ - if ( u.protocol !== "" ) { - return ( u.hash && ( u.hrefNoHash === documentUrl.hrefNoHash || ( documentBaseDiffers && u.hrefNoHash === documentBase.hrefNoHash ) ) ); - } -- return (/^#/).test( u.href ); -+ return ( /^#/ ).test( u.href ); -+ }, -+ -+ -+ // Some embedded browsers, like the web view in Phone Gap, allow cross-domain XHR -+ // requests if the document doing the request was loaded via the file:// protocol. -+ // This is usually to allow the application to "phone home" and fetch app specific -+ // data. We normally let the browser handle external/cross-domain urls, but if the -+ // allowCrossDomainPages option is true, we will allow cross-domain http/https -+ // requests to go through our page loading logic. -+ isPermittedCrossDomainRequest: function( docUrl, reqUrl ) { -+ return $.mobile.allowCrossDomainPages && -+ docUrl.protocol === "file:" && -+ reqUrl.search( /^https?:/ ) !== -1; - } - }, - -@@ -307,7 +329,7 @@ define( [ - $.each( urlHistory.stack, function( i, historyEntry ) { - - //if the url is in the stack, it's a forward or a back -- if( opts.currentUrl === historyEntry.url ) { -+ if ( decodeURIComponent( opts.currentUrl ) === decodeURIComponent( historyEntry.url ) ) { - //define back and forward by whether url is older or newer than current page - back = i < urlHistory.activeIndex; - forward = !back; -@@ -398,7 +420,7 @@ define( [ - - //remove active classes after page transition or error - function removeActiveLinkClass( forceRemoval ) { -- if( !!$activeClickedLink && ( !$activeClickedLink.closest( '.ui-page-active' ).length || forceRemoval ) ) { -+ if ( !!$activeClickedLink && ( !$activeClickedLink.closest( "." + $.mobile.activePageClass ).length || forceRemoval ) ) { - $activeClickedLink.removeClass( $.mobile.activeBtnClass ); - } - $activeClickedLink = null; -@@ -667,7 +689,8 @@ define( [ - // 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 ) -+ .jqmData( "url", dataUrl ); - } - - // If we failed to find a page in the DOM, check the URL to see if it -@@ -1002,6 +1025,16 @@ define( [ - if( fromPage && fromPage[0] === toPage[0] && !settings.allowSamePageTransition ) { - isPageTransitioning = false; - mpc.trigger( "pagechange", triggerData ); -+ -+ // Even if there is no page change to be done, we should keep the urlHistory in sync with the hash changes -+ if ( settings.fromHashChange ) { -+ urlHistory.directHashChange({ -+ currentUrl: url, -+ isBack: function() {}, -+ isForward: function() {} -+ }); -+ } -+ - return; - } - -@@ -1033,6 +1066,9 @@ define( [ - } - } catch(e) {} - -+ // Record whether we are at a place in history where a dialog used to be - if so, do not add a new history entry and do not change the hash either -+ var alreadyThere = false; -+ - // If we're displaying the page as a dialog, we don't want the url - // for the dialog content to be used in the hash. Instead, we want - // to append the dialogHashKey to the url of the current page. -@@ -1041,7 +1077,24 @@ define( [ - // be an empty string. Moving the undefined -> empty string back into - // urlHistory.addNew seemed imprudent given undefined better represents - // the url state -+ -+ // If we are at a place in history that once belonged to a dialog, reuse -+ // this state without adding to urlHistory and without modifying the hash. -+ // However, if a dialog is already displayed at this point, and we're -+ // about to display another dialog, then we must add another hash and -+ // history entry on top so that one may navigate back to the original dialog -+ if ( active.url.indexOf( dialogHashKey ) > -1 && !$.mobile.activePage.is( ".ui-dialog" ) ) { -+ settings.changeHash = false; -+ alreadyThere = true; -+ } -+ - url = ( active.url || "" ) + dialogHashKey; -+ -+ // tack on another dialogHashKey if this is the same as the initial hash -+ // this makes sure that a history entry is created for this dialog -+ if ( urlHistory.activeIndex === 0 && url === urlHistory.initialDst ) { -+ url += dialogHashKey; -+ } - } - - // Set the location hash. -@@ -1068,7 +1121,7 @@ define( [ - || ( isDialog ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition ); - - //add page to history stack if it's not back or forward -- if( !historyDir ) { -+ if ( !historyDir && !alreadyThere ) { - urlHistory.addNew( url, settings.transition, pageTitle, pageUrl, settings.role ); - } - -@@ -1193,8 +1246,7 @@ define( [ - - url = path.makeUrlAbsolute( url, getClosestBaseUrl($this) ); - -- //external submits use regular HTTP -- if( path.isExternal( url ) || target ) { -+ if ( ( path.isExternal( url ) && !path.isPermittedCrossDomainRequest( documentUrl, url ) ) || target ) { - return; - } - -@@ -1344,7 +1396,7 @@ define( [ - //this may need to be more specific as we use data-rel more - role = $link.attr( "data-" + $.mobile.ns + "rel" ) || undefined; - -- $.mobile.changePage( href, { transition: transition, reverse: reverse, role: role } ); -+ $.mobile.changePage( href, { transition: transition, reverse: reverse, role: role, link: $link } ); - event.preventDefault(); - }); - -@@ -1369,6 +1421,9 @@ define( [ - //transition is false if it's the first page, undefined otherwise (and may be overridden by default) - transition = $.mobile.urlHistory.stack.length === 0 ? "none" : undefined, - -+ // "navigate" event fired to allow others to take advantage of the more robust hashchange handling -+ navEvent = new $.Event( "navigate" ), -+ - // default options for the changPage calls made after examining the current state - // of the page and the hash - changePageOptions = { -@@ -1377,6 +1432,17 @@ define( [ - fromHashChange: true - }; - -+ if ( 0 === urlHistory.stack.length ) { -+ urlHistory.initialDst = to; -+ } -+ -+ // We should probably fire the "navigate" event from those places that make calls to _handleHashChange, -+ // and have _handleHashChange hook into the "navigate" event instead of triggering it here -+ $.mobile.pageContainer.trigger( navEvent ); -+ if ( navEvent.isDefaultPrevented() ) { -+ return; -+ } -+ - //if listening is disabled (either globally or temporarily), or it's a dialog hash - if( !$.mobile.hashListeningEnabled || urlHistory.ignoreNextHashChange ) { - urlHistory.ignoreNextHashChange = false; -@@ -1432,6 +1498,14 @@ define( [ - // since the hashchange could've been the result of a forward/backward navigation - // that crosses from an external page/dialog to an internal page/dialog. - to = ( typeof to === "string" && !path.isPath( to ) ) ? ( path.makeUrlAbsolute( '#' + to, documentBase ) ) : to; -+ -+ // If we're about to go to an initial URL that contains a reference to a non-existent -+ // internal page, go to the first page instead. We know that the initial hash refers to a -+ // non-existent page, because the initial hash did not end up in the initial urlHistory entry -+ if ( to === path.makeUrlAbsolute( '#' + urlHistory.initialDst, documentBase ) && -+ urlHistory.stack.length && urlHistory.stack[0].url !== urlHistory.initialDst.replace( dialogHashKey, "" ) ) { -+ to = $.mobile.firstPage; -+ } - $.mobile.changePage( to, changePageOptions ); - } else { - //there's no hash, go to the first page in the dom -@@ -1441,7 +1515,9 @@ define( [ - - //hashchange event handler - $window.bind( "hashchange", function( e, triggered ) { -- $.mobile._handleHashChange( location.hash ); -+ // Firefox auto-escapes the location.hash as for v13 but -+ // leaves the href untouched -+ $.mobile._handleHashChange( path.parseUrl(location.href).hash ); - }); - - //set page min-heights to be device specific --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0019-JQM-listview-patch-select-right-button.patch b/libs/patch/jqm-1.1.0/0019-JQM-listview-patch-select-right-button.patch deleted file mode 100644 index 26c2546..0000000 --- a/libs/patch/jqm-1.1.0/0019-JQM-listview-patch-select-right-button.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 707a5c7b76fdfb108c7b54316384763f37a0b303 Mon Sep 17 00:00:00 2001 -From: Jun Jinhyuk -Date: Tue, 4 Sep 2012 15:51:58 +0900 -Subject: [PATCH] JQM listview patch select right button - -Change-Id: Ic5b8e01303750c03a3ce681a45d591214683e4a7 ---- - .../js/jquery.mobile.listview.js | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -index a290e32..671bc84 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.listview.js -@@ -164,7 +164,21 @@ $.widget( "mobile.listview", $.mobile.widget, { - } - } - }, -- -+ -+ _addRightBtnClasses: function( containers ) -+ { -+ var i, btnAttr, len = containers.length; -+ for ( i = 0; i < len; i++ ) { -+ btnAttr = $( containers[ i ] ).find( ":jqmData(role='button')" ) || ( $( containers[ i ] ).find( "input" ).attr( "type" ) == "button" ); -+ if ( btnAttr.length ) { -+ if ( btnAttr.jqmData( "style" ) == "circle" ) { -+ $( containers[ i ] ).addClass( "ui-li-has-right-circle-btn" ); -+ } else { -+ $( containers[ i ] ).addClass( "ui-li-has-right-btn" ); -+ } -+ } -+ } -+ }, - refresh: function( create ) { - this.parentPage = this.element.closest( ".ui-page" ); - this._createSubPages(); -@@ -329,6 +343,9 @@ $.widget( "mobile.listview", $.mobile.widget, { - this._addCheckboxRadioClasses( li ); - this._addCheckboxRadioClasses( $list.find( ".ui-link-inherit" ) ); - -+ this._addRightBtnClasses( li ); -+ this._addRightBtnClasses( $list.find( ".ui-link-inherit" ) ); -+ - this._refreshCorners( create ); - }, - --- -1.7.4.1 - diff --git a/libs/patch/jqm-1.1.0/0020-JQM-Block-click-event-only-with-the-element-that-doe.patch b/libs/patch/jqm-1.1.0/0020-JQM-Block-click-event-only-with-the-element-that-doe.patch deleted file mode 100644 index 442db89..0000000 --- a/libs/patch/jqm-1.1.0/0020-JQM-Block-click-event-only-with-the-element-that-doe.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ac56c1f0e6620cbd83127b2ca3192723dcf50d56 Mon Sep 17 00:00:00 2001 -From: Youmin Ha -Date: Sat, 8 Sep 2012 22:43:29 +0900 -Subject: [PATCH] JQM: Block click event only with the element that does preventDefault on vclick - -Signed-off-by: Youmin Ha ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -index b608460..8d7d9a2 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.vmouse.js -@@ -300,6 +300,7 @@ function handleTouchEnd( event ) { - t = getNativeEvent( event ).changedTouches[ 0 ]; - clickBlockList.push({ - touchID: lastTouchID, -+ target: event.target, - x: t.clientX, - y: t.clientY - }); -@@ -494,7 +495,7 @@ if ( eventCaptureSupported ) { - o = clickBlockList[ i ]; - touchID = 0; - -- if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) || -+ if ( ( ele === target && target === o.target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) || - $.data( ele, touchTargetPropertyName ) === o.touchID ) { - // XXX: We may want to consider removing matches from the block list - // instead of waiting for the reset timer to fire. --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0021-JQM-add-event-blocker-when-load-a-first-page.patch b/libs/patch/jqm-1.1.0/0021-JQM-add-event-blocker-when-load-a-first-page.patch deleted file mode 100644 index a639dc6..0000000 --- a/libs/patch/jqm-1.1.0/0021-JQM-add-event-blocker-when-load-a-first-page.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 90c6c1dae398b40abfd2f9325bd1ed57ecd69178 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Wed, 26 Sep 2012 14:34:50 +0900 -Subject: [PATCH] JQM: add event blocker when load a first page - -Change-Id: I4b159977e158cf8358bdd118682b8291e3adb6d8 -Signed-off-by: Minkyu Kang ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.init.js | 13 +++++++++++++ - .../js/jquery.mobile.navigation.js | 4 ++++ - 2 files changed, 17 insertions(+) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.init.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.init.js -index 93c03e8..54c4615 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.init.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.init.js -@@ -106,6 +106,18 @@ define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.support", "./jquery - $( window ).unbind( "scroll", checkLoaderPosition ); - }, - -+ addEventBlocker: function () { -+ $html.addClass( "ui-blocker" ); -+ $html.bind( "touchstart touchend vclick mousedown mouseup click", function () { -+ return false; -+ } ); -+ }, -+ -+ removeEventBlocker: function () { -+ $html.removeClass( "ui-blocker" ); -+ $html.unbind( "touchstart touchend vclick mousedown mouseup click" ); -+ }, -+ - // find and enhance the pages in the dom and transition to the first page. - initializePage: function() { - // find present pages -@@ -138,6 +150,7 @@ define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.support", "./jquery - - // cue page loading message - $.mobile.showPageLoadingMsg(); -+ $.mobile.addEventBlocker(); - - //remove initial build class (only present on first pageshow) - hideRenderingClass(); -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -index f6e11b3..841e8a9 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.navigation.js -@@ -529,6 +529,10 @@ define( [ - - //trigger pageshow, define prevPage as either fromPage or empty jQuery obj - toPage.data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } ); -+ -+ setTimeout( function () { -+ $.mobile.removeEventBlocker(); -+ }, 0 ); - }); - - return promise; --- -1.7.9.5 - diff --git a/libs/patch/jqm-1.1.0/0022-JQM-update-setheaderfooter-in-GUI-builder.patch b/libs/patch/jqm-1.1.0/0022-JQM-update-setheaderfooter-in-GUI-builder.patch deleted file mode 100644 index 1031ca4..0000000 --- a/libs/patch/jqm-1.1.0/0022-JQM-update-setheaderfooter-in-GUI-builder.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d41f2c4965179a89e255cb1636eeff14c65cc1c0 Mon Sep 17 00:00:00 2001 -From: Jun Jinhyuk -Date: Thu, 18 Oct 2012 15:51:48 +0900 -Subject: [PATCH] JQM update setheaderfooter in GUI builder - -Change-Id: Iae03f3afbb1e2cdf223f5e97a6122e3406c8d965 ---- - .../jquery-mobile-1.1.0/js/jquery.mobile.page.js | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -index 85c77fe..1951c1c 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.js -@@ -39,6 +39,11 @@ $.widget( "mobile.page", $.mobile.widget, { - $( ".ui-page-active" ).children( ".ui-content" ).trigger("updatelayout", ["external"]); - }, - -+ /* GUI Builder only : redesign page when user drag&drop header,footer */ -+ setToolbar : function () { -+ $( ".ui-page" ).trigger( "pagebeforeshow" ); -+ }, -+ - removeContainerBackground: function(){ - $.mobile.pageContainer.removeClass( "ui-overlay-" + $.mobile.getInheritedTheme( this.element.parent() ) ); - }, --- -1.7.4.1 - diff --git a/libs/patch/jqm-1.1.0/0023-JQM-checkbox-set-focus-when-click-the-checkbox.patch b/libs/patch/jqm-1.1.0/0023-JQM-checkbox-set-focus-when-click-the-checkbox.patch deleted file mode 100644 index 9aa0a4f..0000000 --- a/libs/patch/jqm-1.1.0/0023-JQM-checkbox-set-focus-when-click-the-checkbox.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cde0eff7f9903134b8f097c8c08069ccc65c1ae8 Mon Sep 17 00:00:00 2001 -From: Minkyu Kang -Date: Wed, 14 Nov 2012 14:24:31 +0900 -Subject: [PATCH] JQM: checkbox: set focus when click the checkbox - -Change-Id: Id0e8cb7c177a03f98611fdc0dc2046f4bfacefa0 -Signed-off-by: Minkyu Kang ---- - .../js/jquery.mobile.forms.checkboxradio.js | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -index 08556cf..60bcb38 100644 ---- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -+++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.forms.checkboxradio.js -@@ -175,6 +175,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, { - if ( this.checked || self.inputtype === "checkbox" ) { - $this.trigger( "change" ); - } -+ $this.focus(); - }) - .checkboxradio( "refresh" ); - }, --- -1.7.9.5 -