projects / platform / framework / web / web-ui-fw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4138f7e)
Export 0.1.57
authorYoumin Ha <youmin.ha@samsung.com>
Wed, 24 Oct 2012 05:30:04 +0000 (14:30 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Wed, 24 Oct 2012 05:30:04 +0000 (14:30 +0900)
20 files changed:
build-tools/bin/lessc patch | blob | history
build-tools/lib/less/index.js patch | blob | history
demos/tizen-winsets/index.html patch | blob | history
demos/tizen-winsets/widgets/scrollview_xy.html [new file with mode: 0644] patch | blob
libs/patch/0022-JQM-listview-don-t-trigger-updatelayout-when-keyup-e.patch [new file with mode: 0644] patch | blob
libs/patch/0022-JQM-update-setheaderfooter-in-GUI-builder.patch [new file with mode: 0644] patch | blob
packaging/web-ui-fw.spec patch | blob | history
src/themes/tizen/common/jquery.mobile.forms.textinput.less patch | blob | history
src/themes/tizen/common/jquery.mobile.listview.less patch | blob | history
src/themes/tizen/tizen-black/images/00_list_expand_closed.png [new file with mode: 0755] patch | blob
src/themes/tizen/tizen-black/images/00_list_expand_opened.png [new file with mode: 0755] patch | blob
src/themes/tizen/tizen-black/style.less patch | blob | history
src/themes/tizen/tizen-white/images/00_list_expand_closed.png [new file with mode: 0755] patch | blob
src/themes/tizen/tizen-white/images/00_list_expand_opened.png [new file with mode: 0755] patch | blob
src/themes/tizen/tizen-white/style.less patch | blob | history
src/widgets/common/js/jquery.mobile.tizen.scrollview.js patch | blob | history
src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js patch | blob | history
src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js patch | blob | history
src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js patch | blob | history
tools/inline-protos.sh patch | blob | history

diff --git a/build-tools/bin/lessc b/build-tools/bin/lessc
index 32f993f..7e0f915 100755 (executable)
--- a/build-tools/bin/lessc
+++ b/build-tools/bin/lessc
@@ -2,7 +2,7 @@
 
 var path = require('path'),
     fs = require('fs'),
-    sys = require('sys');
+    sys = require('util');
 
 try {
        // For old node.js versions
diff --git a/build-tools/lib/less/index.js b/build-tools/lib/less/index.js
index 3b4e928..c2c248d 100644 (file)
--- a/build-tools/lib/less/index.js
+++ b/build-tools/lib/less/index.js
@@ -1,5 +1,5 @@
 var path = require('path'),
-    sys = require('sys'),
+    sys = require('util'),
     fs = require('fs');
 
 try {
diff --git a/demos/tizen-winsets/index.html b/demos/tizen-winsets/index.html
index a0d0cae..0c6638b 100755 (executable)
--- a/demos/tizen-winsets/index.html
+++ b/demos/tizen-winsets/index.html
@@ -73,6 +73,7 @@
                                <li data-role="list-divider">Scrollview</li>
                                <li><a href="widgets/scrollview_x.html">Horizontal Scroll</a></li>
                                <li><a href="widgets/scrollview_y.html">Vertical Scroll</a></li>
+                               <li><a href="widgets/scrollview_xy.html">XY Scroll</a></li>
                                <li><a href="widgets/handler.html">Handler</a></li>
                                <li><a href="widgets/scroll_jump.html">Scroll Jump</a></li>
 
diff --git a/demos/tizen-winsets/widgets/scrollview_xy.html b/demos/tizen-winsets/widgets/scrollview_xy.html
new file mode 100644 (file)
index 0000000..853b70e
--- /dev/null
+++ b/demos/tizen-winsets/widgets/scrollview_xy.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<div data-role="page">
+       <div data-role="header" data-position="fixed">
+               <h1>Scrollview</h1>
+       </div>
+       <div data-role="content" data-scroll="none">
+               <p>XY Scroll</p>
+               <div data-scroll="xy" style="height:300px">
+                       <div class="ui-scrollview-view" style="width:1176px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/11.jpg" height="70px">
+                               <img src="./test/10.jpg" height="70px">
+                               <img src="./test/08.jpg" height="70px">
+                               <img src="./test/07.jpg" height="70px">
+                               <img src="./test/06.jpg" height="70px">
+                               <img src="./test/05.jpg" height="70px">
+                               <img src="./test/04.jpg" height="70px">
+                               <img src="./test/03.jpg" height="70px">
+                               <img src="./test/02.jpg" height="70px">
+                               <img src="./test/01.jpg" height="70px">
+                       </div>
+               </div>
+       </div><!-- /content -->
+</div> <!-- /page -->
diff --git a/libs/patch/0022-JQM-listview-don-t-trigger-updatelayout-when-keyup-e.patch b/libs/patch/0022-JQM-listview-don-t-trigger-updatelayout-when-keyup-e.patch
new file mode 100644 (file)
index 0000000..f06b4e5
--- /dev/null
+++ b/libs/patch/0022-JQM-listview-don-t-trigger-updatelayout-when-keyup-e.patch
@@ -0,0 +1,29 @@
+From 351740d23e76316fd82cc6ae0736b37f8de0d16f Mon Sep 17 00:00:00 2001
+From: Minkyu Kang <mk7.kang@samsung.com>
+Date: Tue, 23 Oct 2012 18:14:15 +0900
+Subject: [PATCH] JQM: listview: don't trigger updatelayout when keyup event
+ of filter
+
+Change-Id: I780a6bf3ff9bbeb7a421249ac33ff04da46d60b6
+Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
+---
+ .../js/jquery.mobile.listview.js                   |    3 ---
+ 1 file changed, 3 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 b72c8b8..bb73015 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
+@@ -97,9 +97,6 @@ $.widget( "mobile.listview", $.mobile.widget, {
+                                       .not(".ui-li-icon")
+                                       .addClass( "ui-corner-bl" );
+               }
+-              if ( !create ) {
+-                      this.element.trigger( "updatelayout" );
+-              }
+       },
+ 
+       // This is a generic utility method for finding the first
+-- 
+1.7.9.5
+
diff --git a/libs/patch/0022-JQM-update-setheaderfooter-in-GUI-builder.patch b/libs/patch/0022-JQM-update-setheaderfooter-in-GUI-builder.patch
new file mode 100644 (file)
index 0000000..1031ca4
--- /dev/null
+++ b/libs/patch/0022-JQM-update-setheaderfooter-in-GUI-builder.patch
@@ -0,0 +1,29 @@
+From d41f2c4965179a89e255cb1636eeff14c65cc1c0 Mon Sep 17 00:00:00 2001
+From: Jun Jinhyuk <jinhyuk.jun@samsung.com>
+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/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec
index ce47ba1..58a758e 100644 (file)
--- a/packaging/web-ui-fw.spec
+++ b/packaging/web-ui-fw.spec
@@ -1,5 +1,5 @@
 Name:       web-ui-fw
-Version:    0.1.56
+Version:    0.1.57
 Release:    0
 Summary:    Tizen Web UI Framework Library
 Group:      Development/Other
@@ -91,6 +91,17 @@ Summary:    Tizen Web UI Framework Demo Application: tizen winset demo
 
 ###############################
 %changelog
+* Wed Oct 24 2012 Youmin Ha <youmin.ha@samsung.com> 0.1.57
+- FIX:
+       - expandablelist: icon color fix
+       - scrollview: Fix xy scroll
+       - footer: Remove dummy div
+       - Make string concatnation effective in inline-protos.sh
+- Spec changes:
+       - refresh header/footer when drag&drop event is fired in GUI builder
+       - searchbar: delete cancel button
+       - don't trigger updatelayout event when keyup event comes
+
 * Mon Oct 15 2012 Youmin Ha <youmin.ha@samsung.com> 0.1.56
 - FIX:
        - Toggleswitch: Change event name from 'changed' to 'change'
diff --git a/src/themes/tizen/common/jquery.mobile.forms.textinput.less b/src/themes/tizen/common/jquery.mobile.forms.textinput.less
index a7f1a88..31c61c2 100755 (executable)
--- a/src/themes/tizen/common/jquery.mobile.forms.textinput.less
+++ b/src/themes/tizen/common/jquery.mobile.forms.textinput.less
@@ -112,7 +112,6 @@ textarea.ui-input-text {
                display : block;\r
                position: relative;\r
 \r
-               margin-right : 150 * @unit_base;\r
                background-color: @color_searchbar_input_field_bg;\r
                .ui-input-text {\r
                        height: 74 * @unit_base;\r
@@ -122,7 +121,6 @@ textarea.ui-input-text {
                }\r
        }\r
        .ui-input-search-default {\r
-               margin-right : 150 * @unit_base;\r
                -webkit-transition: width 400ms linear;\r
                -moz-transition: width 400ms linear;\r
                -o-transition: width 400ms linear;\r
diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less
index 100ce7d..a5da96f 100755 (executable)
--- a/src/themes/tizen/common/jquery.mobile.listview.less
+++ b/src/themes/tizen/common/jquery.mobile.listview.less
@@ -706,7 +706,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 
 .LESSimg-expand-icon(@right:@list-li-padding-horizontal, @size:@list-bigicon-size) {
        .ui-li-expand-icon {
-               background-image: url(images/00_button_expand_closed.png);
+               background-image: url(images/00_list_expand_closed.png);
                background-size: 100%;
                position: absolute;
                top: 50%;
@@ -719,7 +719,7 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 
 .LESSimg-expanded-icon(@right:@list-li-padding-horizontal, @size:@list-bigicon-size) {
        .ui-li-expanded-icon {
-               background-image: url(images/00_button_expand_opened.png);
+               background-image: url(images/00_list_expand_opened.png);
                background-size: 100%;
                position: absolute;
                top: 50%;
diff --git a/src/themes/tizen/tizen-black/images/00_list_expand_closed.png b/src/themes/tizen/tizen-black/images/00_list_expand_closed.png
new file mode 100755 (executable)
index 0000000..a3f639e
Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_list_expand_closed.png differ
diff --git a/src/themes/tizen/tizen-black/images/00_list_expand_opened.png b/src/themes/tizen/tizen-black/images/00_list_expand_opened.png
new file mode 100755 (executable)
index 0000000..377dbc9
Binary files /dev/null and b/src/themes/tizen/tizen-black/images/00_list_expand_opened.png differ
diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less
index 982adee..438c893 100755 (executable)
--- a/src/themes/tizen/tizen-black/style.less
+++ b/src/themes/tizen/tizen-black/style.less
@@ -418,9 +418,9 @@
 @color_bar_footer_btn_bg : transparent;
 
 @color_controlbar_btn_border : rgba(0, 0, 0, 0.1); /* #000000 */
-@color_controlbar_tabbbar_bg : -webkit-linear-gradient(top,  rgb(43,54,71) 0%,rgb(17,24,35) 100%);
-@color_controlbar_toolbbar_bg : -webkit-linear-gradient(top,  rgb(43,54,71) 0%,rgb(17,24,35) 100%);
-@color_controlbar_bg : -webkit-linear-gradient(top,  rgb(43,54,71) 0%,rgb(17,24,35) 100%);
+@color_controlbar_tabbbar_bg : transparent;
+@color_controlbar_toolbbar_bg : transparent;
+@color_controlbar_bg : transparent;
 @color_controlbar_btn_text : rgba(249, 249, 249, 1); /* #F9F9F9 */
 @color_controlbar_btn_press : -webkit-linear-gradient(top,  rgb(60,81,114) 0%,rgb(42,58,85) 100%);
 
diff --git a/src/themes/tizen/tizen-white/images/00_list_expand_closed.png b/src/themes/tizen/tizen-white/images/00_list_expand_closed.png
new file mode 100755 (executable)
index 0000000..a3f639e
Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_list_expand_closed.png differ
diff --git a/src/themes/tizen/tizen-white/images/00_list_expand_opened.png b/src/themes/tizen/tizen-white/images/00_list_expand_opened.png
new file mode 100755 (executable)
index 0000000..377dbc9
Binary files /dev/null and b/src/themes/tizen/tizen-white/images/00_list_expand_opened.png differ
diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less
index f1b79ad..03b53af 100755 (executable)
--- a/src/themes/tizen/tizen-white/style.less
+++ b/src/themes/tizen/tizen-white/style.less
@@ -437,9 +437,10 @@
 @color_bar_footer_btn_bg : transparent;
 
 @color_controlbar_btn_border : rgba(0, 0, 0, 0.1); /* #000000 */
-@color_controlbar_tabbbar_bg : -webkit-linear-gradient(top,  rgb(156,181,179) 0%,rgb(79,116,141) 100%);
-@color_controlbar_toolbbar_bg : -webkit-linear-gradient(top,  rgb(156,181,179) 0%,rgb(79,116,141) 100%);
-@color_controlbar_bg : -webkit-linear-gradient(top,  rgb(156,181,179) 0%,rgb(79,116,141) 100%);
+@color_controlbar_tabbbar_bg : transparent;
+@color_controlbar_toolbbar_bg : transparent;
+@color_controlbar_bg : transparent;
+
 @color_controlbar_btn_text : rgba(249, 249, 249, 1); /* #F9F9F9 */
 @color_controlbar_btn_press : -webkit-linear-gradient(top,  rgb(61,121,150) 0%,rgb(48,91,118) 100%);
 
diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
index b3cc125..dbd7749 100644 (file)
--- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
+++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
@@ -100,7 +100,6 @@
 
                        this._view_offset = this._$view.offset().top - this._$clip.offset().top;
                        this._view_height = this._getViewHeight();
-                       this._clip_height = this._$clip.height();
 
                        this._sx = 0;
                        this._sy = 0;
@@ -147,8 +146,8 @@
                        }
 
                        if ( vt ) {
-                               c = this._clip_height;
-                               v = this._view_height;
+                               c = this._$clip.height();
+                               v = this._getViewHeight();
 
                                vt.start( this._sy, speedY,
                                        duration, (v > c) ? -(v - c) : 0, 0 );
@@ -198,7 +197,7 @@
                                keepGoing = !vt.done();
 
                                if ( vt.getRemained() > this.options.overshootDuration ) {
-                                       scroll_height = this._view_height - this._clip_height;
+                                       scroll_height = this._getViewHeight() - this._$clip.height();
 
                                        if ( vt.isMin() ) {
                                                this._outerScroll( y - vt.getRemained() / 3, scroll_height );
@@ -281,7 +280,7 @@
                        }
 
                        if ( dirLock !== "x" && this._vTracker ) {
-                               scroll_height = this._view_height - this._clip_height;
+                               scroll_height = this._getViewHeight() - $c.height();
 
                                if ( y > 0 ) {
                                        this._sy = 0;
@@ -320,10 +319,10 @@
 
                                if ( sm === "translate" ) {
                                        this._setElementTransform( $sbt, "0px",
-                                               -y / this._view_height * $sbt.parent().height() + "px",
+                                               -y / this._getViewHeight() * $sbt.parent().height() + "px",
                                                duration );
                                } else {
-                                       $sbt.css( "top", -y / this._view_height * 100 + "%" );
+                                       $sbt.css( "top", -y / this._getViewHeight() * 100 + "%" );
                                }
                        }
 
@@ -498,8 +497,8 @@
 
                        if ( this._is_inputbox ) {
                                target.one( "resize.scrollview", function () {
-                                       if ( ey > self._clip_height ) {
-                                               self.scrollTo( -ex, self._sy - ey + self._clip_height,
+                                       if ( ey > $c.height() ) {
+                                               self.scrollTo( -ex, self._sy - ey + $c.height(),
                                                        self.options.snapbackDuration );
                                        }
                                });
@@ -619,7 +618,7 @@
                        }
 
                        if ( dirLock !== "x" && this._vTracker ) {
-                               if ( Math.abs( this._startY - ey ) < mt ) {
+                               if ( Math.abs( this._startY - ey ) < mt && dirLock !== "xy" ) {
                                        return;
                                }
 
@@ -800,28 +799,22 @@
 
                        $v.bind( this._dragEvt, this._dragCB );
 
-                       if ( $c.jqmData("scroll") !== "y" ) {
-                               return;
-                       }
-
                        $c.bind( "updatelayout", function ( e ) {
                                var sy,
                                        vh,
-                                       clip_h = $c.height(),
                                        view_h = self._getViewHeight();
 
-                               if ( !clip_h || !view_h ) {
+                               if ( !$c.height() || !view_h ) {
                                        self.scrollTo( 0, 0, 0 );
                                        return;
                                }
 
-                               sy = clip_h - view_h;
+                               sy = $c.height() - view_h;
                                vh = view_h - self._view_height;
 
                                self._view_height = view_h;
-                               self._clip_height = clip_h;
 
-                               if ( vh == 0 || vh > clip_h / 2 ) {
+                               if ( vh == 0 || vh > $c.height() / 2 ) {
                                        return;
                                }
 
@@ -836,14 +829,13 @@
 
                        $( window ).bind( "resize", function ( e ) {
                                var focused,
-                                       clip_h = $c.height(),
                                        view_h = self._getViewHeight();
 
                                if ( $(".ui-page-active").get(0) !== $c.closest(".ui-page").get(0) ) {
                                        return;
                                }
 
-                               if ( !clip_h || !view_h ) {
+                               if ( !$c.height() || !view_h ) {
                                        return;
                                }
 
@@ -855,29 +847,23 @@
 
                                /* calibration - after triggered throttledresize */
                                setTimeout( function () {
-                                       self._view_height = self._getViewHeight();
-                                       self._clip_height = $c.height();
-
-                                       if ( self._sy < self._clip_height - self._veiw_height ) {
+                                       if ( self._sy < $c.height() - self._getViewHeight() ) {
                                                self.scrollTo( 0, self._sy,
                                                        self.options.snapbackDuration );
                                        }
                                }, 260 );
 
                                self._view_height = view_h;
-                               self._clip_height = clip_h;
                        });
 
                        $c.closest(".ui-page")
                                .one( "pageshow", function ( e ) {
                                        self._view_offset = self._$view.offset().top - self._$clip.offset().top;
+                                       self._view_height = self._getViewHeight();
                                })
                                .bind( "pageshow", function ( e ) {
                                        /* should be called after pagelayout */
                                        setTimeout( function () {
-                                               self._view_height = self._getViewHeight();
-                                               self._clip_height = self._$clip.height();
-
                                                self._set_scrollbar_size();
                                                self._setScrollPosition( self._sx, self._sy );
                                                self._showScrollBars( 2000 );
@@ -966,8 +952,8 @@
                        }
 
                        if ( this._vTracker ) {
-                               ch = this._clip_height;
-                               vh = this._view_height;
+                               ch = $c.height();
+                               vh = this._getViewHeight();
                                this._maxY = ch - vh;
 
                                if ( this._maxY > 0 ) {
@@ -1128,7 +1114,7 @@
                                $( this ).scrolllistview();
                        } else {
                                var st = $( this ).jqmData("scroll"),
-                                       dir = st && ( st.search(/^[xy]/) !== -1 ) ? st.charAt(0) : null,
+                                       dir = st && ( st.search(/^[xy]/) !== -1 ) ? st : null,
                                        opts;
 
                                if ( st === "none" ) {
diff --git a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
index 41c89f1..b64e7ad 100755 (executable)
--- a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
+++ b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
@@ -165,14 +165,6 @@
                                        controlbar_filter.find( "div" ).css( "left", controlbar_filter.find( ".ui-btn-active" ).parent( "li" ).index() * controlbar_filter.width() / element_count );
                                }
 
-                               /* Increase Content size with dummy <div> because of footer height */
-                               if ( controlbar_filter.length != 0 && $( ".ui-page-active" ).find( ".dummy-div" ).length == 0 && $( ".ui-page-active" ).find( ":jqmData(role='footer')" ).find( ":jqmData(role='controlbar')" ).length != 0 ) {
-                                       $( ".ui-page-active" ).find( ":jqmData(role='content')" ).append( '<div class="dummy-div"></div>' );
-                                       $( ".ui-page-active" ).find( ".dummy-div" )
-                                               .css( "width", controlbar_filter.width() )
-                                               .css( "height", controlbar_filter.height() );
-                               }
-
                                if ( controlbar_filter.length ) {
                                        element_width = controlbar_filter.find("li:first").width();
                                        controlbar_filter.find("li:last").width( controlbar_filter.width() - element_width * ( element_count - 1 ) );
diff --git a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
index 9e3bb3c..3fabad9 100755 (executable)
--- a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
+++ b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
@@ -261,14 +261,6 @@
                                $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) */
diff --git a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
index 6b7bcf4..be07869 100755 (executable)
--- a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
+++ b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
@@ -96,18 +96,12 @@
                                focusedEl
                                        .addClass( "ui-input-search-default" )
                                        .removeClass( "ui-input-search-wide" );
-                               cancelbtn
-                                       .addClass( "ui-btn-cancel-show" )
-                                       .removeClass( "ui-btn-cancel-hide" );
                        }
 
                        function hideCancel() {
                                focusedEl
                                        .addClass( "ui-input-search-wide" )
                                        .removeClass( "ui-input-search-default" );
-                               cancelbtn
-                                       .addClass( "ui-btn-cancel-hide" )
-                                       .removeClass( "ui-btn-cancel-show" );
 
                                toggleClear();
                        }
@@ -159,28 +153,6 @@
                        //SLP --start search bar with cancel button
                        focusedEl.wrapAll( "<div class='input-search-bar'></div>" );
 
-                       cancelbtn = $( "<a href='#' class='ui-input-cancel' title='clear text'>Cancel</a>" )
-                               .bind('click', function ( event ) {
-                                       if ( input.attr( "disabled" ) == "disabled" ) {
-                                               return false;
-                                       }
-                                       event.preventDefault();
-                                       event.stopPropagation();
-
-                                       input
-                                               .val( "" )
-                                               .blur()
-                                               .trigger( "change" );
-
-                                       hideCancel();
-                               } )
-                               .appendTo( focusedEl.parent() )
-                               .buttonMarkup( {
-                                       iconpos: "cancel",
-                                       corners: true,
-                                       shadow: true
-                               } );
-
                        searchimage = $("<div class='ui-image-search'></div>").appendTo( focusedEl );
 
                        // Input Focused
@@ -244,14 +216,12 @@
                disable: function () {
                        this.element.attr( "disabled", true );
                        this.element.parent().addClass( "ui-disabled" );
-                       this.element.parent().parent().find(".ui-input-cancel").addClass( "ui-disabled" );
                        $( this.element ).blur();
                },
 
                enable: function () {
                        this.element.attr( "disabled", false );
                        this.element.parent().removeClass( "ui-disabled" );
-                       this.element.parent().parent().find(".ui-input-cancel").removeClass( "ui-disabled" );
                        $( this.element ).focus();
                }
        } );
diff --git a/tools/inline-protos.sh b/tools/inline-protos.sh
index a51b5b8..cf899c6 100755 (executable)
--- a/tools/inline-protos.sh
+++ b/tools/inline-protos.sh
@@ -41,7 +41,7 @@ process_fname() # $1 = file name, n_pass
         }
         else {
           insideTag = 0;
-          printf("\n$(\"<div>");
+          printf("\n$( [ \"<div>");
           while (1 == (getline inputLine < protoFile)) {
             for (Nix1 = 1 ; Nix1 <= length(inputLine) ; Nix1++) {
               theChar = substr(inputLine, Nix1, 1);
@@ -54,9 +54,9 @@ process_fname() # $1 = file name, n_pass
                 theChar = "'"'"'";
               printf("%s", theChar);
             }
-            printf("\" +\n  \"");
+            printf("\" ,\n  \"");
           }
-          printf("</div>\")");
+          printf("</div>\" ].join(\"\"))");
           close(protoFile);
         }
       }
Domain: Web Framework / Uncategorized;