From cbd48a59faae9c25573285be0fcf68b1961c2459 Mon Sep 17 00:00:00 2001 From: Youmin Ha Date: Sat, 26 Jan 2013 13:28:14 +0900 Subject: [PATCH] demo: fix searchbar demo to use different IDs The searchbar demos have same IDs for different elements, and the searchbar-button sample does not work. Fixed the bug to work properly. Change-Id: I46f7ac80f1ab2fea10a07bcffe169322b0bdc001 --- demos/tizen-winsets/widgets/searchbar/searchbar.js | 49 +++++++++++++++------- .../widgets/searchbar/searchbar_button.html | 2 +- .../widgets/searchbar/searchbar_cancel.html | 4 +- .../widgets/searchbar/searchbar_normal.html | 4 +- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar.js b/demos/tizen-winsets/widgets/searchbar/searchbar.js index 59481cc..39256e9 100644 --- a/demos/tizen-winsets/widgets/searchbar/searchbar.js +++ b/demos/tizen-winsets/widgets/searchbar/searchbar.js @@ -1,24 +1,41 @@ -$( "#searchbar-demo-page" ).bind( "pageshow", function(){ - $( "#search1" ).bind( "input change", function(){ - var regEx = ""; - - regEx = ".*" + $( "#search1" ).val(); - - $("#searchbar-content p").each(function(){ - if ( $( this ).text().search(new RegExp(regEx)) != -1) { - $( this ).show(); - } - else { - $( this ).hide(); - } - }); +( function ( ) { + +function setSearchbar( pageID ) { + + $( "#" + pageID ).bind( "pageshow", function( ev ){ + var page = ev.target; + + $( "#" + pageID + "-search" ).bind( "input change", function( ev ){ + var regEx, + sbar = ev.target, + content = $( page ).children(":jqmData(role='content')")[0]; + + regEx = ".*" + $( sbar ).val(); + + $( content ).find( "p" ).each( function( ){ + if ( $( this ).text().search(new RegExp(regEx)) != -1) { + $( this ).show(); + } + else { + $( this ).hide(); + } + }); - $("#searchbar-content").scrollview("scrollTo", 0, 0, 0); + $( content ).scrollview("scrollTo", 0, 0, 0); + }); }); -}); +} + +setSearchbar("searchbar-demo-page-normal"); +setSearchbar("searchbar-demo-page-cancel"); +setSearchbar("searchbar-demo-page-button"); $( "#searchbar-demo-page-button" ).bind( "pageshow", function(){ $( ".ui-btn-search-front-icon" ).bind( "vclick", function(){ window.alert( "front button in searchbar pressed!" ); }); }); + +} ( ) ); + + diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html b/demos/tizen-winsets/widgets/searchbar/searchbar_button.html index e9ef63c..f5cd356 100644 --- a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html +++ b/demos/tizen-winsets/widgets/searchbar/searchbar_button.html @@ -2,7 +2,7 @@

Searchbar

- +

Hairston

diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html index d2c6fe9..ef6e345 100644 --- a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html +++ b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html @@ -1,9 +1,9 @@ -
+

Searchbar

- +

Hairston

diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html index 0fca1fe..9d14c64 100644 --- a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html +++ b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html @@ -1,8 +1,8 @@ -
+

Searchbar

- +

Hairston

-- 2.7.4