projects / platform / framework / web / web-ui-fw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5088fdd)
demo: fix searchbar demo to use different IDs
authorYoumin Ha <youmin.ha@samsung.com>
Sat, 26 Jan 2013 04:28:14 +0000 (13:28 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Sat, 26 Jan 2013 09:31:59 +0000 (18:31 +0900)
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 patch | blob | history
demos/tizen-winsets/widgets/searchbar/searchbar_button.html patch | blob | history
demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html patch | blob | history
demos/tizen-winsets/widgets/searchbar/searchbar_normal.html patch | blob | history

diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar.js b/demos/tizen-winsets/widgets/searchbar/searchbar.js
index 59481cc..39256e9 100644 (file)
--- 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 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
@@ -2,7 +2,7 @@
 <div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-button">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
-               <input type="search" data-icon="call" name="search" id="search2" value=""  />
+               <input type="search" data-icon="call" name="search" id="searchbar-demo-page-button-search" value=""  />
        </div><!-- /header -->
        <div data-role="content" id="searchbar-content">
                <p>Hairston</p>
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
index d2c6fe9..ef6e345 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<div data-role="page" data-add-back-btn="true" id="searchbar-demo-page">
+<div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-cancel">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
 
-               <input type="search" data-cancel-btn=true name="search" id="search1" value=""  />
+               <input type="search" data-cancel-btn=true name="search" id="searchbar-demo-page-cancel-search" value=""  />
        </div><!-- /header -->
        <div data-role="content" id="searchbar-content">
                <p>Hairston</p>
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
index 0fca1fe..9d14c64 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
-<div data-role="page" data-add-back-btn="true" id="searchbar-demo-page">
+<div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-normal">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
-               <input type="search" name="search" id="search1" value=""  />
+               <input type="search" name="search" id="searchbar-demo-page-normal-search" value=""  />
        </div><!-- /header -->
        <div data-role="content" id="searchbar-content">
                <p>Hairston</p>
Domain: Web Framework / Uncategorized;