projects / platform / framework / web / web-ui-fw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18caf88)
searchbar : demo page change(change front button and add behaviour)
authorJinhyuk Jun <jinhyuk.jun@samsung.com>
Fri, 4 Jan 2013 11:31:53 +0000 (20:31 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 4 Jan 2013 11:31:53 +0000 (20:31 +0900)
Change-Id: I83b46197b11011228ea516155c512f8ab262a533

demos/tizen-winsets/widgets/searchbar/searchbar.js patch | blob | history
demos/tizen-winsets/widgets/searchbar/searchbar_button.html patch | blob | history
src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js patch | blob | history

diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar.js b/demos/tizen-winsets/widgets/searchbar/searchbar.js
index c799739..ac0ca19 100755 (executable)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar.js
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar.js
@@ -1,20 +1,22 @@
 $( "#searchbar-demo-page" ).bind( "pageshow", function(){\r
-\r
-       \r
        $( "#search1" ).bind( "input change", function(){\r
                var regEx = "";\r
-               \r
+\r
                regEx = ".*" + $( "#search1" ).val();\r
-               \r
+\r
                $("#searchbar-content p").each(function(){\r
                        if ( $( this ).text().search(new RegExp(regEx)) != -1) {\r
                                $( this ).show();\r
                        }\r
                        else {\r
-                               $( this ).hide();                               \r
+                               $( this ).hide();\r
                        }\r
                });\r
        });\r
-       \r
-       /*searchbar-content*/\r
+});\r
+\r
+$( "#searchbar-demo-page-button" ).bind( "pageshow", function(){\r
+       $( ".ui-btn-search-front-icon" ).bind( "vclick", function(){\r
+               window.alert( "front button in searchbar pressed!" );\r
+       });\r
 });
\ No newline at end of file
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html b/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
index 100b791..5d954a7 100755 (executable)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_button.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-button">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
                <form>
-                       <input type="search" data-icon="call" name="search" id="search1" value=""  />
+                       <input type="search" data-icon="call" name="search" id="search2" value=""  />
                </form>
        </div><!-- /header -->
        <div data-role="content" id="searchbar-content">
diff --git a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
index 4384136..6a134c4 100755 (executable)
--- a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
+++ b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
@@ -265,11 +265,13 @@
                        }
 
                        function makeFrontIcon() {
-                               var frontIcon = $( "<div data-role='button' data-style='circle'></div>" );
+                               var IconStyle = $( input ).jqmData( "icon" ),
+                                       frontIcon = $( "<div data-role='button' data-style='circle'></div>" );
+
                                frontIcon
                                        .appendTo( focusedEl.parent() )
                                        .buttonMarkup( {
-                                               icon: "call",
+                                               icon: IconStyle,
                                                corners: true,
                                                shadow: true
                                        } );
Domain: Web Framework / Uncategorized;