projects / platform / framework / web / web-ui-fw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f160668)
Refactor searchbar subpages
authorPrzemyslaw Ciezkowski <p.ciezkowski@samsung.com>
Thu, 14 Mar 2013 14:23:41 +0000 (15:23 +0100)
committerYoumin Ha <youmin.ha@samsung.com>
Fri, 22 Mar 2013 11:21:33 +0000 (20:21 +0900)
Change-Id: I1ce98a422783ab2277be55462a199f1aa05fe663

demos/tizen-winsets/widgets/searchbar/searchbar.html patch | blob | history
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.html b/demos/tizen-winsets/widgets/searchbar/searchbar.html
index 7586586..3692feb 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar.html
@@ -1,4 +1,22 @@
 <!DOCTYPE html>
+<html>
+<head>
+       <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8" >
+       <script src="../../tizen-web-ui-fw/latest/js/jquery.min.js"></script>
+       <script src="../../configure.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js"
+                       data-framework-theme="tizen-white"
+                       data-framework-viewport-width="device-width">
+       </script>
+       <script src="../../main.js"></script>
+       <title>Tizen UI - Searchbar</title>
+       <!-- for compatibility test -->
+       <meta name="apple-mobile-web-app-capable" content="yes" />
+       <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+       <link rel="apple-touch-icon" href="../../icon-tizen.png" />
+</head>
+<body>
 <div data-role="page" data-add-back-btn="true">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar list</h1>
@@ -15,4 +33,5 @@
        <div data-role="footer">
        </div>
 </div><!-- /page -->
-
+</body>
+</html>
\ No newline at end of file
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar.js b/demos/tizen-winsets/widgets/searchbar/searchbar.js
index 39256e9..67d5280 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar.js
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar.js
@@ -1,41 +1,27 @@
-( 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();
-                               }
-                       });
-
-                       $( content ).scrollview("scrollTo", 0, 0, 0);
+$( document ).one( "pageshow", ":jqmData(role='page')", function ( ev ) {
+       var page = ev.target;
+
+       $( "#" + page.id + "-search" ).on( "input change", function ( ev ) {
+               var regEx,
+                       sbar = ev.target,
+                       content = $( page ).children(":jqmData(role='content')")[0];
+
+               regEx = new RegExp(".*" + $( sbar ).val().toLowerCase());
+
+               $( content ).find( "p" ).each( function () {
+                       if ( $( this ).text().toLowerCase().match(regEx) ) {
+                               $( this ).show();
+                       } else {
+                               $( this ).hide();
+                       }
                });
-       });
-}
 
-setSearchbar("searchbar-demo-page-normal");
-setSearchbar("searchbar-demo-page-cancel");
-setSearchbar("searchbar-demo-page-button");
+               $( content ).scrollview( "scrollTo", 0, 0, 0 );
+       });
 
-$( "#searchbar-demo-page-button" ).bind( "pageshow", function(){
-       $( ".ui-btn-search-front-icon" ).bind( "vclick", function(){
+       $( ".ui-btn-search-front-icon" ).on( "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 f5cd356..ac1480e 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_button.html
@@ -1,4 +1,21 @@
-<!DOCTYPE html>
+<html>
+<head>
+       <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8" >
+       <script src="../../tizen-web-ui-fw/latest/js/jquery.min.js"></script>
+       <script src="../../configure.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js"
+                       data-framework-theme="tizen-white"
+                       data-framework-viewport-width="device-width">
+       </script>
+       <script src="../../main.js"></script>
+       <title>Tizen UI - Searchbar</title>
+       <!-- for compatibility test -->
+       <meta name="apple-mobile-web-app-capable" content="yes" />
+       <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+       <link rel="apple-touch-icon" href="../../icon-tizen.png" />
+</head>
+<body>
 <div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-button">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
@@ -40,4 +57,5 @@
        </div>
        <script src="searchbar.js"></script>
 </div><!-- /page -->
-
+</body>
+</html>
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
index ef6e345..dd03b06 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_cancel.html
@@ -1,4 +1,21 @@
-<!DOCTYPE html>
+<html>
+<head>
+       <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8" >
+       <script src="../../tizen-web-ui-fw/latest/js/jquery.min.js"></script>
+       <script src="../../configure.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js"
+                       data-framework-theme="tizen-white"
+                       data-framework-viewport-width="device-width">
+       </script>
+       <script src="../../main.js"></script>
+       <title>Tizen UI - Searchbar</title>
+       <!-- for compatibility test -->
+       <meta name="apple-mobile-web-app-capable" content="yes" />
+       <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+       <link rel="apple-touch-icon" href="../../icon-tizen.png" />
+</head>
+<body>
 <div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-cancel">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
@@ -41,4 +58,5 @@
        </div>
        <script src="searchbar.js"></script>
 </div><!-- /page -->
-
+</body>
+</html>
diff --git a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
index 9d14c64..5791b58 100644 (file)
--- a/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
+++ b/demos/tizen-winsets/widgets/searchbar/searchbar_normal.html
@@ -1,4 +1,21 @@
-<!DOCTYPE html>
+<html>
+<head>
+       <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8" >
+       <script src="../../tizen-web-ui-fw/latest/js/jquery.min.js"></script>
+       <script src="../../configure.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
+       <script src="../../tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js"
+                       data-framework-theme="tizen-white"
+                       data-framework-viewport-width="device-width">
+       </script>
+       <script src="../../main.js"></script>
+       <title>Tizen UI - Searchbar</title>
+       <!-- for compatibility test -->
+       <meta name="apple-mobile-web-app-capable" content="yes" />
+       <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+       <link rel="apple-touch-icon" href="../../icon-tizen.png" />
+</head>
+<body>
 <div data-role="page" data-add-back-btn="true" id="searchbar-demo-page-normal">
        <div data-role="header" data-position ="fixed" >
                <h1>Searchbar</h1>
@@ -40,4 +57,5 @@
        </div>
        <script src="searchbar.js"></script>
 </div><!-- /page -->
-
+</body>
+</html>
\ No newline at end of file
Domain: Web Framework / Uncategorized;