smart_listing 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed162afb1635a06affeb6c2bb0f3bc0d539b7cad
-  data.tar.gz: 9cae821c8260b22a3782daf452008b1da9822e54
+  metadata.gz: 34f2ebadeaeafd444b806b6392bd706ebd298d24
+  data.tar.gz: dd9ebe392e5a3976e2c69183d32cb90c6cf67e2d
 SHA512:
-  metadata.gz: 1ee4da5ad5023f269936c615dd547c2710c13925ab6e892fc28dad1bb86c2d2e54aacabe4ce8b241b7c9c2847fe1353539f06a2def7c381cdd5355684d4c556d
-  data.tar.gz: 56fb50e405e8afdee3f471f1e565dd3e764197a183c8113b02321c7edf5756ed40c3bdcca01e5978209a49d1b42d75760812c730f76c183f167de5d99669db25
+  metadata.gz: 6cc5d0d352c80b62fcd0526ce62385a2c58e0eda3563131d56748d2a8cc235e0144c078f8b9e5aa01cc5ea2b14b4c930489b2986de40e7f51e04a7d008542646
+  data.tar.gz: 239bdd2c28d6f113c864ef5054135a5a7b65fcf83e2dc482da3a162eb610e34a4e2a73c6c1a2064a403eb0868bec9c1411d648bf8ebf61b6e7da0d9c482573c2

data/app/assets/javascripts/smart_listing/smart_listing.coffee

@@ -54,6 +54,7 @@ class SmartListing
           $(confirmation_elem).click()
           $(confirmation_elem).popover('destroy')
         )
