the_sortable_tree 1.9.0 → 1.9.1

data/README.md

@@ -42,6 +42,8 @@ https://github.com/the-teacher/the_sortable_tree_test_app
 
 ### Changelog
 
+1.9.1 - Rewrite with coffee => **assets/javascripts/sortable/base.js.coffee**
+
 1.9.0 - 1) **Helper API changed!** 2) Comments tree with sand form and reply fu! 3) Way to manual set sortable Model klass into controller.
 
 1.8.6 - fixed CamelCase names definition (by andisthejackass)
@@ -173,7 +175,7 @@ end
   <%= csrf_meta_tags %>
 
   <%= javascript_include_tag 'jquery.ui.nestedSortable' %>
-  <%= javascript_include_tag 'comments_tree' %>
+  <%= javascript_include_tag 'sortable/base' %>
 
   <%= stylesheet_link_tag    'tree',          :media => :all %>
   <%= stylesheet_link_tag    'sortable',      :media => :all %>
@@ -221,19 +223,39 @@ rails g the_sortable_tree:views Model [option]
 rails g the_sortable_tree:views Page
 ```
 
+And render with partials from **pages/tree/base**
+
+``` ruby
+= sortable_tree @pages, :path => 'pages/tree/base'
+```
+
 ### Customize your sortable tree
 
 ``` ruby
 rails g the_sortable_tree:views Page sortable
 ```
 
+And render with partials from **pages/sortable/base**
+
+``` ruby
+= sortable_tree @pages, :path => 'pages/sortable/base', :new_url => new_page_path
+```
+
 ### Customize your comments tree
 
 ``` ruby
 rails g the_sortable_tree:views Comment comments
 ```
 
-### Rendering a part of tree
+And render with partials from **comments/comments/base**
+
+``` ruby
+= sortable_tree @comments, :path => 'comments/comments/base', :title => :name
+```
+
+### Troubleshooting
+
+If you need to render a part of tree:
 
 ``` ruby
 @root  = Page.root
@@ -245,8 +267,6 @@ rails g the_sortable_tree:views Comment comments
 = sortable_tree @pages, :new_url => new_page_path
 ```
 
-### Troubleshooting
-
 If **TheSortableTree** can't correctly define a Name of your Model, just add **sortable_model** into your Controller:
 
 ``` ruby
