index_for 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925b8036067c5c22249a884e6159c2c9921c1c2d
-  data.tar.gz: 3e65dec6318633705463a0b9a5de2029d29d8195
+  metadata.gz: 181813155c5638c7fd110640f99c9d36bb75de90
+  data.tar.gz: 75092c0750b6d76c5738209bac2afced08432e46
 SHA512:
-  metadata.gz: 82fd862e2f45217f5fffc8dc086d9966c026f1229c49ac00b8f0a8cd62669c4e3461c36c5393388a53b855f494d113232b1be37b173320085b64d165089b4af2
-  data.tar.gz: 978fc9786afe8f83da7567686fd2896756a6101d2b494902328f6a84a8d2e14d1797a86566ad51663cc95df112effe4d4335f23a2832439572cebe291851e226
+  metadata.gz: f880f014e3db919294bb2b5b6112f6fe4f14348e75a96948512d38c1de146180e240048b9522ff251e6bcaa0c13c29fb17e1d10ae79a6e5748ae2ab6cc0e789a
+  data.tar.gz: 0a7a161772673a5647ef3d3317262a148f3b112ca654f77b185eb4df1ebf34ce052f5ce439174c56a66097ab18facceeda6b0f4ba5c3b68ab505da8e2db48525

data/lib/generators/index_for/templates/_wice_index_for.html.erb

@@ -12,7 +12,7 @@
 
     <div class="col-sm-6 text-right index_for_filter">
       Search:
-      <input type="search" class="form-control input" placeholder="<%= params[:search] %>" data-href="<%= url_for(params.merge(search: nil)) %>">
+      <input type="search" class="form-control input" placeholder="<%= params[:search] %>" data-href="<%= url_for(params.merge(search: nil, page: 1)) %>">
     </div>
   </div>
 
@@ -32,34 +32,32 @@
 </div>
 
 <script type="text/javascript">
-  $(document).on("ready page:load page:restore", function() {
-    $(".wice_index_for").each(function() {
-      var $this = $(this);
-      if ($this.data("wice-index-for")) return;
-      $this.data("wice-index-for", true);
-      $this.find(".index_for_length select").change(function(event) {
-        var location = $(event.target).find("option:selected").data("href");
-        if (location) window.location = location;
-      });
+  $(".wice_index_for").each(function() {
+    var $this = $(this);
+    if ($this.data("wice-index-for")) return;
+    $this.data("wice-index-for", true);
+    $this.find(".index_for_length select").change(function(event) {
+      var location = $(event.target).find("option:selected").data("href");
+      if (location) window.location = location;
+    });
 
-      $this.find(".index_for thead th").click(function(event) {
-        var location = $(event.target).data("href");
-        if (location) window.location = location;
-      });
+    $this.find(".index_for thead th").click(function(event) {
+      var location = $(event.target).data("href");
+      if (location) window.location = location;
+    });
 
-      $this.find(".index_for_filter input").keypress(function(event) {
-        if (event.which === 13 || event.keyCode === 13) {
-          var location = $(event.target).data("href"),
-              search = $(event.target).val();
-          if (location) {
-            if (location.indexOf("?") >= 0) {
-              window.location = location + "&search=" + search;
-            } else {
-              window.location = location + "?search=" + search;
-            }
+    $this.find(".index_for_filter input").keypress(function(event) {
+      if (event.which === 13 || event.keyCode === 13) {
+        var location = $(event.target).data("href"),
+            search = $(event.target).val();
+        if (location) {
+          if (location.indexOf("?") >= 0) {
+            window.location = location + "&search=" + search;
+          } else {
+            window.location = location + "?search=" + search;
           }
         }
-      })
+      }
     })
   });
 </script>

data/lib/generators/index_for/templates/_wice_index_for.html.haml

@@ -4,12 +4,15 @@
       Show
       %select.form-control.input
         - builder.per_pages do |per_page, url, active|
-          %option{ "data-href" => url, "selected" => active }
-          = per_page
+          %option{"data-href" => ""}
+          = url
+          " #{selected if active}>#{per_page}
     entries
   .col-sm-6.text-right.index_for_filter
     Search:
-    %input.form-control.input{ "type" => "search", "placeholder" => params[:search], "data-href" => url_for(params.merge(search: nil)) }
+    %input.form-control.input{:placeholder => "", :type => "search"}/
+    = params[:search]
+    " data-href="#{url_for(params.merge(search: nil, page: 1))}">
 .row
   .col-sm-12
     - html_options[:head_builder] ||= IndexFor::WiceHeadColumnBuilder
@@ -18,3 +21,33 @@
   .col-sm-5.index_for_info= page_entries_info objects
   .col-sm-7.text-right.index_for_pagination
     = paginate objects, window: 2
+
+:javascript
+  $(".wice_index_for").each(function() {
+    var $this = $(this);
+    if ($this.data("wice-index-for")) return;
+    $this.data("wice-index-for", true);
+    $this.find(".index_for_length select").change(function(event) {
+      var location = $(event.target).find("option:selected").data("href");
+      if (location) window.location = location;
+    });
+
+    $this.find(".index_for thead th").click(function(event) {
+      var location = $(event.target).data("href");
+      if (location) window.location = location;
+    });
+
+    $this.find(".index_for_filter input").keypress(function(event) {
+      if (event.which === 13 || event.keyCode === 13) {
+        var location = $(event.target).data("href"),
+            search = $(event.target).val();
+        if (location) {
+          if (location.indexOf("?") >= 0) {
+            window.location = location + "&search=" + search;
+          } else {
+            window.location = location + "?search=" + search;
+          }
+        }
+      }
+    })
+  });

data/lib/generators/index_for/templates/_wice_index_for.html.slim

@@ -4,12 +4,15 @@
       | Show
       select.form-control.input
         - builder.per_pages do |per_page, url, active|
-          option  data-href=url selected=(active ) 
-          = per_page
+          option data-href=""
+          = url
+          | " #{selected if active}>#{per_page}
     | entries
   .col-sm-6.text-right.index_for_filter
     | Search:
-    input.form-control.input  type="search" placeholder=params[:search] data-href=(url_for(params.merge(search: nil)) ) 
+    input.form-control.input placeholder="" type="search" /
+    = params[:search]
+    | " data-href="#{url_for(params.merge(search: nil, page: 1))}">
 .row
   .col-sm-12
     - html_options[:head_builder] ||= IndexFor::WiceHeadColumnBuilder
@@ -18,3 +21,33 @@
   .col-sm-5.index_for_info= page_entries_info objects
   .col-sm-7.text-right.index_for_pagination
     = paginate objects, window: 2
+
+javascript:
+  $(".wice_index_for").each(function() {
+    var $this = $(this);
+    if ($this.data("wice-index-for")) return;
+    $this.data("wice-index-for", true);
+    $this.find(".index_for_length select").change(function(event) {
+      var location = $(event.target).find("option:selected").data("href");
+      if (location) window.location = location;
+    });
+
+    $this.find(".index_for thead th").click(function(event) {
+      var location = $(event.target).data("href");
+      if (location) window.location = location;
+    });
+
+    $this.find(".index_for_filter input").keypress(function(event) {
+      if (event.which === 13 || event.keyCode === 13) {
+        var location = $(event.target).data("href"),
+            search = $(event.target).val();
+        if (location) {
+          if (location.indexOf("?") >= 0) {
+            window.location = location + "&search=" + search;
+          } else {
+            window.location = location + "?search=" + search;
+          }
+        }
+      }
+    })
+  });

data/lib/index_for/version.rb

@@ -1,3 +1,3 @@
 module IndexFor
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: index_for
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Theo