1 From 12f7cdd3e6a427c777eb5b4c48b33fdd0ba1ef15 Mon Sep 17 00:00:00 2001
2 From: Jun Jinhyuk <jinhyuk.jun@samsung.com>
3 Date: Thu, 5 Jul 2012 01:00:43 -0400
4 Subject: [PATCH] JQM move pagelayout to winset
6 Change-Id: I38777266f0e4d30bce2db5057e2675f35221096a
8 .../js/jquery.mobile.fixedToolbar.js | 2 +-
9 .../js/jquery.mobile.page.sections.js | 16 ++--------------
10 2 files changed, 3 insertions(+), 15 deletions(-)
11 mode change 100644 => 100755 libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js
13 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
14 index 0f9c23d..6a40ac5 100644
15 --- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js
16 +++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.fixedToolbar.js
17 @@ -65,7 +65,7 @@ define( [ "jquery", "./jquery.mobile.widget", "./jquery.mobile.core", "./jquery.
21 - initSelector: ":jqmData(position='fixed')"
22 + initSelector: ":jqmData(position='dummy')"
26 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
29 index e0a718d..e78af6a
30 --- a/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js
31 +++ b/libs/js/jquery-mobile-1.1.0/js/jquery.mobile.page.sections.js
32 @@ -8,11 +8,12 @@ define( [ "jquery", "./jquery.mobile.page", "./jquery.mobile.core", "./jquery.mo
33 (function( $, undefined ) {
35 $.mobile.page.prototype.options.backBtnText = "Back";
36 -$.mobile.page.prototype.options.addBackBtn = false;
37 +$.mobile.page.prototype.options.addBackBtn = "footer";
38 $.mobile.page.prototype.options.backBtnTheme = null;
39 $.mobile.page.prototype.options.headerTheme = "a";
40 $.mobile.page.prototype.options.footerTheme = "a";
41 $.mobile.page.prototype.options.contentTheme = null;
42 +$.mobile.page.prototype.options.footerExist = true;
44 $( document ).delegate( ":jqmData(role='page'), :jqmData(role='dialog')", "pagecreate", function( e ) {
46 @@ -58,19 +59,6 @@ $( document ).delegate( ":jqmData(role='page'), :jqmData(role='dialog')", "pagec
47 rightbtn = rightbtn || $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length;
50 - // Auto-add back btn on pages beyond first view
51 - if ( o.addBackBtn &&
52 - role === "header" &&
53 - $( ".ui-page" ).length > 1 &&
54 - $page.jqmData( "url" ) !== $.mobile.path.stripHash( location.hash ) &&
57 - backBtn = $( "<a href='#' class='ui-btn-left' data-"+ $.mobile.ns +"rel='back' data-"+ $.mobile.ns +"icon='arrow-l'>"+ o.backBtnText +"</a>" )
58 - // If theme is provided, override default inheritance
59 - .attr( "data-"+ $.mobile.ns +"theme", o.backBtnTheme || thisTheme )
60 - .prependTo( $this );
64 $this.children( "h1, h2, h3, h4, h5, h6" )
65 .addClass( "ui-title" )