jstree-rails-4 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c8869f306a834bdbbd828f0fcb7bb7d1812f6e
-  data.tar.gz: f0cf31ae828d584665f444ff7de9b746e6a74e4d
+  metadata.gz: c1e9d439c433e0e91591181a28c2d1566af266d5
+  data.tar.gz: 01462dc6cff505dfe2d6b9d0b45680a1fc044ee9
 SHA512:
-  metadata.gz: 295125af3463ddbbdc35d455f266cbfc5e2b4d54e26a232dc0f4ee359ac9b3915319a6ebe0aac35ded73994989526c761f9ec191a46f4d329c16e4b7badbd9d1
-  data.tar.gz: 7ed4f4caa2d2ea716ca982d62a8f52ff9dd23867b6e86be1dc5638c6ac97d95b0f4347af18a2ce89f92bdcae49d26ea741ed924547e726e24b18e10bef4b271b
+  metadata.gz: 06b491753a2641a14febe0fbc791394d4afe40b067e9009488e3a0ad1a6659eae1a3a6454930f44739ee0c0d82d8f5d78711a8b87bd7e4788cd070d46e91abb3
+  data.tar.gz: 3b04097c8b81b31cb62175437bbdc2196423211c2daacd38612252544de7b0090aaf17a8a6427f68f259fd03ce8dbf3dbd9a2df9e5808740de617c84dbd6785d

data/README.md

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

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

@@ -1,5 +1,5 @@
 module JSTree
   module Rails
-    VERSION = '3.2.0'
+    VERSION = '3.2.1'
   end
 end

data/vendor/assets/javascripts/jstree.js

@@ -13,7 +13,7 @@
 }(function ($, undefined) {
 	"use strict";
 /*!
- * jsTree 3.2.0
+ * jsTree 3.2.1
  * http://jstree.com/
  *
  * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
@@ -28,6 +28,7 @@
 
 	// prevent another load? maybe there is a better way?
 	if($.jstree) {
+		return;
 	}
 
 	/**
@@ -70,7 +71,7 @@
 		 * specifies the jstree version in use
 		 * @name $.jstree.version
 		 */
-		version : '3.2.0',
+		version : '3.2.1',
 		/**
 		 * holds all the default options used when creating new instances
 		 * @name $.jstree.defaults
@@ -672,7 +673,7 @@
 								e.preventDefault();
 								this.element.find('.jstree-anchor').filter(':visible').last().focus();
 								break;
-							/*
+							/*!
 							// delete
 							case 46:
 								e.preventDefault();
@@ -2581,6 +2582,7 @@
 					 */
 					this.trigger("after_open", { "node" : obj });
 				}
+				return true;
 			}
 		},
 		/**
@@ -2897,7 +2899,7 @@
 		 * @name hide_all()
 		 * @trigger hide_all.jstree
 		 */
