the_sortable_tree 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31df118a4cde0ffed0b2d4c73c5a89acc26cc713
-  data.tar.gz: be25f7501a6c7bd6b24b0dea699b4788d0051cf9
+  metadata.gz: f9a1e92c0db44cdbc90f1344c2d1f7305a446d8e
+  data.tar.gz: 005ba075ce0edf667517399825b7d59ea8543718
 SHA512:
-  metadata.gz: c0cd85f5126a4663cf5b4e403af5ea4fdfb672fc9869db90ccf93cb37d564a7e1b4a328761177d82ad6c890bcb7cf280dcbaeab16d8fb67603bca52ed7f02900
-  data.tar.gz: 2e989258556a2a882d51b71c63f9ef73ab7542b7a63b1562bf46615a5d58aca16556569d02edccc0ef5157aa11c16cd40d80e5b89e89fbf934e11a4fffcb8db4
+  metadata.gz: 15866be81f3f1f94239c952da6be4e1bfaa94523bf659fd62b1556252ebc28d82260a72377ef74068c77fb402820a970f024c9c972556d0b26e1e1a0ebf24ce4
+  data.tar.gz: cfdda79927461e1d99c3bb389debb11c154a70ff54b8ea1924d06c7552b3759e4a3a7701d2dd4da45ffc16838c6b445868203a6521429cf77c3ec0f4e864cfc3

data/README.md

@@ -63,8 +63,16 @@ Sortable GUI require JQuery libs
 Add next JS only for Sortable GUI
 
 ```ruby
-//= require jquery.ui.nestedSortable
-//= require sortable_tree/initializer
+//= require the_sortable_tree/jquery.ui.nestedSortable
+//= require the_sortable_tree/sortable_ui/base
+
+// with Turbolinks
+$ ->
+  TheSortableTree.SortableUI.init()
+
+// with Turbolinks
+$(document).on "ready page:load", ->
+  TheSortableTree.SortableUI.init()
 ```
 
 #### Stylesheets
@@ -75,8 +83,14 @@ Add next JS only for Sortable GUI
 *= require tree
 *= require sortable_tree
 *= require nested_options
+
+*= the_sortable_tree/sortable_ui/base
 ```
 
+```
+  ol.the-sortable-tree.the-sortable-tree--list(data={ max_levels: 5, rebuild_url: rebuild_hubs_url })
+    = sortable_tree @hubs
+```
 ### Extend your Routes for Sortable GUI
 
 ```ruby
@@ -96,8 +110,9 @@ end
 
 ```ruby
 class Page < ActiveRecord::Base
-  include TheSortableTree::Scopes
-  
+  acts_as_nested_set scope: :user
+  include ::TheSortableTree::Scopes
+
   # any code here
 end
 ```
