From 119dc2d377281f2aeb30b32c263a1eafd5c5c472 Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Wed, 24 Oct 2012 14:30:04 +0900 Subject: [PATCH] Export 0.1.57 --- build-tools/bin/lessc | 2 +- build-tools/lib/less/index.js | 2 +- demos/tizen-winsets/index.html | 1 + demos/tizen-winsets/widgets/scrollview_xy.html | 93 +++++++++++++++++++++ ...w-don-t-trigger-updatelayout-when-keyup-e.patch | 29 +++++++ ...JQM-update-setheaderfooter-in-GUI-builder.patch | 29 +++++++ packaging/web-ui-fw.spec | 13 ++- .../common/jquery.mobile.forms.textinput.less | 2 - .../tizen/common/jquery.mobile.listview.less | 4 +- .../tizen-black/images/00_list_expand_closed.png | Bin 0 -> 3060 bytes .../tizen-black/images/00_list_expand_opened.png | Bin 0 -> 3040 bytes src/themes/tizen/tizen-black/style.less | 6 +- .../tizen-white/images/00_list_expand_closed.png | Bin 0 -> 3060 bytes .../tizen-white/images/00_list_expand_opened.png | Bin 0 -> 3040 bytes src/themes/tizen/tizen-white/style.less | 7 +- .../common/js/jquery.mobile.tizen.scrollview.js | 50 ++++------- .../js/jquery.mobile.tizen.controlbar.js | 8 -- .../js/jquery.mobile.tizen.pagelayout.js | 8 -- .../searchbar/js/jquery.mobile.tizen.searchbar.js | 30 ------- tools/inline-protos.sh | 6 +- 20 files changed, 196 insertions(+), 94 deletions(-) create mode 100644 demos/tizen-winsets/widgets/scrollview_xy.html create mode 100644 libs/patch/0022-JQM-listview-don-t-trigger-updatelayout-when-keyup-e.patch create mode 100644 libs/patch/0022-JQM-update-setheaderfooter-in-GUI-builder.patch create mode 100755 src/themes/tizen/tizen-black/images/00_list_expand_closed.png create mode 100755 src/themes/tizen/tizen-black/images/00_list_expand_opened.png create mode 100755 src/themes/tizen/tizen-white/images/00_list_expand_closed.png create mode 100755 src/themes/tizen/tizen-white/images/00_list_expand_opened.png diff --git a/build-tools/bin/lessc b/build-tools/bin/lessc index 32f993f..7e0f915 100755 --- 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 --- 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 --- a/demos/tizen-winsets/index.html +++ b/demos/tizen-winsets/index.html @@ -73,6 +73,7 @@
  • Scrollview
  • Horizontal Scroll
  • Vertical Scroll
    • +
  • XY Scroll
  • Handler
  • Scroll Jump
    • diff --git a/demos/tizen-winsets/widgets/scrollview_xy.html b/demos/tizen-winsets/widgets/scrollview_xy.html new file mode 100644 index 0000000..853b70e --- /dev/null +++ b/demos/tizen-winsets/widgets/scrollview_xy.html @@ -0,0 +1,93 @@ + +
    +
    +

    Scrollview

    +
    +
    +

    XY Scroll

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    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 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 +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 +--- + .../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 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 +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 --- 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 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 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 --- 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; position: relative; - margin-right : 150 * @unit_base; background-color: @color_searchbar_input_field_bg; .ui-input-text { height: 74 * @unit_base; @@ -122,7 +121,6 @@ textarea.ui-input-text { } } .ui-input-search-default { - margin-right : 150 * @unit_base; -webkit-transition: width 400ms linear; -moz-transition: width 400ms linear; -o-transition: width 400ms linear; diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less index 100ce7d..a5da96f 100755 --- 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 index 0000000000000000000000000000000000000000..a3f639ec983c729698cd183b90239606443bbcf0 GIT binary patch literal 3060 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 literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..377dbc9803adedb91521cf28a12d26404b73a74d GIT binary patch literal 3040 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 literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..377dbc9803adedb91521cf28a12d26404b73a74d GIT binary patch literal 3040 zcmZuzX*d-A6aR|bS8hqUudr^p*>#^`wJYSdBv&a{wC?jq?yD8beI&A4N4Y{|g`Dfi z9im^3Ryp>s=l}LM&olFx`MjC=%)FVzo8|@#w3lfC01QTkx>o0?{nx1}&ttV$z`{Au z_#4_j0DzA5uakj-XIuc#T6n==H*b3S1^PYk^z-L4g2DLw@B4Xp-E#*Zcot)gf?IEL zXb=|;pe70EEE7K~c4|H=Xfm2DT||PPhS@lQzhs8pvg?wb9tF=paRPa2DmsPTQj$K2 zcA9FHzce-aMMBcx@lx0e@5y%J`tVuvl;%e5KBj4es*{>N$57r<5lvqOy?W_ubboK( z(yFv}B(0D?V5V+z<9~1}NCu7~)YY#GbW*(oWWnQf)S%O>uv6wrJc(%wnr}~rjv?y| zOuu15jb;Pdp{dYvpsi1a#^i}ugJKHcH00{C0&YqHC($SC;{c60$`2z0c3J%FWX0)# zkJUXv7kH|H+L2pHdH^W{*gQ;nRlu|qkTF7d7=nft(1~ZJYXsEvK*lm5Rvb`-0jB{$ z!C(-R57_kg5b8g#*E4TOoNp?>Q5`3wq8DjLEfqk8KuBK|!y9p4XH#;%;9Q_B-5rw8 zEf=Z4^mYFe0LAI-=W6#)gYk^@c)U_7meEma>pdk&z{O?dY;B~*|NL-Eff1u;l8~m$ zXf;Z-&snMPE`{eEy5fh#WRFHB?PgHCIg8l$|GOK#lBc+tnYGo`Y2#j~o%0|f{0!CY z*oip3_d7!Ugn0P%-Lg=moI|7m#nIR9PY0%DS4J{uVqE6d(+o~p=tw8L;{v@#E;ytF z+lnPiK&oy*%D!BgKq53l{Dbfq$!&R2@|aw6Q4uuU)g%i`m#TDdCI4k2%8U%`TqXjr z*XGytMU0vp?HRo^5=8o;b!t#74A34%836#?(G`-04>oD_Qv;w|94XPD!*kHZCD}=N zrR(Bc7u|`IQVdk6w;Rd~rFBDJx$h)i8wC}M8*bp0aDsf%=2hsl^o+~&XO!-?dCREb z&-BNcx~NO6J(7k(XMmd3nSVBc%q0mam`cr=AA7{#Wk|u2EX4OQfz49DBwf)^)+!0k zXJg2_r*Z#+O1!;(Yr5J1kc&ErYd4V1ifpvh_(IG0KwsaGq{(z0dM!{(U(?WBOyhR)U+7RfP(MmjyFF&boOw zQmJG~@?9T@UB#^Stje$Qtn%;K(PCV*1703kFN;|X-Zkc4V_s8Oqjb-c)3JF`U^QP^ z0>7k~b{kq(g0*^O8DGh&@UTE-IGV%Aq^zzqd;GE|rzg?t)wjUbOY_-R&2v8^#)dWx zzU6)+KM0~{h+~iLPe6%r7jjW?p}2#%UgepVbB`x;_rqnBWw-M-@|p7eY>*OIiO1~e zgS6Sk*&^9I5)gP*b$RtdHJ#1A%@91T>W+1Iy}pgS^-2}Zmz)}#YRt`TYaVMO9P29ss#a@xu!!wT`Nwnpi z^0p;wR9BU#z~qhP5lvS6Ssq$cD|rD&&jQV9HpD7&_al-P*nWsFi}RE#nBrvJ?Y*mW za&wS1hBcNo2HPD<^*a@q@(#T=+v7+^oql6cdr<>a8vY_?!+OSgzJj)b!%RczJ)TSbgJOW6 zIxnQ3@Y53J(4!42bIx|oU5ZJ^jjF$x(EmrDDaEVLenn`-r_ZPFg$Shxzle$1mf3EB zl^L#Fyj;yx&9r~`({SnVWWHjdhU}EwM&U-`RN-Qa)9v8flGsY@TX&Y)<&X$3eA&VZrBFET8*b_mL8!41D3M$aTWGM2) zNS#Q#3&%&HkNMxHYN-<3e>KkR=%f_mbl7#$qUxg7y6X5n2fjb8<0o$9;nVS6jIlQ( zzD<6na$a{%?unomjg5~*#A&7aCm=76%H}Etjn2UyEb9Kz&Cy*bM9EsHypl3jl+dh} zzNCDVW|36Q(KbymzmfH?4zolhM~d(sYmjg%ZAdq7H%b69sx+D~4YQZHYQASEVHTS4 zJ-uBqMCgNjndBNSMzrc_yD5X|e4%O)N5LaLA2|)x4%z68^rr#PYJRg!ENTn2?(t}- z);+fI?1OJ|3*>4x)kp89r?nStrD(Cx@^A3lVp9@SjVO17$NS;LL6w}EqU*yupPB{< zPnDnjcuv}3>1J8Vz?Q|CAf$Ma>m9XsRT|X;LI|`g>=&=c-J+~jf18Ar@R_iv*+Jyi zM|6mUnt4aw=^BjcY9{mErn8}4iw)nNo7!=(KtgO6o1Oo}VR$sz6O-!M2%Nd>Po~A@ zg4cNB{RZFX&t<)-s_DhKjd+ZCY_2az71=T7ROhbeGWs&i%)Vh*y!B@1@RuF|k~=I$ zXp6?ea4+7gzioG~_=q1?(}KT*AHe^>m3GJGo1LeQd`EYA!rFf+e4ilLwG&S@KfWW_ zklC0`cucq-8yz=K&|f!Xb(2W5NW99RI{PRktagcN{MsX46ffj1v|z75ztFni z*v`eS)#8)p=;YQy=!pU08q+fcb=wf*efUSO+0Cf&Ow`^;3MLy99wGgE&WTWp4cl>1#YRIWsY0)w>@hssK?oR z<90(kn!`MZn>^VVLB;!{a|T4p*yxe7^ushJ*u}K`w4peLxb31Fnkp*G zTK7*kPby#|ZX+T^oM)wHL-m{-kcgv+?J4|d-e^hgUT)@lpT}jVTbbKi1){fMJ9{Y$9zx3NS?o6A6kE|IL_qG%p_5e=k1@k%1aT>|4lwu zLn|`?LWKc9M+5MibdH+YkS7^frQQmYQaKg-w2Q6S4|Ow5LL-;p}TpB-;dN_{JQv1V0{{myyE z|2Dk|-+G=FA0EP%&_qUS-g>#0QZxCpm+{w*$5PQ@bi0$#28!Hd4Z|FdEhe-)5O 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 --- 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
    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( '
    ' ); - $( ".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 --- 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
    because of footer height */ - if ( $elFooter.length != 0 && $( event.target ).find( ".dummy-div" ).length == 0 ) { - $( event.target ).find( ":jqmData(role='content')" ).append( '
    ' ); - $( ".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 --- 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( "
    " ); - cancelbtn = $( "Cancel" ) - .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 = $("
    ").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 --- 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$(\"
    "); + printf("\n$( [ \"
    "); 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("
    \")"); + printf("
    \" ].join(\"\"))"); close(protoFile); } } -- 2.7.4