smart_listing 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daba6372bdd51039d67e7a1b1925bbc241b4bda8
-  data.tar.gz: ff6eef29b68cf482c8baf5bc7198a4f27b831e2d
+  metadata.gz: 3e5029b5f33d511b0683ca39c58f1d4956b6fd29
+  data.tar.gz: d924b0eb292135656a20c0b37e2ef1cf7e48a95f
 SHA512:
-  metadata.gz: 51d818330f8d5c6333de737bf4b141e4c2a0b49e90e91bba2cc554ae4dda94d9bc67d4f2aad8e8fe6822a5e0e13ab69450ee73c1c4b1c9deee8b2c2e0df3f4ee
-  data.tar.gz: 5bc2d838c9800a5eb040037afcc5b70a1674944997cafbbc024d88eed3a4bdd3b1f04913b99a7807dbae3a7e508fac43bf1c4ae023567096e1f5a4cb94e6525e
+  metadata.gz: 55401a3882f4b42e2797ea24c895d00e285c0f76b575b2809825b0f5ff4dd32ccf1953075290d4cdf25ad359e4c5446db5889b4e76797e529d9a58b93f603ac5
+  data.tar.gz: 6ab9ad98c2f7ec341d2d2d14c1a002f617cbb0317a1cb21b2ad82ac1003a77eec335beca1c68086342fc306aac15e8a4772d63b25b8025e9525423141b3c6516

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

@@ -39,6 +39,8 @@ class SmartListing
         # Cancel new record
         @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
         @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').removeClass('<%= SmartListing.config.classes(:hidden) %>')
+
+      @setAutoshow(false)
       false
 
     @container.on 'click', '.<%= SmartListing.config.classes(:item_actions) %> a[data-<%= SmartListing.config.data_attributes(:confirmation) %>]', (event) =>
@@ -81,6 +83,9 @@ class SmartListing
   maxCount: =>
     parseInt(@container.data('<%= SmartListing.config.data_attributes(:max_count) %>'))
 
+  setAutoshow: (v) =>
+    @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').data('<%= SmartListing.config.data_attributes(:autoshow) %>', v)
+
   changeItemCount: (value) =>
     @container.find('.<%= SmartListing.config.classes(:pagination_per_page) %> .<%= SmartListing.config.classes(:pagination_count) %>').html(@itemCount() + value)
 
@@ -107,12 +112,15 @@ class SmartListing
 
     if @maxCount()
       if @itemCount() >= @maxCount()