@@ -106,7 +121,7 @@ end
 
 ```ruby
 class PagesController < ApplicationController
-  include TheSortableTreeController::Rebuild
+  include ::TheSortableTreeController::Rebuild
 
   def manage
     @pages = Page.nested_set.select('id, title, content, parent_id').all
@@ -263,6 +278,8 @@ Try to create view helpers for:
 1. [mjsarfatti/nestedSortable](https://github.com/mjsarfatti/nestedSortable)
 2. [iconza](http://iconza.com)
 
+`this line fot testing with submodules`
+
 ## The MIT License (MIT)
 
 Copyright 2009-2013 Ilya N. Zykin (the-teacher), Mikhail Dieterle (Mik-die), Matthew Clark

data/app/assets/javascripts/the_sortable_tree/sortable_ui/base.js.coffee

@@ -0,0 +1,87 @@
+@TheSortableTree ||= {}
+@TheSortableTree.SortableUI = do ->
+  init: ->
+    sortable_tree = $('.the-sortable-tree')
+    return false if sortable_tree.length is 0
+
+    rebuild_url = sortable_tree.data('rebuild_url') || sortable_tree.data('rebuild-url')
+    max_levels  = sortable_tree.data('max_levels')  || sortable_tree.data('max-levels')
+
+    ############################################
+    # Initialize Sortable Tree
+    ############################################
+    sortable_tree.nestedSortable
+      # nested sortable plugin options
+      tabSize:          25
+      listType:       'ol'
+      disableNesting: 'the-sortable-tree--no-nest'
+      listClass:      'the-sortable-tree--nested-set'
+      errorClass:     'the-sortable-tree--sortable-error'
+      maxLevels:       max_levels
+
+      # JQ sortable optopns
+
+      placeholder:      'the-sortable-tree--placeholder'
+      handle:           '.the-sortable-tree--handler'
+      toleranceElement: '> div'
+
+      items:            'li'
+      helper:           'clone'
+      tolerance:        'pointer'
+
+      revert:           250
+      opacity:          0.6
+      forcePlaceholderSize: true
+
+      # JQ sortable Callbacks
+      #
+      # create:     ->
+      # start:      ->
+      # activate:   ->
+      # over:       ->
+      # sort:       ->
+      # change:     ->
+      # sort:       ->
+      # beforeStop: ->
+      # # => AJAX
+      # update:     ->
+      # deactivate: ->
+      # out:        ->
+      # stop:       ->
+      # receive:    ->
+      # remove:     ->
+
+    ############################################
+    # Sortable Update Event
+    ############################################
+    sortable_tree.on "sortupdate", (event, ui) =>
+      item      = ui.item
+      attr_name = 'node-id'
+      item_id   = item.data(attr_name)
+      prev_id   = item.prev().data(attr_name)
+      next_id   = item.next().data(attr_name)
+      parent_id = item.parent().parent().data(attr_name)
+
+      TheSortableTree.SortableUI.rebuild_sortable_tree(rebuild_url, item_id, parent_id, prev_id, next_id)
+
+    true
+
+  rebuild_sortable_tree: (rebuild_url, 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) ->
+        $('.the-sortable-tree--handler').css { opacity: 0 }
+
+      success: (data, status, xhr) ->
+        $('.the-sortable-tree--handler').css { opacity: 1 }
+
+      error: (xhr, status, error) ->
+        log error

data/app/assets/javascripts/{sortable_tree → the_sortable_tree/sortable_ui}/initializer.js.coffee

@@ -10,18 +10,18 @@
       next_id:   next_id
 
     beforeSend: (xhr) ->
-      $('.sortable_tree i.handle').hide()
+      $('.the_sortable_tree-handler').hide()
 
     success: (data, status, xhr) ->
-      $('.sortable_tree i.handle').show()
+      $('.the_sortable_tree-handler').show()
 
     error: (xhr, status, error) ->
       console.log error
 
 @init_sortable_tree = ->
-  sortable_tree = $('ol.sortable_tree')
+  sortable_tree = $('.the_sortable_tree')
   return false if sortable_tree.length is 0
-  
+
   rebuild_url = sortable_tree.data('rebuild_url') || sortable_tree.data('rebuild-url')
   max_levels  = sortable_tree.data('max_levels')  || sortable_tree.data('max-levels')
 
@@ -29,15 +29,17 @@
   # Initialize Sortable Tree
   ############################################
   sortable_tree.nestedSortable
-    items:            'li'
-    helper:           'clone'
-    handle:           'i.handle'
+    items:       '.the_sortable_tree-item'
+    handle:      '.the_sortable_tree-handler'
+    placeholder: 'the_sortable_tree-placeholder'
+    listClass:   'the_sortable_tree-nested_set'
+
     tolerance:        'pointer'
+    helper:           'clone'
     maxLevels:        max_levels
     revert:           250
     tabSize:          25
     opacity:          0.6
-    placeholder:      'placeholder'
     disableNesting:   'no-nest'
     toleranceElement: '> div'
     forcePlaceholderSize: true
@@ -46,15 +48,16 @@
   # Sortable Update Event
   ############################################
   sortable_tree.on "sortupdate", (event, ui) =>
-    item      = ui.item
+    item = ui.item
     attr_name = 'node-id'
+
     item_id   = item.data(attr_name)
     prev_id   = item.prev().data(attr_name)
     next_id   = item.next().data(attr_name)
     parent_id = item.parent().parent().data(attr_name)
-    
+
     rebuild_sortable_tree(rebuild_url, item_id, parent_id, prev_id, next_id)
 
   true
 
-$ -> init_sortable_tree()
+$ -> init_sortable_tree()

data/app/assets/stylesheets/the_sortable_tree/expandable_tree.sass

@@ -0,0 +1,23 @@
+.sortable_tree
+  &.expandable
+    h4
+      margin-left: 50px
+
+  .expand
+    float: left
+    cursor: pointer
+
+    border: 1px solid lightgray
+    color: lightgray
+
+    font-size: 13px
+    font-weight: normal
+    line-height: 13px
+    text-align: center
+
+    width: 13px
+    height: 13px
+    margin: 3px 10px 0 0
+
+    &.empty
+      display: none !important

data/app/assets/stylesheets/the_sortable_tree/sortable_ui/base.sass

@@ -0,0 +1,36 @@
+.tst
+  margin: 0
+  padding: 0
+
+  &-reset
+    *
+      margin: 0
+      padding: 0
+
+  &-item
+    position: relative
+    margin: 0 0 10px 10px
+
+  &-item_content
+    background: #eef
+    border-radius: 3px
+
+  &-handler
+    cursor: move
+
+  &-placeholder
+    margin-left: 10px
+    margin-bottom: 10px
+    border-radius: 3px
+    background: #4ed740
+
+  &-sortable_error
+    background: red
+
+  &-nested_set
+    margin: 10px 0 0 10px
+    border-left: 1px dashed #bbb
+    list-style: none outside none
+
+    .tst-item
+      margin: 0 0 10px 10px

data/app/assets/stylesheets/the_sortable_tree/tree.sass

@@ -0,0 +1,35 @@
+.tst_tree
+  margin: 0
+  padding: 0
+
+  *
+    margin: 0
+    padding: 0
+
+  &-list
+    margin: 0 0 0 13px
+    padding: 0 0 0 15px
+    border-left: 1px dashed gray
+    list-style: none outside none
+
+  &-item
+    margin-bottom: 5px
+    position: relative
+    list-style: none outside none
+
+  &-link
+    color: black
+    font-size: 14px
+
+    &:hover
+      color: black
+      background: #ddd
+
+  &-item_content
+    padding: 5px
+    background: #eee
+    margin-bottom: 5px
+    border-radius: 3px
+
+    &:hover
+      background: #ddd

data/app/helpers/render_expandable_tree_helper.rb

@@ -7,7 +7,7 @@
 # or use h.html_escape(node.content)
 # for escape potentially dangerous content
 module RenderExpandableTreeHelper
-  module Render 
+  module Render
     class << self
       attr_accessor :h, :options
 
@@ -53,10 +53,10 @@ module RenderExpandableTreeHelper
 
       def children
         unless options[:children].blank?
-          "<ol class='nested_set'>#{ options[:children] }</ol>"
+          "<ol class='the_sortable_tree-nested_set'>#{ options[:children] }</ol>"
         end
       end
 
     end
   end
-end
+end

data/app/helpers/render_sortable_tree_helper.rb

@@ -7,7 +7,7 @@
 # or use h.html_escape(node.content)
 # for escape potentially dangerous content
 module RenderSortableTreeHelper
-  module Render 
+  module Render
     class << self
       attr_accessor :h, :options
 
@@ -16,24 +16,43 @@ module RenderSortableTreeHelper
         node = options[:node]
 
         "
-          <li data-node-id='#{ node.id }'>
-            <div class='item'>
-              <i class='handle'></i>
-              #{ show_link }
-              #{ controls }
+          <li data-node-id='#{ node.id }' class='the_sortable_tree-item'>
+            <div class='ptz_table w100p p5 the_sortable_tree-item_content'>
+              <div class='ptz_tr'>
+                <div class='ptz_td vam w30'>
+                  #{ handler }
+                </div>
+
+                <div class='ptz_td vam'>
+                  #{ show_link }
+                </div>
+
+                <div class='ptz_td vam br-off w10 pr5'>
+                  #{ controls }
+                </div>
+              </div>
             </div>
+
             #{ children }
           </li>
         "
       end
 
+      def handler
+        "<div class='the_sortable_tree-handler p5'>
+          <i class='fa fa-arrows fs16'></i>
+        </div>"
+      end
+
       def show_link
         node = options[:node]
         ns   = options[:namespace]
         url = h.url_for(:controller => options[:klass].pluralize, :action => :show, :id => node)
         title_field = options[:title]
 
-        "<h4>#{ h.link_to(node.send(title_field), url) }</h4>"
+        "<div class='fs15'>
+          #{ h.link_to(node.send(title_field), url) }
+        </div>"
       end
 
       def controls
@@ -43,16 +62,15 @@ module RenderSortableTreeHelper
         destroy_path = h.url_for(:controller => options[:klass].pluralize, :action => :destroy, :id => node)
 
         "
-          <div class='controls'>
-            #{ h.link_to '', edit_path, :class => :edit }
-            #{ h.link_to '', destroy_path, :class => :delete, :method => :delete, :data => { :confirm => 'Are you sure?' } }
-          </div>
+          <a href='#{ edit_path }'>
+            <i class='fa fa-edit fs20'></i>
+          </a>
         "
       end
 
       def children
         unless options[:children].blank?
-          "<ol class='nested_set'>#{ options[:children] }</ol>"
+          "<ol class='the_sortable_tree-nested_set'>#{ options[:children] }</ol>"
         end
       end
 

data/app/helpers/render_tree_helper.rb

@@ -16,8 +16,8 @@ module RenderTreeHelper
 
         node = options[:node]
         "
-          <li>
-            <div class='item'>
+          <li class='tst_tree-item'>
+            <div class='tst_tree-item_content'>
               #{ show_link }
             </div>
             #{ children }
@@ -30,16 +30,17 @@ module RenderTreeHelper
         ns   = options[:namespace]
         url  = h.url_for(ns + [node])
         title_field = options[:title]
+        klass = 'tst_tree-link'
 
-        "<h4>#{ h.link_to(node.send(title_field), url) }</h4>"
+        "<h4>#{ h.link_to(node.send(title_field), url, class: klass) }</h4>"
       end
 
       def children
         unless options[:children].blank?
-          "<ol>#{ options[:children] }</ol>"
+          "<ol class='tst_tree-list'>#{ options[:children] }</ol>"
         end
       end
 
     end
   end
-end
+end