@@ -267,21 +287,31 @@ class Inventory::CategoriesController < ApplicationController
 end
 ```
 
-### Options
+### Comments Options
+
+**node_id** - comment's id which should be set as value of hidden field **parend_id** when Reply link pressed (**:id** by default)
+
+**contacts_field** - **:email** field by default. If you want to hide contacts field - you should use customization by view generators
 
-**id** - id field (:id => :friendly_id etc. **:id** by default)
+**content_field** - field with prepared comment's content (**:content** by default)
 
-**title** - title field of node (:title => :name etc. **:title** by default)
+**raw_content_field** - field with raw comment's content (**:raw_content** by default, you can set it to **:content**)
 
-**path** - path to custom view partials (:path => 'pages/the_sortable_tree')
+### Common Options
 
-**max_levels** - how many draggable levels can be? (**3** by default). **Can't be 0 (zero) and negative**
+**id** - id field (**:id** by default)
 
-**namespace** - namespace for admin sections for example. (:namespace => :admin, **:namespace** => nil by default)
+**title** - title field of node (**:title** by default)
+
+**path** - path to custom view partials (:path => 'pages/sortable/tree')
+
+**max_levels** - count of draggable levels or **max reply level** in comments tree. (**3** by default). **Can't be 0 (zero) and negative**
+
+**namespace** - namespace for admin sections for example. (**nil** by default)
 
 **opts[:level]** - view helper define level of recursion for each node. You can call **opts[:level]** into view partials
 
-### Partials
+### Base partial's descriptions
 
 **_tree** - root container for nested set elements
 
@@ -296,12 +326,6 @@ end
 **_controls** - control elements for current node
 
 
-**_js_init_sortable_tree** - JS for sortable tree
-
-**_js_on_update_tree**- JS for sortable tree
-
-**_js_rebuild_ajax**- JS for sortable tree
-
 ### Contributors
 
 * https://github.com/the-teacher

data/app/assets/javascripts/sortable/base.js.coffee

@@ -0,0 +1,48 @@
+$ ->
+  class @TheSortableTree
+    max_levels  = 3
+    rebuild_url = '/'
+
+    init: ->
+      $('ol.sortable').nestedSortable
+        disableNesting: 'no-nest'
+        forcePlaceholderSize: true
+        handle: 'i.handle'
+        helper: 'clone'
+        items:  'li'
+        maxLevels: @max_levels
+        opacity: .6
+        placeholder: 'placeholder'
+        revert: 250
+        tabSize: 25
+        tolerance: 'pointer'
+        toleranceElement: '> div'
+
+      $('ol.sortable').sortable
+        update: (event, ui) ->
+          parent_id = ui.item.parent().parent().attr('id')
+          item_id   = ui.item.attr('id')
+          prev_id   = ui.item.prev().attr('id')
+          next_id   = ui.item.next().attr('id')
+
+          @rebuild item_id, parent_id, prev_id, next_id
+
+    rebuild: (item_id, parent_id, prev_id, next_id) ->
+      $.ajax
+        type:       'POST'
+        dataType:   'script'
+        url:        @rebuild_url
+        data:
+          id:        item_id
+          parent_id: parent_id
+          prev_id:   prev_id
+          next_id:   next_id
+
+        beforeSend: (xhr) ->
+          $('.nested_set i.handle').hide()
+
+        success: (data, status, xhr) -> 
+          $('.nested_set i.handle').show()
+
+        error: (xhr, status, error) ->
+          alert error

data/app/views/comments/base/_comment.html.haml

@@ -2,6 +2,7 @@
   = hidden_field :comment, :id, :value => node.send(opts[:node_id]), :id => nil
   .title
     %span.main= node.send opts[:title]
-    %span.reply= link_to t('.reply'), '#'
+    - if opts[:level] <= opts[:max_levels]
+      %span.reply= link_to t('.reply'), '#'
   .contacts= node.send opts[:contacts_field]
   .content=  raw node.send opts[:content_field]

data/app/views/sortable/base/_tree.html.haml

@@ -1,7 +1,12 @@
 .sortable
   = render :partial => "#{opts[:path]}/new", :locals => { :opts => opts }
   - unless tree.empty?
-    = render :partial => "#{opts[:path]}/js_init_sortable_tree", :locals => { :opts => opts }
-    = render :partial => "#{opts[:path]}/js_on_update_tree"
-    = render :partial => "#{opts[:path]}/js_rebuild_ajax", :locals => { :opts => opts }
+    :javascript
+      $(function() {
+        sortable             = new document.TheSortableTree;
+        sortable.max_levels  = #{opts[:max_levels]};
+        sortable.rebuild_url = "#{url_for(:controller => opts[:klass].pluralize, :action => :rebuild)}";
+        sortable.init()
+      })
+
     %ol.ui-sortable.sortable.nested_set{ :id => "#{opts[:klass]}_nested_set" }= raw tree

data/lib/the_sortable_tree/version.rb

@@ -1,3 +1,3 @@
 module TheSortableTree
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_sortable_tree
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76895850 !ruby/object:Gem::Requirement
+  requirement: &71085670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *76895850
+  version_requirements: *71085670
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &76895640 !ruby/object:Gem::Requirement
+  requirement: &71085460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76895640
+  version_requirements: *71085460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76895410 !ruby/object:Gem::Requirement
+  requirement: &71085230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76895410
+  version_requirements: *71085230
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76895200 !ruby/object:Gem::Requirement
+  requirement: &71085020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76895200
+  version_requirements: *71085020
 description: Sortable awesom_nested_set, Drag&Drop GUI for awesom_nested_set, View
   Helper for nested set, Nested Comments
 email:
@@ -91,8 +91,9 @@ files:
 - app/assets/stylesheets/tree.css.scss
 - app/assets/stylesheets/comments_tree.css.scss
 - app/assets/stylesheets/sortable.css.scss
+- app/assets/javascripts/comments/comments.js.coffee
+- app/assets/javascripts/sortable/base.js.coffee
 - app/assets/javascripts/jquery.ui.nestedSortable.js
-- app/assets/javascripts/comments_tree.js.coffee
 - app/views/comments/base/_children.html.haml
 - app/views/comments/base/_node.html.haml
 - app/views/comments/base/_tree.html.haml
@@ -104,9 +105,6 @@ files:
 - app/views/sortable/base/_tree.html.haml
 - app/views/sortable/base/_new.html.haml
 - app/views/sortable/base/_controls.html.haml
-- app/views/sortable/base/_js_rebuild_ajax.html.haml
-- app/views/sortable/base/_js_init_sortable_tree.html.haml
-- app/views/sortable/base/_js_on_update_tree.html.haml
 - app/views/tree/base/_children.html.haml
 - app/views/tree/base/_node.html.haml
 - app/views/tree/base/_link.html.haml

data/app/views/sortable/base/_js_init_sortable_tree.html.haml

@@ -1,17 +0,0 @@
-:javascript
-  $(function(){
-    $('ol.sortable').nestedSortable({
-      disableNesting: 'no-nest',
-      forcePlaceholderSize: true,
-      handle: 'i.handle',
-      helper: 'clone',
-      items: 'li',
-      maxLevels: #{opts[:max_levels]},
-      opacity: .6,
-      placeholder: 'placeholder',
-      revert: 250,
-      tabSize: 25,
-      tolerance: 'pointer',
-      toleranceElement: '> div'
-    })
-  });

data/app/views/sortable/base/_js_on_update_tree.html.haml

@@ -1,12 +0,0 @@
-:javascript
-  $(function(){
-    $('ol.sortable').sortable({
-      update: function(event, ui){
-        parent_id = ui.item.parent().parent().attr('id');
-        item_id = ui.item.attr('id');
-        prev_id = ui.item.prev().attr('id');
-        next_id = ui.item.next().attr('id');
-        sortable_tree(item_id, parent_id, prev_id, next_id);
-      }
-    });
-  });

data/app/views/sortable/base/_js_rebuild_ajax.html.haml

@@ -1,13 +0,0 @@
-:javascript
-  function sortable_tree(item_id, parent_id, prev_id, next_id){
-    jQuery.ajax({
-      type:       'POST',
-      dataType:   'script',
-      url:        '#{url_for(:controller => opts[:klass].pluralize, :action => :rebuild)}',
-      data:       { id: item_id, parent_id: parent_id, prev_id: prev_id, next_id: next_id },
-
-      beforeSend: function(xhr){ $('.nested_set i.handle').hide() },
-      success:    function(data, status, xhr){ $('.nested_set i.handle').show() },
-      error:      function(xhr, status, error){ alert(error) }
-    });
-  }