refactor searchbar gadget (not done)

74f366a7 · Sven Franck · a2a5ea79 · 74f366a7 · 74f366a7 · 74f366a7
Commit 74f366a7 authored Jul 24, 2013 by Sven Franck
Showing with 36 additions and 12 deletions

modules/search/search.html modules/search/search.html +12 -1

modules/searchbar/searchbar.html modules/searchbar/searchbar.html +0 -1

modules/searchbar/searchbar.js modules/searchbar/searchbar.js +24 -10

No files found.
--- a/modules/search/search.html
+++ b/modules/search/search.html
@@ -50,7 +50,18 @@
      <div id="searchbar"
        data-gadget="modules/searchbar/searchbar.html"
        data-gadget-module="searchbar"
-        class="searchbar_wrap search_element">
+        class="searchbar_wrap search_element"
+        data-gadget-property='{
+          "state": [
+              {
+                "searchbar": {
+                  "_elements": [
+                    ["searchbar_filter", "attr", "data-selector", "items_listview"]
+                  ]
+                }
+              }
+            ]
+          }'>
      </div>

      <!-- sorting -->

--- a/modules/searchbar/searchbar.html
+++ b/modules/searchbar/searchbar.html
@@ -7,7 +7,6 @@
  <body>
    <div data-filter="true"
      class="searchbar_filter"
-      data-selector="items_listview"
      data-filter-placeholder="Search">
    </div>
  </body>

--- a/modules/searchbar/searchbar.js
+++ b/modules/searchbar/searchbar.js
@@ -9,7 +9,17 @@ define([
    response.data = source;
    response.callback = function (self) {
      var filter = self.dom.find(".searchbar_filter"),
-        value;
+        value, runSearch;
+
+      runSearch = function (value) {
+        // only go to search.html, if we are currently not on it, else only trigger hashchange
+        $.mobile.changePage( "search.html", {
+          "transition": "slide",
+          "data": {
+            "search": value
+          }
+        });
+      };

      filter.on("filterbarbeforefilter", function (e, data) {
        value = data.input.value;
@@ -35,17 +45,21 @@ define([
      })
      .on( "filterbarcreate", function( e, ui ) {
        var uuid = $(e.target).data("mobileFilterbar").uuid,
-          target = $("#ui-filter-"+uuid).find(".ui-input-action");
+          target = $("#ui-filter-"+uuid),
+          action = target.find(".ui-input-action"),
+          input = target.find("input");

-        target.on("click", function(e) {
-          value = $("#ui-filter-"+uuid).find("input").val();
+        // TODO: search should be run here and results should be passed to
+        // items or ?. Otherwise items has to listen for ... something, grab
+        // data from somewhere and query. This makes more sense here.
+        action.on("click", function(e) {
+          runSearch(input.val());
+        });

-          $.mobile.changePage( "search.html", {
-            "transition": "slide",
-            "data": {
-              "search": value
-            }
-          });
+        input.on("keypress", function (e) {
+          if (e.which == 13) {
+            runSearch(input.val());
+          }
        });
      });