From b5b621f08a5aa4d090e66a1ef5e23d5a8b9a0cda Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Wed, 26 Dec 2012 20:01:31 +0900 Subject: [PATCH] jqm: fix errors in patch files Some patch files had wrong content, causing build error. The wrong patch content has been fixed. Change-Id: Ic903dfa9aa572b9b65159d40f765d8cbcdf7d812 --- libs/patch/0014-JQM-add-TIZEN-back-btn.patch | 58 +--------------------- .../0020-JQM-Apply-tizen-style-context-popup.patch | 8 +-- 2 files changed, 5 insertions(+), 61 deletions(-) diff --git a/libs/patch/0014-JQM-add-TIZEN-back-btn.patch b/libs/patch/0014-JQM-add-TIZEN-back-btn.patch index 6534e12..edd8fc5 100644 --- a/libs/patch/0014-JQM-add-TIZEN-back-btn.patch +++ b/libs/patch/0014-JQM-add-TIZEN-back-btn.patch @@ -7,8 +7,7 @@ Change-Id: If1c5e68cff21d78abcc499b9eac7a6a3222f09be --- libs/js/jquery-mobile-1.2.0/js/widgets/page.js | 13 +++++ .../js/widgets/page.sections.js | 19 ++++++-- - ...d-back-btn-option-and-remove-jqm-back-btn.patch | 51 -------------------- - 3 files changed, 27 insertions(+), 56 deletions(-) + 2 files changed, 27 insertions(+), 56 deletions(-) delete mode 100644 libs/patch/0014-JQM-add-back-btn-option-and-remove-jqm-back-btn.patch diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/page.js b/libs/js/jquery-mobile-1.2.0/js/widgets/page.js @@ -76,61 +75,6 @@ index 7c05ecb..90a298a 100644 } // Page title -diff --git a/libs/patch/0014-JQM-add-back-btn-option-and-remove-jqm-back-btn.patch b/libs/patch/0014-JQM-add-back-btn-option-and-remove-jqm-back-btn.patch -deleted file mode 100644 -index 1ca3002..0000000 ---- a/libs/patch/0014-JQM-add-back-btn-option-and-remove-jqm-back-btn.patch -+++ /dev/null -@@ -1,51 +0,0 @@ --From 252820a3ea292bf652d2ecd644c0126152a20f46 Mon Sep 17 00:00:00 2001 --From: Jun Jinhyuk --Date: Wed, 28 Nov 2012 14:25:58 +0900 --Subject: [PATCH] JQM add back btn option and remove jqm back btn -- --Signed-off-by: Jun Jinhyuk ----- -- .../js/widgets/page.sections.js | 16 ++-------------- -- 1 files changed, 2 insertions(+), 14 deletions(-) -- --diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/page.sections.js b/libs/js/jquery-mobile-1.2.0/js/widgets/page.sections.js --index 7c05ecb..cbf6786 100644 ----- a/libs/js/jquery-mobile-1.2.0/js/widgets/page.sections.js --+++ b/libs/js/jquery-mobile-1.2.0/js/widgets/page.sections.js --@@ -8,11 +8,12 @@ define( [ "jquery", "./page", "../jquery.mobile.core" ], function( $ ) { -- (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; -- -- // NOTE bind used to force this binding to run before the buttonMarkup binding -- // which expects .ui-footer top be applied in its gigantic selector --@@ -61,19 +62,6 @@ $( document ).bind( "pagecreate", function( e ) { -- 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/0020-JQM-Apply-tizen-style-context-popup.patch b/libs/patch/0020-JQM-Apply-tizen-style-context-popup.patch index 09671dd..5064f0a 100644 --- a/libs/patch/0020-JQM-Apply-tizen-style-context-popup.patch +++ b/libs/patch/0020-JQM-Apply-tizen-style-context-popup.patch @@ -1,5 +1,5 @@ From 0df0afd2b03ab688210b9ff71d65dff73a33419c Mon Sep 17 00:00:00 2001 -From: "hjnim.kim" +From: "Hyunjung Kim" Date: Tue, 11 Dec 2012 19:14:31 +0900 Subject: [PATCH] Apply tizen style context popup @@ -133,7 +133,7 @@ index de2af2c..6470bc4 100644 // TODO sort out why this._page isn't working this.element.closest( ".ui-page" ).addClass( "ui-popup-open" ); } -+ ++ this._animate({ additionalCondition: true, transition: transition, @@ -170,12 +170,12 @@ index de2af2c..6470bc4 100644 + } else { + $(self._ui.arrow).hide(); + } -+ if( !options.x ++ if( !options.x + && self.positionTo !== "window" ) + { + options.x = $(self.link).offset().left + $(self.link).outerWidth() / 2; + } -+ if( !options.y ++ if( !options.y + && self.positionTo !== "window" ) + { + options.y = $(self.link).offset().top + $(self.link).outerHeight() / 2; -- 2.7.4