-        if @itemCount()
-          @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
-        @container.find('.<%= SmartListing.config.classes(:new_item_action) %> .<%= SmartListing.config.classes(:new_item_button) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
+        @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
+        @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
       else
-        @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').removeClass('<%= SmartListing.config.classes(:hidden) %>')
-        @container.find('.<%= SmartListing.config.classes(:new_item_action) %> .<%= SmartListing.config.classes(:new_item_button) %>').removeClass('<%= SmartListing.config.classes(:hidden) %>')
+        if @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').data('<%= SmartListing.config.data_attributes(:autoshow) %>')
+          @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').removeClass('<%= SmartListing.config.classes(:hidden) %>')
+          @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
+        else
+          @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
+          @container.find('.<%= SmartListing.config.classes(:new_item_action) %>').removeClass('<%= SmartListing.config.classes(:hidden) %>')
 
     @status.each (index, status) =>
       $(status).find('.<%= SmartListing.config.classes(:limit) %>').html(@maxCount() - @itemCount())
@@ -132,18 +140,19 @@ class SmartListing
   # Methods executed by rails UJS:
 
   new_item: (content) =>
-    new_item_action = @container.find('.<%= SmartListing.config.classes(:new_item_action) %>')
-    new_item_placeholder = @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
+    if !@maxCount() || (@itemCount() < @maxCount())
+      new_item_action = @container.find('.<%= SmartListing.config.classes(:new_item_action) %>')
+      new_item_placeholder = @container.find('.<%= SmartListing.config.classes(:new_item_placeholder) %>').addClass('<%= SmartListing.config.classes(:hidden) %>')
 
-    @container.find('.<%= SmartListing.config.classes(:editable) %>').each (i, v) =>
-      @cancelEdit($(v))
+      @container.find('.<%= SmartListing.config.classes(:editable) %>').each (i, v) =>
+        @cancelEdit($(v))
 
-    new_item_action.addClass('<%= SmartListing.config.classes(:hidden) %>')
-    new_item_placeholder.removeClass('<%= SmartListing.config.classes(:hidden) %>')
-    new_item_placeholder.html(content)
-    new_item_placeholder.addClass('<%= SmartListing.config.classes(:inline_editing) %>')
+      new_item_action.addClass('<%= SmartListing.config.classes(:hidden) %>')
+      new_item_placeholder.removeClass('<%= SmartListing.config.classes(:hidden) %>')
+      new_item_placeholder.html(content)
+      new_item_placeholder.addClass('<%= SmartListing.config.classes(:inline_editing) %>')
 
-    @fadeLoaded()
+      @fadeLoaded()
 
   create: (id, success, content) =>
     new_item_action = @container.find('.<%= SmartListing.config.classes(:new_item_action) %>')

data/app/helpers/smart_listing/helper.rb

@@ -116,26 +116,37 @@ module SmartListing
       end
 
       # Add new item button & placeholder to list
-      def item_new options = {}
-        new_item_action_classes = [SmartListing.config.classes(:new_item_action)] 
-        new_item_action_classes << SmartListing.config.classes(:hidden) if !empty? && max_count?
+      def item_new options = {}, &block
         no_records_classes = [SmartListing.config.classes(:no_records)]
         no_records_classes << SmartListing.config.classes(:hidden) unless empty?
         new_item_button_classes = []
         new_item_button_classes << SmartListing.config.classes(:hidden) if max_count?
 
         locals = {
-          :placeholder_classes => [SmartListing.config.classes(:new_item_placeholder), SmartListing.config.classes(:hidden)],
-          :new_item_action_classes => new_item_action_classes,
           :colspan => options.delete(:colspan),
           :no_items_classes => no_records_classes,
           :no_items_text => options.delete(:no_items_text),
           :new_item_button_url => options.delete(:link),
           :new_item_button_classes => new_item_button_classes,
           :new_item_button_text => options.delete(:text),
+          :new_item_autoshow => block_given?,
+          :new_item_content => nil,
         }
 
-        @template.render(:partial => 'smart_listing/item_new', :locals => default_locals.merge(locals))
+        unless block_given?
+          locals[:placeholder_classes] = [SmartListing.config.classes(:new_item_placeholder), SmartListing.config.classes(:hidden)]
+          locals[:new_item_action_classes] = [SmartListing.config.classes(:new_item_action)]
+          locals[:new_item_action_classes] << SmartListing.config.classes(:hidden) if !empty? && max_count?
+
+          @template.render(:partial => 'smart_listing/item_new', :locals => default_locals.merge(locals))
+        else
+          locals[:placeholder_classes] = [SmartListing.config.classes(:new_item_placeholder)]
+          locals[:placeholder_classes] << SmartListing.config.classes(:hidden) if !empty? && max_count?
+          locals[:new_item_action_classes] = [SmartListing.config.classes(:new_item_action), SmartListing.config.classes(:hidden)]
+
+          locals[:new_item_content] = @template.capture(&block)
+          @template.render(:partial => 'smart_listing/item_new', :locals => default_locals.merge(locals))
+        end
       end
 
       # Check if smart list is empty
@@ -272,8 +283,9 @@ module SmartListing
       id = options[:id] || object.try(:id)
       valid = options[:valid] if options.has_key?(:valid)
       object_key = options.delete(:object_key) || :object
+      new = options.delete(:new)
 
-      render(:partial => "smart_listing/item/#{item_action.to_s}", :locals => {:name => name, :id => id, :valid => valid, :object_key => object_key, :object => object, :part => partial})
+      render(:partial => "smart_listing/item/#{item_action.to_s}", :locals => {:name => name, :id => id, :valid => valid, :object_key => object_key, :object => object, :part => partial, :new => new})
     end
   end
 end

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

@@ -10,9 +10,13 @@
     new_item_button_url:      argument to link_to (new item button)
     new_item_button_classes
     new_item_button_text
+    new_item_autoshow         automatically show new item placeholder
+    new_item_content          new item placeholder content (usually some form)
 -%>
 
-<%= content_tag(:tr, '', :class => placeholder_classes + %w{info}) %>
+<%= content_tag(:tr, '', :class => placeholder_classes + %w{info}, :data => {SmartListing.config.data_attributes(:autoshow) => new_item_autoshow}) do %>
+  <%= new_item_content %>
+<% end %>
 <%= content_tag(:tr, :class => new_item_action_classes + %w{info}) do %>
   <%= content_tag(:td, :colspan => colspan) do %>
     <%= content_tag(:p, :class => no_items_classes + %w{pull-left}) do %>

data/app/views/smart_listing/item/_create_continue.js.erb

@@ -0,0 +1,6 @@
+var smart_listing = $('#<%= name %>').smart_listing();
+smart_listing.create(<%= id || 0 %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.setAutoshow(true);
+<% if object.persisted? %>
+  smart_listing.new_item("<%= escape_javascript(render(:partial => new.last, :locals => {object_key => new.first})) %>");
+<% end %>

data/lib/generators/smart_listing/templates/initializer.rb

@@ -16,8 +16,8 @@ SmartListing.configure do |config|
     #:pagination_count      => "count",
     #:inline_editing        => "info",
     #:no_records            => "no-records",
-    #:limit                 => "limit",
-    #:limit_alert           => "limit-alert",
+    #:limit                 => "smart-listing-limit",
+    #:limit_alert           => "smart-listing-limit-alert",
     #:controls              => "smart-listing-controls",
     #:controls_reset        => "reset",
     #:filtering             => "filter",
@@ -46,6 +46,7 @@ SmartListing.configure do |config|
     #:params                => "params",
     #:observed              => "observed",
     #:href                  => "href",
+    #:autoshow              => "autoshow",
   }
 
   config.constants :selectors, {

data/lib/smart_listing.rb

@@ -91,7 +91,7 @@ module SmartListing
           end
         end
       else
-        @collection = @collection.order("#{@sort_attr} #{@sort_order}") if @options[:sort] && @sort_attr && !@sort_attr.empty? && @sort_order
+        @collection = @collection.order("#{@sort_attr} #{@sort_order}") if @options[:sort] && @sort_attr && !@sort_attr.empty? && @collection.column_names.include?(@sort_attr) && @sort_order
         if @options[:paginate] && @per_page > 0
           @collection = @collection.page(@page).per(@per_page)
         end

data/lib/smart_listing/config.rb

@@ -27,8 +27,8 @@ module SmartListing
           :pagination_count => "count",
           :inline_editing => "info",
           :no_records => "no-records",
-          :limit => "limit",
-          :limit_alert => "limit-alert",
+          :limit => "smart-listing-limit",
+          :limit_alert => "smart-listing-limit-alert",
           :controls => "smart-listing-controls",
           :controls_reset => "reset",
           :filtering => "filter",
@@ -56,6 +56,7 @@ module SmartListing
           :params => "params",
           :observed => "observed",
           :href => "href",
+          :autoshow => "autoshow",
         },
         :selectors => {
           :item_action_destroy => "a.destroy",

data/lib/smart_listing/version.rb

@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - app/views/smart_listing/_sortable.html.erb
 - app/views/smart_listing/_update_list.js.erb
 - app/views/smart_listing/item/_create.js.erb
+- app/views/smart_listing/item/_create_continue.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