jstree-rails-4 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39662753ed3b5136fbe9e4a21c239eaeee0b3929
-  data.tar.gz: 2f44137ee87f3162ff615b515b577120a7974d3e
+  metadata.gz: 637c3e2030c64578c72668ab8339dec3e696ac7d
+  data.tar.gz: 2b738a880fa41dbfd500dce03593238d72a5ac60
 SHA512:
-  metadata.gz: ffc5309ad0fe5e7b4b49086683fbba0ca40944a0754e3161b40c017bc6b68bf373589690d39a0c19da42ce0d44307b08a0bf2fbf242af8c3afcbd0f9fda07795
-  data.tar.gz: 21e4df01dfced0d9b5abd7a5b670407af0d0d53bac802722cf9cad975aae16a134299cf15fcb818755de7d1acdaf8f6c6ed94e81d1d84134867c7d2d9e931224
+  metadata.gz: 665ee89eeca36314c2a004a9607a943ce852114b08ae8207028a141c1cb0d8fb0e58a2d89d4545f56d3986e5ec101aeff7b91e0a7c9cd8b9f6a5f539e8d8538e
+  data.tar.gz: d63e91d381c838e53672f7a508350a670df3bcd522026abaf32315a1d815f161a689bb5dbc4c1053551ffa83a259f8e4cb1dfc1cd0690a5ad1626e603d458f84

data/Gemfile.lock