+        .append(" ")
         .append($('<button/>').html('No').addClass('btn btn-small').click (event) =>
           editable = $(event.currentTarget).closest('.editable')
           $(confirmation_elem).popover('destroy')
@@ -86,8 +87,8 @@ class SmartListing
         @cancelEdit(editable)
       else
         # Cancel new record
-        @container.find('.new_item_placeholder').addClass('disabled')
-        @container.find('.new_item_action').removeClass('disabled')
+        @container.find('.new_item_placeholder').addClass('hidden')
+        @container.find('.new_item_action').removeClass('hidden')
       false
 
     @container.on 'click', '.actions a[data-confirmation]', (event) =>
@@ -95,7 +96,7 @@ class SmartListing
       if(@confirmed != event.currentTarget)
         # We need confirmation
         @container.find('.actions a').popover('destroy')
-        $(event.currentTarget).popover(content: createPopover(event.currentTarget, $(event.currentTarget).data('confirmation')), html: true, trigger: 'manual')
+        $(event.currentTarget).popover(content: createPopover(event.currentTarget, $(event.currentTarget).data('confirmation')), html: true, trigger: 'manual', title: null)
         $(event.currentTarget).popover('show')
         false
       else
@@ -106,6 +107,17 @@ class SmartListing
     @container.on 'click', 'input[type=text].autoselect', (event) ->
       $(this).select()
 
+    @container.on 'change', '.callback', (event) =>
+      checkbox = $(event.currentTarget)
+      id = checkbox.closest("tr").data("id")
+      data = {}
+      data[checkbox.val()] = checkbox.is(":checked")
+      $.ajax({
+        url: @container.data("callback-href"),
+        type: "POST",
+        data: data,
+      })
+
   fadeLoading: =>
     @content.stop(true).fadeTo(500, 0.2)
     @loading.show()
@@ -152,11 +164,11 @@ class SmartListing
     if @maxCount()
       if @itemCount() >= @maxCount()
         if @itemCount()
-          @container.find('.new_item_action').addClass('disabled')
-        @container.find('.new_item_action .btn').addClass('disabled')
+          @container.find('.new_item_action').addClass('hidden')
+        @container.find('.new_item_action .btn').addClass('hidden')
       else
-        @container.find('.new_item_action').removeClass('disabled')
-        @container.find('.new_item_action .btn').removeClass('disabled')
+        @container.find('.new_item_action').removeClass('hidden')
+        @container.find('.new_item_action .btn').removeClass('hidden')
 
     @status.each (index, status) =>
       $(status).find('.smart_listing_limit').html(@maxCount() - @itemCount())
@@ -177,13 +189,13 @@ class SmartListing
 
   new_item: (content) =>
     new_item_action = @container.find('.new_item_action')
-    new_item_placeholder = @container.find('.new_item_placeholder').addClass('disabled')
+    new_item_placeholder = @container.find('.new_item_placeholder').addClass('hidden')
 
     @container.find('.editable').each (i, v) =>
       @cancelEdit($(v))
 
-    new_item_action.addClass('disabled')
-    new_item_placeholder.removeClass('disabled')
+    new_item_action.addClass('hidden')
+    new_item_placeholder.removeClass('hidden')
     new_item_placeholder.html(content)
     new_item_placeholder.addClass('info')
 
@@ -194,8 +206,8 @@ class SmartListing
     new_item_placeholder = @container.find('.new_item_placeholder')
 
     if success
-      new_item_placeholder.addClass('disabled')
-      new_item_action.removeClass('disabled')
+      new_item_placeholder.addClass('hidden')
+      new_item_action.removeClass('hidden')
 
       new_item = $('<tr />').addClass('editable')
       new_item.attr('data-id', id)
@@ -212,8 +224,8 @@ class SmartListing
   edit: (id, content) =>
     @container.find('.editable').each (i, v) =>
       @cancelEdit($(v))
-    @container.find('.new_item_placeholder').addClass('disabled')
-    @container.find('.new_item_action').removeClass('disabled')
+    @container.find('.new_item_placeholder').addClass('hidden')
+    @container.find('.new_item_action').removeClass('hidden')
 
     editable = @container.find(".editable[data-id=#{id}]")
     editable.data('smart_listing_edit_backup', editable.html())
@@ -265,6 +277,7 @@ $.fn.handleSmartListingControls = () ->
   $(this).each () ->
     controls = $(this)
     smart_listing = $("##{controls.data('smart-listing')}")
+    reset = controls.find(".reset")
 
     controls.submit ->
       # Merges smart list params with the form action url before submitting.
@@ -296,18 +309,18 @@ $.fn.handleSmartListingFilter = () ->
 
   field.observeField(
     onFilled: ->
-      icon.removeClass('icon-search')
-      icon.addClass('icon-remove')
+      icon.removeClass('glyphicon-search')
+      icon.addClass('glyphicon-remove')
       button.removeClass('disabled')
     onEmpty: ->
-      icon.addClass('icon-search')
-      icon.removeClass('icon-remove')
+      icon.addClass('glyphicon-search')
+      icon.removeClass('glyphicon-remove')
       button.addClass('disabled')
     onChange: ->
       form.submit()
   )
 
-  button.click ->
+  icon.click ->
     if field.val().length > 0
       field.val('')
       field.trigger('keydown')

data/app/helpers/smart_listing/helper.rb

@@ -40,7 +40,7 @@ module SmartListing
 
       def pagination_per_page_links options = {}
         container_classes = ["pagination_per_page"]
-        container_classes << "disabled" if empty?
+        container_classes << "hidden" if empty?
 
         per_page_sizes = @smart_listing.page_sizes.clone
         per_page_sizes.push(0) if @smart_listing.unlimited_per_page?
@@ -113,15 +113,15 @@ module SmartListing
 
       # Add new item button & placeholder to list
       def item_new options = {}
-        new_item_action_classes = %{new_item_action} 
-        new_item_action_classes << "disabled" if !empty? && max_count?
-        no_records_classes = %{no_records}
-        no_records_classes << "disabled" unless empty?
+        new_item_action_classes = %w{new_item_action} 
+        new_item_action_classes << "hidden" if !empty? && max_count?
+        no_records_classes = %w{no_records}
+        no_records_classes << "hidden" unless empty?
         new_item_button_classes = []
-        new_item_button_classes << "disabled" if max_count?
+        new_item_button_classes << "hidden" if max_count?
 
         locals = {
-          :placeholder_classes => %w{new_item_placeholder disabled},
+          :placeholder_classes => %w{new_item_placeholder hidden},
           :new_item_action_classes => new_item_action_classes,
           :colspan => options.delete(:colspan),
           :no_items_classes => no_records_classes,
@@ -132,7 +132,6 @@ module SmartListing
         }
 
         @template.render(:partial => 'smart_listing/item_new', :locals => default_locals.merge(locals))
-        nil
       end
 
       # Check if smart list is empty
@@ -171,6 +170,7 @@ module SmartListing
       data = {}
       data['max-count'] = @smart_listings[name].max_count if @smart_listings[name].max_count && @smart_listings[name].max_count > 0
       data['href'] = @smart_listings[name].href if @smart_listings[name].href
+      data['callback_href'] = @smart_listings[name].callback_href if @smart_listings[name].callback_href
       data.merge!(options[:data]) if options[:data]
 
       if bare

data/app/views/smart_listing/_item_new.html.erb

@@ -12,15 +12,15 @@
     new_item_button_text
 -%>
 
-<%= content_tag(:tr, '', :class => placeholder_classes.merge(%{info})) %>
-<%= content_tag(:tr, :class => new_item_action_classes.merge(%{info})) do %>
+<%= content_tag(:tr, '', :class => placeholder_classes + %w{info}) %>
+<%= content_tag(:tr, :class => new_item_action_classes + %w{info}) do %>
   <%= content_tag(:td, :colspan => colspan) do %>
-    <%= content_tag(:p, :class => no_items_classes.merge(%{pull-left})) do %>
+    <%= content_tag(:h5, :class => no_items_classes + %w{pull-left}) do %>
       <%= no_items_text %>
     <% end %>
-    <%= link_to(new_item_button_url, :remote => true, :class => new_item_button_classes.merge(%{btn pull-right})) do %>
+    <%= link_to(new_item_button_url, :remote => true, :class => new_item_button_classes + %w{btn pull-right}) do %>
       <%= content_tag(:i, '', :class => "glyphicon glyphicon-plus") %>
-      <%= new_item_text %>
+      <%= new_item_button_text %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/smart_listing/_pagination_per_page_link.html.erb

@@ -9,4 +9,4 @@
 -%>
 
 <% name = page == 0 ? t('views.pagination.unlimited') : page %>
-<%= url ? link_to(name, url) : content_tag(:span, name) %>
+<%= url ? link_to(name, url, :remote => true) : content_tag(:span, name) %>

data/lib/smart_listing/version.rb

@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/smart_listing.rb

@@ -28,6 +28,7 @@ module SmartListing
         :sort                           => true,                # allow sorting
         :paginate                       => true,                # allow pagination
         :href                           => nil,                 # set smart list target url (in case when different than current url)
+        :callback_href                  => nil,                 # set smart list callback url (in case when different than current url)
         :default_sort_attr              => nil,                 # default sort by
         :memorize_per_page              => false,
         :page_sizes                     => DEFAULT_PAGE_SIZES,  # set available page sizes array
@@ -52,6 +53,12 @@ module SmartListing
 
       @count = @collection.size
 
+      # Reset @page if greater than total number of pages
+      no_pages = (@count.to_f / @per_page.to_f).ceil.to_i
+      if @page.to_i > no_pages
+        @page = no_pages
+      end
+
       if @options[:array]
         @collection = @collection.sort do |x, y|
           xval = x
@@ -107,6 +114,10 @@ module SmartListing
       @options[:href]
     end
 
+    def callback_href
+      @options[:callback_href]
+    end
+
     def page_sizes
       @options[:page_sizes]
     end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -73,36 +73,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/views/smart_listing/item/_new.js.erb
-- app/views/smart_listing/item/_edit.js.erb
-- app/views/smart_listing/item/_create.js.erb
-- app/views/smart_listing/item/_remove.js.erb
-- app/views/smart_listing/item/_update.js.erb
-- app/views/smart_listing/item/_destroy.js.erb
-- app/views/smart_listing/_pagination_per_page_links.html.erb
+- LICENSE
+- README.md
+- Rakefile
+- app/assets/javascripts/smart_listing/application.js
+- app/assets/javascripts/smart_listing/smart_listing.coffee
+- app/assets/stylesheets/smart_listing/application.css
+- app/helpers/smart_listing/application_helper.rb
+- app/helpers/smart_listing/helper.rb
 - app/views/smart_listing/_action_custom.html.erb
-- app/views/smart_listing/_action_inactive.html.erb
-- app/views/smart_listing/_update_list.js.erb
-- app/views/smart_listing/_pagination_per_page_link.html.erb
 - app/views/smart_listing/_action_delete.html.erb
+- app/views/smart_listing/_action_edit.html.erb
+- app/views/smart_listing/_action_inactive.html.erb
 - app/views/smart_listing/_item_new.html.erb
+- app/views/smart_listing/_pagination_per_page_link.html.erb
+- app/views/smart_listing/_pagination_per_page_links.html.erb
 - app/views/smart_listing/_sortable.html.erb
-- app/views/smart_listing/_action_edit.html.erb
-- app/assets/stylesheets/smart_listing/application.css
-- app/assets/javascripts/smart_listing/smart_listing.coffee
-- app/assets/javascripts/smart_listing/application.js
-- app/helpers/smart_listing/application_helper.rb
-- app/helpers/smart_listing/helper.rb
-- config/routes.rb
+- app/views/smart_listing/_update_list.js.erb
+- app/views/smart_listing/item/_create.js.erb
+- app/views/smart_listing/item/_destroy.js.erb
+- app/views/smart_listing/item/_edit.js.erb
+- app/views/smart_listing/item/_new.js.erb
+- app/views/smart_listing/item/_remove.js.erb
+- app/views/smart_listing/item/_update.js.erb
 - config/locales/en.yml
-- lib/tasks/smart_list_tasks.rake
-- lib/smart_listing/engine.rb
-- lib/smart_listing/version.rb
+- config/routes.rb
 - lib/generators/smart_listing/views_generator.rb
 - lib/smart_listing.rb
-- LICENSE
-- Rakefile
-- README.md
+- lib/smart_listing/engine.rb
+- lib/smart_listing/version.rb
+- lib/tasks/smart_list_tasks.rake
 homepage: https://github.com/Sology/smart_listing
 licenses:
 - MIT
@@ -113,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: SmartListing helps creating sortable lists of ActiveRecord collections with