rails_admin_nested_set 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7a74d386b8a17426022eeb431af92de2d4a2d8
-  data.tar.gz: 23410b6a5456679ecc37ddbe51967399bec2e457
+  metadata.gz: bc9733d2faf82d7d56f6e12a630d3375311703e9
+  data.tar.gz: cd63a1d34cc911b8cb6fdf936450617522753587
 SHA512:
-  metadata.gz: 6063bf2706b2cff425b880f530c8afe6825dcc71f9df274a14d3d33460758a0d84209a3e0a0abfbdfcd84cc885e17ceeed18e5aaeb4af4b89737b16b8deacc35
-  data.tar.gz: 3ea211f5700e020784736249c549c79c35cf1b875e0403817008b18434cafb584da95f7f9cd02fe615383b439cd7d0c693099cd4e0271ffd5054c59a90c348e2
+  metadata.gz: 33315322cfd3b0a0a86c25da45f3f51889fc3ab1e1db059b5542f7776c0ec183c58e2be87be869c8fd6220852e104163200ebe44f7a6ccdb2cd881bc9334e527
+  data.tar.gz: 73c2f77b51108e9f4d3cfb68818bfaffb6ffc2f4f6d9832d4a48f6eca181369d33885d6312e6ca1239bab43faac52f34e183e66ae006c7fca5c86ab688771829

data/.ruby-version

@@ -1,2 +1,2 @@
-2.1.1
+2.1.4
 

data/app/assets/javascripts/rails_admin/rails_admin_nested_set.js.coffee

@@ -1,16 +1,38 @@
 #= require rails_admin/jquery.mjs.nestedSortable
 
-window.rails_admin_nested_set = (tree_config) ->
-  show_flash = (data)->
-    $flash = $('<div>')
-      .addClass('nestable-flash alert')
-      .append($('<button>').addClass('close').data('dismiss', 'alert').html('&times;'))
-      .append($('<span>').addClass('body').html(data))
-    $('#rails_admin_nestable').append($flash)
-    $flash.fadeIn(200).delay(2000).fadeOut 200, -> $(this).remove()
-
-  $ ->
-    $("#" + tree_config["id"]).nestedSortable
+show_flash = (data)->
+  $flash = $('<div>')
+    .addClass('nestable-flash alert')
+    .append($('<button>').addClass('close').data('dismiss', 'alert').html('&times;'))
+    .append($('<span>').addClass('body').html(data))
+  $('#rails_admin_nestable').append($flash)
+  $flash.fadeIn(200).delay(2000).fadeOut 200, -> $(this).remove()
+
+js_tree_toggle = (e)->
+  e.preventDefault()
+  e.stopPropagation()
+  $t = $(this)
+  $t.html "<i class=\"fa fa-spinner fa-spin\"></i>"
+  $.ajax
+    type: "POST"
+    url: $t.attr("href")
+    data:
+      ajax: true
+    success: (r) ->
+      $t.attr "href", r.href
+      $t.attr "class", r.class + ' js-tree-toggle'
+      $t.text r.text
+      $t.parent().attr "title", r.text
+      return
+    error: (e) ->
+      alert e.responseText
+      return
+
+init = ->
+  $('.rails_admin_nested_set').each ->
+    $t = $(this)
+    tree_config = $t.data('config')
+    $t.nestedSortable
       handle: '.dd-handle',
       items: ".dd-item"
       maxLevels: tree_config["max_depth"]
@@ -33,3 +55,10 @@ window.rails_admin_nested_set = (tree_config) ->
 
           success: (data) ->
             show_flash(data)
+
+console.log 'bind'
+$(document).off('pjax:end.rails_admin_nested_set').on('pjax:end.rails_admin_nested_set', init)
+$(document).off('ready.rails_admin_nested_set').on('ready.rails_admin_nested_set', init)
+
+
+$(document).on('click', '.js-tree-toggle', js_tree_toggle)

data/lib/rails_admin_nested_set/helper.rb

@@ -4,17 +4,15 @@ module RailsAdminNestedSet
       tree = tree.to_a.sort_by { |m| m.lft }
       roots = tree.select{|elem| elem.parent_id.nil?}
       id = "ns_#{rand(100_000_000..999_999_999)}"
-      content = content_tag(:ol, rails_admin_nested_set_builder(roots, tree), id: id, class: 'dd-list')
-      js = "rails_admin_nested_set({id: '#{id}', max_depth: #{max_depth}, update_url: '#{nested_set_path(model_name: @abstract_model)}'});"
-      content + content_tag(:script, js.html_safe, type: 'text/javascript')
+      tree_config = {max_depth: max_depth, update_url: nested_set_path(model_name: @abstract_model)}.to_json
+      content_tag(:ol, rails_admin_nested_set_builder(roots, tree), id: id, class: 'dd-list rails_admin_nested_set', 'data-config' => tree_config)
     end
 
     def g_link(node, fv, on, badge, meth)
       link_to(
         fv.html_safe,
         toggle_path(model_name: @abstract_model, id: node.id, method: meth, on: on.to_s),
-        class: 'badge ' + badge,
-        onclick: 'var $t = $(this); $t.html("<i class=\"fa fa-spinner fa-spin\"></i>"); $.ajax({type: "POST", url: $t.attr("href"), data: {ajax:true}, success: function(r) { $t.attr("href", r.href); $t.attr("class", r.class); $t.text(r.text); $t.parent().attr("title", r.text); }, error: function(e) { alert(e.responseText); }}); return false;'
+        class: 'js-tree-toggle badge ' + badge,
       )
     end
 

data/lib/rails_admin_nested_set/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminNestedSet
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies: []
 description: Rails admin nested set
 email:
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Interface for editing a nested set for rails_admin