Comparing version 3.3.0 to 3.3.1
{ | ||
"name": "jstree", | ||
"version": "3.3.0", | ||
"version": "3.3.1", | ||
"main" : [ | ||
@@ -5,0 +5,0 @@ "./dist/jstree.js", |
@@ -5,3 +5,3 @@ { | ||
"description": "jsTree is jquery plugin, that provides interactive trees.", | ||
"version": "3.3.0", | ||
"version": "3.3.1", | ||
"license": "MIT", | ||
@@ -8,0 +8,0 @@ "keywords": [ |
@@ -5,3 +5,3 @@ { | ||
"description": "Tree view for jQuery", | ||
"version": "3.3.0", | ||
"version": "3.3.1", | ||
"homepage": "http://jstree.com", | ||
@@ -8,0 +8,0 @@ "keywords": [ |
@@ -5,3 +5,3 @@ { | ||
"description": "jQuery tree plugin", | ||
"version": "3.3.0", | ||
"version": "3.3.1", | ||
"homepage": "http://jstree.com", | ||
@@ -8,0 +8,0 @@ "main": "./dist/jstree.js", |
@@ -172,2 +172,5 @@ /** | ||
.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e, data) { | ||
if (e.target.tagName.toLowerCase() === 'input') { | ||
return; | ||
} | ||
e.preventDefault(); | ||
@@ -174,0 +177,0 @@ last_ts = e.ctrlKey ? +new Date() : 0; |
@@ -100,3 +100,3 @@ /** | ||
if(this._data.search.som && data.res.length) { | ||
var m = this._model.data, i, j, p = []; | ||
var m = this._model.data, i, j, p = [], k, l; | ||
for(i = 0, j = data.res.length; i < j; i++) { | ||
@@ -107,3 +107,7 @@ if(m[data.res[i]] && !m[data.res[i]].state.hidden) { | ||
if(this._data.search.smc) { | ||
p = p.concat(m[data.res[i]].children_d); | ||
for (k = 0, l = m[data.res[i]].children_d.length; k < l; k++) { | ||
if (m[m[data.res[i]].children_d[k]] && !m[m[data.res[i]].children_d[k]].state.hidden) { | ||
p.push(m[data.res[i]].children_d[k]); | ||
} | ||
} | ||
} | ||
@@ -199,3 +203,3 @@ } | ||
var v = m[i]; | ||
if(v.text && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0)) && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) ) { | ||
if(v.text && !v.state.hidden && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0)) && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) ) { | ||
r.push(i); | ||
@@ -202,0 +206,0 @@ p = p.concat(v.parents); |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1290867
24282