-		hide_all : function (obj) {
+		hide_all : function (skip_redraw) {
 			var i, m = this._model.data, ids = [];
 			for(i in m) {
 				if(m.hasOwnProperty(i) && i !== $.jstree.root && !m[i].state.hidden) {
@@ -2906,7 +2908,9 @@
 				}
 			}
 			this._model.force_full_redraw = true;
-			this.redraw();
+			if(!skip_redraw) {
+				this.redraw();
+			}
 			/**
 			 * triggered when all nodes are hidden
 			 * @event
@@ -2921,7 +2925,7 @@
 		 * @name show_all()
 		 * @trigger show_all.jstree
 		 */
-		show_all : function (obj) {
+		show_all : function (skip_redraw) {
 			var i, m = this._model.data, ids = [];
 			for(i in m) {
 				if(m.hasOwnProperty(i) && i !== $.jstree.root && m[i].state.hidden) {
@@ -2930,7 +2934,9 @@
 				}
 			}
 			this._model.force_full_redraw = true;
-			this.redraw();
+			if(!skip_redraw) {
+				this.redraw();
+			}
 			/**
 			 * triggered when all nodes are shown
 			 * @event
@@ -4943,12 +4949,12 @@
 							var p = this.get_node(data.parent),
 								m = this._model.data,
 								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
-							while(p && p.id !== $.jstree.root) {
+							while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
 								c = 0;
 								for(i = 0, j = p.children.length; i < j; i++) {
 									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
 								}
-								if(c === j) {
+								if(j > 0 && c === j) {
 									p.state[ t ? 'selected' : 'checked' ] = true;
 									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
 									tmp = this.get_node(p, true);
@@ -4971,12 +4977,12 @@
 								p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
 							if(!is_multi) {
 								p = this.get_node(old_par);
-								while(p && p.id !== $.jstree.root) {
+								while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
 									c = 0;
 									for(i = 0, j = p.children.length; i < j; i++) {
 										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
 									}
-									if(c === j) {
+									if(j > 0 && c === j) {
 										p.state[ t ? 'selected' : 'checked' ] = true;
 										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
 										tmp = this.get_node(p, true);
@@ -5581,7 +5587,7 @@
 					"separator_after"	: false,
 					"_disabled"			: false, //(this.check("rename_node", data.reference, this.get_parent(data.reference), "")),
 					"label"				: "Rename",
-					/*
+					/*!
 					"shortcut"			: 113,
 					"shortcut_label"	: 'F2',
 					"icon"				: "glyphicon glyphicon-leaf",
@@ -5713,7 +5719,7 @@
 						}
 					});
 
-			/*
+			/*!
 			if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
 				var el = null, tm = null;
 				this.element
@@ -6854,7 +6860,7 @@
 								}
 							}
 							p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
-							this._data.search.hdn = this.hide_all();
+							this._data.search.hdn = this.hide_all(true);
 							this.show_node(p);
 						}
 					}, this))
@@ -6945,7 +6951,11 @@
 			});
 			if(r.length) {
 				p = $.vakata.array_unique(p);
-				this._search_open(p);
+				for(i = 0, j = p.length; i < j; i++) {
+					if(p[i] !== $.jstree.root && m[p[i]] && this.open_node(p[i], null, 0) === true) {
+						this._data.search.opn.push(p[i]);
+					}
+				}
 				if(!append) {
 					this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #')));
 					this._data.search.res = r;
@@ -6998,26 +7008,6 @@
 			this._data.search.opn = [];
 			this._data.search.dom = $();
 		};
-		/**
-		 * opens nodes that need to be opened to reveal the search results. Used only internally.
-		 * @private
-		 * @name _search_open(d)
-		 * @param {Array} d an array of node IDs
-		 * @plugin search
-		 */
-		this._search_open = function (d) {
-			var t = this;
-			$.each(d.concat([]), function (i, v) {
-				if(v === $.jstree.root) { return true; }
-				try { v = $('#' + v.replace($.jstree.idregex,'\\$&'), t.element); } catch(ignore) { }
-				if(v && v.length) {
-					if(t.is_closed(v)) {
-						t._data.search.opn.push(v[0].id);
-						t.open_node(v, function () { t._search_open(d); }, 0);
-					}
-				}
-			});
-		};
 
 		this.redraw_node = function(obj, deep, callback, force_render) {
 			obj = parent.redraw_node.apply(this, arguments);
@@ -7788,5 +7778,4 @@
 		} catch(ignore) { }
 	}
 
-	return $.fn.jstree;
 }));

data/vendor/assets/stylesheets/jstree-default-dark.scss

@@ -395,7 +395,7 @@
 }
 .jstree-default-dark .jstree-node,
 .jstree-default-dark .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
 }
 .jstree-default-dark .jstree-node {
   background-position: -292px -4px;
@@ -500,13 +500,13 @@
   background-position: 0 0;
 }
 .jstree-default-dark > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default-dark/throbber.gif") center center no-repeat;
 }
 .jstree-default-dark .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
+  background: image-url("default-dark/32px.png") -100px -68px no-repeat;
 }
 .jstree-default-dark .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
+  background: image-url("default-dark/32px.png") -260px -4px no-repeat;
 }
 .jstree-default-dark > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -518,7 +518,7 @@
 }
 #jstree-dnd.jstree-default-dark .jstree-ok,
 #jstree-dnd.jstree-default-dark .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -568,7 +568,7 @@
 }
 .jstree-default-dark-small .jstree-node,
 .jstree-default-dark-small .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
 }
 .jstree-default-dark-small .jstree-node {
   background-position: -295px -7px;
@@ -673,13 +673,13 @@
   background-position: 0 0;
 }
 .jstree-default-dark-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default-dark/throbber.gif") center center no-repeat;
 }
 .jstree-default-dark-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
+  background: image-url("default-dark/32px.png") -103px -71px no-repeat;
 }
 .jstree-default-dark-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
+  background: image-url("default-dark/32px.png") -263px -7px no-repeat;
 }
 .jstree-default-dark-small > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -691,7 +691,7 @@
 }
 #jstree-dnd.jstree-default-dark-small .jstree-ok,
 #jstree-dnd.jstree-default-dark-small .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -741,7 +741,7 @@
 }
 .jstree-default-dark-large .jstree-node,
 .jstree-default-dark-large .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
 }
 .jstree-default-dark-large .jstree-node {
   background-position: -288px 0px;
@@ -846,13 +846,13 @@
   background-position: 0 0;
 }
 .jstree-default-dark-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default-dark/throbber.gif") center center no-repeat;
 }
 .jstree-default-dark-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
+  background: image-url("default-dark/32px.png") -96px -64px no-repeat;
 }
 .jstree-default-dark-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