@@ -0,0 +1,108 @@
+PATH
+  remote: .
+  specs:
+    jstree-rails-4 (3.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    erubis (2.7.0)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    httpclient (2.6.0.1)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.5)
+    mini_portile (0.6.2)
+    minitest (5.6.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (3.0.3)
+      rack (~> 1.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0)
+  httpclient (~> 2.2)
+  jstree-rails-4!
+  rails (>= 3.0)
+  thor (~> 0.14)

data/README.md

@@ -4,9 +4,9 @@
 
 The `jstree-rails-4` gem integrates the `jsTree` jQuery plugin with the Rails asset pipeline.
 
-GemVersion: 1.0.0
+GemVersion: 3.1.1
 
-jsTree Version: 3.0.9
+jsTree Version: 3.1.1
 
 ## Usage
 

data/jstree-rails-4.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = JSTree::Rails::VERSION
   s.authors     = ["Kesha Antonov"]
   s.email       = ["innokenty.longway@gmail.com"]
-  s.homepage    = "https://github.com/argerim/jstree-rails-4"
+  s.homepage    = "https://github.com/kesha-antonov/jstree-rails-4"
   s.summary     = %q{Integrate jsTree javascript library with Rails asset pipeline}
   s.description = %q{jsTree is jquery plugin, that provides interactive trees. It is absolutely free, open source and distributed under the MIT license.}
   s.license     = 'MIT'
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "thor", "~> 0.14"
+  s.add_development_dependency "thor", "~> 0.14"
   s.add_development_dependency "bundler", "~> 1.0"
   s.add_development_dependency "rails", ">= 3.0"
   s.add_development_dependency "httpclient", "~> 2.2"

data/lib/jstree-rails-4/version.rb

@@ -1,5 +1,5 @@
 module JSTree
   module Rails
-    VERSION = "3.1.0"
+    VERSION = "3.1.1"
   end
 end

data/vendor/assets/javascripts/jstree.js

@@ -13,7 +13,7 @@
 }(function ($, undefined) {
 	"use strict";
 /*!
- * jsTree 3.1.0
+ * jsTree 3.1.1
  * http://jstree.com/
  *
  * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
@@ -71,7 +71,7 @@
 		 * specifies the jstree version in use
 		 * @name $.jstree.version
 		 */
-		version : '3.1.0',
+		version : '3.1.1',
 		/**
 		 * holds all the default options used when creating new instances
 		 * @name $.jstree.defaults
@@ -711,7 +711,7 @@
 							}
 							if(!this._data.core.ready) {
 								setTimeout($.proxy(function() {
-									if(!this.get_container_ul().find('.jstree-loading').length) {
+									if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
 										this._data.core.ready = true;
 										if(this._data.core.selected.length) {
 											if(this.settings.core.expand_selected_onload) {
@@ -826,7 +826,10 @@
 				.on('focus.jstree', $.proxy(function () {
 						if(+(new Date()) - was_click > 500 && !this._data.core.focused) {
 							was_click = 0;
-							this.get_node(this.element.attr('aria-activedescendant'), true).find('> .jstree-anchor').focus();
+							var act = this.get_node(this.element.attr('aria-activedescendant'), true);
+							if(act) {
+								act.find('> .jstree-anchor').focus();
+							}
 						}
 					}, this))
 				.on('mouseenter.jstree', '.jstree-anchor', $.proxy(function (e) {
@@ -1468,6 +1471,7 @@
 		 * @trigger model.jstree, changed.jstree
 		 */
 		_append_json_data : function (dom, data, cb, force_processing) {
+			if(this.element === null) { return; }
 			dom = this.get_node(dom);
 			dom.children = [];
 			dom.children_d = [];
@@ -1761,6 +1765,7 @@
 					}
 				},
 				rslt = function (rslt, worker) {
+					if(this.element === null) { return; }
 					this._cnt = rslt.cnt;
 					this._model.data = rslt.mod; // breaks the reference in load_node - careful
 
@@ -1927,7 +1932,7 @@
 			if(tmp.length) {
 				data.icon = tmp.hasClass('jstree-themeicon-hidden') ? false : tmp.attr('rel');
 			}
-			if(data.state.icon) {
+			if(data.state.icon !== undefined) {
 				data.icon = data.state.icon;
 			}
 			if(data.icon === undefined || data.icon === null || data.icon === "") {
@@ -2825,7 +2830,7 @@
 						if(p[i] === l) {
 							c = !c;
 						}
-						if(c || p[i] === o || p[i] === l) {
+						if(!this.is_disabled(p[i]) && (c || p[i] === o || p[i] === l)) {
 							this.select_node(p[i], true, false, e);
 						}
 						else {
@@ -3716,7 +3721,7 @@
 			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
 			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
 			old_pos = old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1;
-			if(old_ins || old_ins._id) {
+			if(old_ins && old_ins._id) {
 				obj = old_ins._model.data[obj.id];
 			}
 
@@ -3888,7 +3893,7 @@
 			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
 			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
 
-			if(old_ins || old_ins._id) {
+			if(old_ins && old_ins._id) {
 				obj = old_ins._model.data[obj.id];
 			}
 
@@ -4084,11 +4089,12 @@
 		},
 		/**
 		 * put a node in edit mode (input field to rename the node)
-		 * @name edit(obj [, default_text])
+		 * @name edit(obj [, default_text, callback])
 		 * @param  {mixed} obj
-		 * @param  {String} default_text the text to populate the input with (if omitted the node text value is used)
+		 * @param  {String} default_text the text to populate the input with (if omitted or set to a non-string value the node's text value is used)
+		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node and a status parameter - true if the rename is successful, false otherwise. You can access the node's title using .text
 		 */
-		edit : function (obj, default_text) {
+		edit : function (obj, default_text, callback) {
 			var rtl, w, a, s, t, h1, h2, fn, tmp;
 			obj = this.get_node(obj);
 			if(!obj) { return false; }
@@ -4130,15 +4136,22 @@
 						},
 						"blur" : $.proxy(function () {
 							var i = s.children(".jstree-rename-input"),
-								v = i.val();
+								v = i.val(),
+								f = this.settings.core.force_text,
+								nv;
 							if(v === "") { v = t; }
 							h1.remove();
 							s.replaceWith(a);
 							s.remove();
+							t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
 							this.set_text(obj, t);
-							if(this.rename_node(obj, $('<div></div>').text(v)[this.settings.core.force_text ? 'text' : 'html']()) === false) {
+							nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
+							if(!nv) {
 								this.set_text(obj, t); // move this up? and fix #483
 							}
+							if(callback) {
+								callback.call(this, tmp, nv);
+							}
 						}, this),
 						"keydown" : function (event) {
 							var key = event.which;
@@ -4780,6 +4793,7 @@
 		 * @plugin checkbox
 		 */
 		this._undetermined = function () {
+			if(this.element === null) { return; }
 			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
 			for(i = 0, j = s.length; i < j; i++) {
 				if(m[s[i]] && m[s[i]].parents) {
@@ -6432,6 +6446,13 @@
 		 * @plugin search
 		 */
 		show_only_matches : false,
+		/**
+		 * Indicates if the children of matched element are shown (when show_only_matches is true)
+		 * This setting can be changed at runtime when calling the search method. Default is `false`.
+		 * @name $.jstree.defaults.search.show_only_matches_children
+		 * @plugin search
+		 */
+		show_only_matches_children : false,
 		/**
 		 * Indicates if all nodes opened to reveal the search result, should be closed when the search is cleared or a new search is performed. Default is `true`.
 		 * @name $.jstree.defaults.search.close_opened_onclear
@@ -6462,6 +6483,7 @@
 			this._data.search.res = [];
 			this._data.search.opn = [];
 			this._data.search.som = false;
+			this._data.search.smc = false;
 
 			this.element
 				.on('before_open.jstree', $.proxy(function (e, data) {
@@ -6478,6 +6500,9 @@
 
 								this.element.find(".jstree-node").hide().filter('.jstree-last').filter(function() { return this.nextSibling; }).removeClass('jstree-last');
 								o = o.add(this._data.search.dom);
+								if(this._data.search.smc) {
+									this._data.search.dom.children(".jstree-children").find(".jstree-node").show();
+								}
 								o.parentsUntil(".jstree").addBack().show()
 									.filter(".jstree-children").each(function () { $(this).children(".jstree-node:visible").eq(-1).addClass("jstree-last"); });
 							}
@@ -6487,6 +6512,9 @@
 						if(this._data.search.som) {
 							if(data.nodes.length) {
 								this.element.find(".jstree-node").hide().filter('.jstree-last').filter(function() { return this.nextSibling; }).removeClass('jstree-last');
+								if(this._data.search.smc) {
+									data.nodes.children(".jstree-children").find(".jstree-node").show();
+								}
 								data.nodes.parentsUntil(".jstree").addBack().show()
 									.filter(".jstree-children").each(function () { $(this).children(".jstree-node:visible").eq(-1).addClass("jstree-last"); });
 							}
@@ -6509,7 +6537,7 @@
 		 * @plugin search
 		 * @trigger search.jstree
 		 */
-		this.search = function (str, skip_async, show_only_matches, inside, append) {
+		this.search = function (str, skip_async, show_only_matches, inside, append, show_only_matches_children) {
 			if(str === false || $.trim(str.toString()) === "") {
 				return this.clear_search();
 			}
@@ -6528,6 +6556,9 @@
 			if(show_only_matches === undefined) {
 				show_only_matches = s.show_only_matches;
 			}
+			if(show_only_matches_children === undefined) {
+				show_only_matches_children = s.show_only_matches_children;
+			}
 			if(!skip_async && a !== false) {
 				if($.isFunction(a)) {
 					return a.call(this, str, $.proxy(function (d) {
@@ -6563,6 +6594,7 @@
 				this._data.search.res = [];
 				this._data.search.opn = [];
 				this._data.search.som = show_only_matches;
+				this._data.search.smc = show_only_matches_children;
 			}
 
 			f = new $.vakata.search(str, true, { caseSensitive : s.case_sensitive, fuzzy : s.fuzzy });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jstree-rails-4
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Kesha Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -92,7 +93,7 @@ files:
 - vendor/assets/javascripts/jstree.js
 - vendor/assets/stylesheets/jstree-default-dark.scss
 - vendor/assets/stylesheets/jstree-default.scss
-homepage: https://github.com/argerim/jstree-rails-4
+homepage: https://github.com/kesha-antonov/jstree-rails-4
 licenses:
 - MIT
 metadata: {}