Export 0.1.63

[platform/framework/web/web-ui-fw.git] / src / widgets / pagelayout / js / jquery.mobile.tizen.pagelayout.js

diff --git a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
index 502554d..059741a 100755 (executable)
--- a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
+++ b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
@@ -173,9 +173,8 @@
                                        .css( "position", "fixed" )
                                        .css( "top", "0px" );
 
-                               if ( $elHeader.children().is(".ui-navbar") ) {
-                                       $elHeader.addClass( "ui-title-controlbar-height" );
-                                       $( event.target ).find( ".ui-content" ).addClass( "ui-title-content-controlbar-height" );
+                               if ( $elHeader.is(".ui-title-controlbar-multiline") ) {
+                                       $( event.target ).find( ".ui-content" ).addClass( "ui-title-content-multi-controlbar-height" );
                                } else {
                                        if ( $elHeader.length ) {
                                                $( event.target ).find( ".ui-content" ).addClass( "ui-title-content-" + tStyle + "-height" );
@@ -185,6 +184,13 @@
                                }
                        }
 
+                       /* set Title style */
+                       /* newTheme */
+                       if ( $elHeader.find("span.ui-title-text-sub").length ) {
+                               $elHeader.addClass( "ui-title-multiline");
+                       }
+
+
                        if ( $elHeader.children().is(".ui-option-header") ) {
                                $elContent.removeClass( "ui-title-content-" + tStyle + "-height" );
                                if ( $.tizen.optionheader.prototype.options.collapseOnInit == true ) {
@@ -239,6 +245,11 @@
                                $elFooterGroup = $elFooter.find( ":jqmData(role='fieldcontain')" );
                                gLength = $elFooterGroup.find( ".ui-radio" ).length;
 
+
+                               if ( $elFooterGroup.find( "div" ).is( ".ui-controlgroup-label" ) ) {
+                                       $elFooterGroup.find( "div.ui-controlgroup-label" ).remove();
+                               }
+
                                $elFooterGroup.find( ".ui-controlgroup" )
                                        .addClass( "ui-extended-controlgroup" )
                                        .addClass( "ui-footer-extended-controlgroup" )
@@ -261,13 +272,7 @@
                                $elFooter.css( "bottom", 0 );
                        }
 
-                       /* Increase Content size with dummy <div> because of footer height */
-                       if ( $elFooter.length != 0 && $( event.target ).find( ".dummy-div" ).length == 0 ) {
-                               $( event.target ).find( ":jqmData(role='content')" ).append( '<div class="dummy-div"></div>' );
-                               $( ".dummy-div" )
-                                       .css( "width", $elFooter.width() )
-                                       .css( "height", $elFooter.height() );
-                       }
+                       $elFooter.show();
 
                        /* Header position fix(remove transition) */
                        next_id = $( event.target ).attr( "id" );
@@ -293,6 +298,8 @@
                                        if ( !o.visibleOnPageShow ) {
                                                self.hide( true );
                                        }
+/* IME concenpt change after alpha2.0 */
+/*                                     self._IMEShown = false;*/
                                        self.setHeaderFooter( event );
                                } )
                                .bind( "webkitAnimationStart animationstart updatelayout", function ( e, data ) {
@@ -308,7 +315,8 @@
                                        if ( o.updatePagePadding ) {
                                                $( window ).bind( "throttledresize." + self.widgetName, function () {
                                                        self.updatePagePadding();       // FIXME: unused function.
-                                                       self.layoutPageIME();   // IME/resize reposition
+/* IME concenpt change after alpha2.0 */
+/*                                                     self.layoutPageIME();*/
                                                        self.updatePageLayout();
                                                        self._updateHeaderArea();
                                                });
@@ -365,12 +373,13 @@
                                headerBtnNum = $elHeader.children("a").length,
                                headerSrcNum = $elHeader.children("img").length;
 
-                       $elHeader.find( "h1" ).css( "width", window.innerWidth - $elHeader.children( "a" ).width() * headerBtnNum - $elHeader.children( "a" ).width() / 4 - $elHeader.children( "img" ).width() * headerSrcNum * 3 );
+                       $elHeader.find( "h1" ).css( "width", window.innerWidth - $elHeader.children( "a" ).width() * headerBtnNum - $elHeader.children( "a" ).width() / 4 - $elHeader.children( "img" ).width() * headerSrcNum * 4 );
                        /* add half width for default space between text and button, and img tag area is too narrow, so multiply three for img width*/
                },
 
                _visible: true,
-               _IMEShown : false,
+/* IME concenpt change after alpha2.0 */
+/*             _IMEShown : false,
                _IMEindicatorHeight : window.outerHeight - window.innerHeight,
 
                layoutPageIME: function () {
@@ -378,8 +387,6 @@
                                        || $(".ui-page-active .ui-header .input-search-bar").length
                                        || $(".ui-page-active .ui-content").find("input").length
                                        || $(".ui-page-active .ui-content").find("textarea").length) {
-                                       /* Check vertical and horizontal ratio.
-                                        * If focus on input and two values are different, IME is drawed. */
 
                                if ( ( window.innerHeight + this._IMEindicatorHeight ) < window.outerHeight && window.innerWidth == window.outerWidth ) {
                                        if ( this._IMEShown === false ) {
@@ -401,7 +408,7 @@
                                }
                        }
                },
-
+*/
                // This will set the content element's top or bottom padding equal to the toolbar's height
                updatePagePadding: function (data) {
                        var $el = this.element,
@@ -414,8 +421,7 @@
                },
 
 
-               /* 1. Calculate toolbar width(only controlbar)
-               *  2. Calculate and update content height   */
+               /* 1. Calculate and update content height   */
                updatePageLayout: function ( receiveType ) {
                        var $elFooter,
                                $elFooterControlbar,
@@ -440,9 +446,6 @@
                        if (resultFooterHeight != 0 ) {
                                $elFooter.css( "bottom", 0 );
                        }
-                       if ( $elFooterControlbar.jqmData("style") == "toolbar" ) {
-                               $elFooterControlbar.css( "width", window.innerWidth - $elFooterControlbar.siblings( ".ui-btn" ).width() - parseInt($elFooterControlbar.siblings(".ui-btn").css("right"), 10 ) * 2  );
-                       }
 
                        resultContentHeight = window.innerHeight - resultFooterHeight - resultHeaderHeight;