+  background: image-url("default-dark/32px.png") -256px 0px no-repeat;
 }
 .jstree-default-dark-large > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -864,7 +864,7 @@
 }
 #jstree-dnd.jstree-default-dark-large .jstree-ok,
 #jstree-dnd.jstree-default-dark-large .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default-dark/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -899,12 +899,12 @@
     height: 40px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
+    background-image: image-url("default-dark/40px.png");
     background-position: 0 -200px;
     background-size: 120px 240px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
+    background-image: image-url("default-dark/40px.png");
     background-position: -40px -200px;
     background-size: 120px 240px;
   }
@@ -923,7 +923,7 @@
 	*/
   }
   .jstree-default-dark-responsive .jstree-icon {
-    background-image: url("40px.png");
+    background-image: image-url("default-dark/40px.png");
   }
   .jstree-default-dark-responsive .jstree-node,
   .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
@@ -1025,7 +1025,7 @@
   .jstree-default-dark-responsive .jstree-node > .jstree-ocl,
   .jstree-default-dark-responsive .jstree-themeicon,
   .jstree-default-dark-responsive .jstree-checkbox {
-    background-image: url("40px.png");
+    background-image: image-url("default-dark/40px.png");
     background-size: 120px 240px;
   }
   .jstree-default-dark-responsive .jstree-node {
@@ -1047,11 +1047,11 @@
     background-position: 0 0;
   }
   .jstree-default-dark-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
+    background: image-url("default-dark/40px.png") 0 -160px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-dark-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
+    background: image-url("default-dark/40px.png") -40px -40px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-dark-responsive > .jstree-container-ul > .jstree-node {

data/vendor/assets/stylesheets/jstree-default.scss

@@ -395,7 +395,7 @@
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
 }
 .jstree-default .jstree-node {
   background-position: -292px -4px;
@@ -500,13 +500,13 @@
   background-position: 0 0;
 }
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default/throbber.gif") center center no-repeat;
 }
 .jstree-default .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
+  background: image-url("default/32px.png") -100px -68px no-repeat;
 }
 .jstree-default .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
+  background: image-url("default/32px.png") -260px -4px no-repeat;
 }
 .jstree-default > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -518,7 +518,7 @@
 }
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -568,7 +568,7 @@
 }
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
 }
 .jstree-default-small .jstree-node {
   background-position: -295px -7px;
@@ -673,13 +673,13 @@
   background-position: 0 0;
 }
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default/throbber.gif") center center no-repeat;
 }
 .jstree-default-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
+  background: image-url("default/32px.png") -103px -71px no-repeat;
 }
 .jstree-default-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
+  background: image-url("default/32px.png") -263px -7px no-repeat;
 }
 .jstree-default-small > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -691,7 +691,7 @@
 }
 #jstree-dnd.jstree-default-small .jstree-ok,
 #jstree-dnd.jstree-default-small .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -741,7 +741,7 @@
 }
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
 }
 .jstree-default-large .jstree-node {
   background-position: -288px 0px;
@@ -846,13 +846,13 @@
   background-position: 0 0;
 }
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: image-url("default/throbber.gif") center center no-repeat;
 }
 .jstree-default-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
+  background: image-url("default/32px.png") -96px -64px no-repeat;
 }
 .jstree-default-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
+  background: image-url("default/32px.png") -256px 0px no-repeat;
 }
 .jstree-default-large > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -864,7 +864,7 @@
 }
 #jstree-dnd.jstree-default-large .jstree-ok,
 #jstree-dnd.jstree-default-large .jstree-er {
-  background-image: url("32px.png");
+  background-image: image-url("default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -899,12 +899,12 @@
     height: 40px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
+    background-image: image-url("default/40px.png");
     background-position: 0 -200px;
     background-size: 120px 240px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
+    background-image: image-url("default/40px.png");
     background-position: -40px -200px;
     background-size: 120px 240px;
   }
@@ -923,7 +923,7 @@
 	*/
   }
   .jstree-default-responsive .jstree-icon {
-    background-image: url("40px.png");
+    background-image: image-url("default/40px.png");
   }
   .jstree-default-responsive .jstree-node,
   .jstree-default-responsive .jstree-leaf > .jstree-ocl {
@@ -1025,7 +1025,7 @@
   .jstree-default-responsive .jstree-node > .jstree-ocl,
   .jstree-default-responsive .jstree-themeicon,
   .jstree-default-responsive .jstree-checkbox {
-    background-image: url("40px.png");
+    background-image: image-url("default/40px.png");
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-node {
@@ -1047,11 +1047,11 @@
     background-position: 0 0;
   }
   .jstree-default-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
+    background: image-url("default/40px.png") 0 -160px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
+    background: image-url("default/40px.png") -40px -40px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive > .jstree-container-ul > .jstree-node {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jstree-rails-4
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Kesha Antonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor