Comparing version 3.3.5 to 3.3.6
{ | ||
"name": "jstree", | ||
"license": "MIT", | ||
"version": "3.3.5", | ||
"version": "3.3.6", | ||
"main" : [ | ||
@@ -6,0 +6,0 @@ "./dist/jstree.js", |
@@ -5,3 +5,3 @@ { | ||
"description": "jsTree is jquery plugin, that provides interactive trees.", | ||
"version": "3.3.5", | ||
"version": "3.3.6", | ||
"license": "MIT", | ||
@@ -8,0 +8,0 @@ "keywords": [ |
/*global module:false, require:false, __dirname:false*/ | ||
var _ = require('lodash'); | ||
@@ -32,3 +33,3 @@ module.exports = function(grunt) { | ||
options: { | ||
banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> - (<%= _.pluck(pkg.licenses, "type").join(", ") %>) */\n', | ||
banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> - (<%= _.map(pkg.licenses, "type").join(", ") %>) */\n', | ||
preserveComments: false, | ||
@@ -38,3 +39,3 @@ //sourceMap: "dist/jstree.min.map", | ||
report: "min", | ||
beautify: { | ||
output: { | ||
ascii_only: true | ||
@@ -200,3 +201,3 @@ }, | ||
this.files.forEach(function (f) { | ||
s = f.src; | ||
s = f.src[0]; | ||
d = f.dest; | ||
@@ -238,3 +239,3 @@ }); | ||
grunt.util.linefeed = "\n"; | ||
// Default task. | ||
@@ -241,0 +242,0 @@ grunt.registerTask('default', ['jshint:beforeconcat','concat','amd','jshint:afterconcat','copy:libs','uglify','less','imagemin','replace','copy:docs','qunit','resemble','dox']); |
@@ -5,3 +5,3 @@ { | ||
"description": "Tree view for jQuery", | ||
"version": "3.3.5", | ||
"version": "3.3.6", | ||
"homepage": "http://jstree.com", | ||
@@ -8,0 +8,0 @@ "keywords": [ |
@@ -5,3 +5,3 @@ { | ||
"description": "jQuery tree plugin", | ||
"version": "3.3.5", | ||
"version": "3.3.6", | ||
"homepage": "http://jstree.com", | ||
@@ -30,15 +30,15 @@ "main": "./dist/jstree.js", | ||
"devDependencies": { | ||
"dox": "~0.4.4", | ||
"grunt": "~0.4.0", | ||
"dox": "~0.9.0", | ||
"grunt": "~1.0.0", | ||
"grunt-contrib-concat": "*", | ||
"grunt-contrib-copy": "*", | ||
"grunt-contrib-imagemin": "~0.4.0", | ||
"grunt-contrib-imagemin": "~2.0.1", | ||
"grunt-contrib-jshint": "*", | ||
"grunt-contrib-less": "~0.8.2", | ||
"grunt-contrib-qunit": "~v0.3.0", | ||
"grunt-contrib-less": "~1.4.1", | ||
"grunt-contrib-qunit": "~2.0.0", | ||
"grunt-contrib-uglify": "*", | ||
"grunt-contrib-watch": "~0.5.3", | ||
"grunt-phantomcss-gitdiff": "0.0.7", | ||
"grunt-contrib-watch": "~1.1.0", | ||
"grunt-resemble-cli": "0.0.8", | ||
"grunt-text-replace": "~0.3.11" | ||
"grunt-text-replace": "~0.4.0", | ||
"lodash": "^4.17.10" | ||
}, | ||
@@ -45,0 +45,0 @@ "dependencies": { |
@@ -65,4 +65,4 @@ # jstree | ||
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.3/themes/default/style.min.css" /> | ||
<script src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.3/jstree.min.js"></script> | ||
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.5/themes/default/style.min.css" /> | ||
<script src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.5/jstree.min.js"></script> | ||
``` | ||
@@ -69,0 +69,0 @@ |
@@ -967,3 +967,3 @@ /** | ||
this.refresh = function (skip_loading, forget_state) { | ||
if(!this.settings.checkbox.tie_selection) { | ||
if(this.settings.checkbox.tie_selection) { | ||
this._data.checkbox.selected = []; | ||
@@ -970,0 +970,0 @@ } |
@@ -486,3 +486,3 @@ /** | ||
if(vakata_context.items.length) { | ||
vakata_context.element.appendTo("body"); | ||
vakata_context.element.appendTo(document.body); | ||
e = vakata_context.element; | ||
@@ -543,3 +543,3 @@ x = vakata_context.position_x; | ||
$(function () { | ||
right_to_left = $("body").css("direction") === "rtl"; | ||
right_to_left = $(document.body).css("direction") === "rtl"; | ||
var to = false; | ||
@@ -546,0 +546,0 @@ |
@@ -184,2 +184,14 @@ /** | ||
$(document) | ||
.on('dragover.vakata.jstree', function (e) { | ||
if (elm) { | ||
$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg }); | ||
} | ||
}) | ||
.on('drop.vakata.jstree', function (e) { | ||
if (elm) { | ||
$.vakata.dnd._trigger('stop', e, { 'helper': $(), 'element': elm, 'data': drg }); | ||
elm = null; | ||
drg = null; | ||
} | ||
}) | ||
.on('dnd_start.vakata.jstree', function (e, data) { | ||
@@ -189,3 +201,3 @@ lastmv = false; | ||
if(!data || !data.data || !data.data.jstree) { return; } | ||
marker.appendTo('body'); //.show(); | ||
marker.appendTo(document.body); //.show(); | ||
}) | ||
@@ -324,3 +336,3 @@ .on('dnd_move.vakata.jstree', function (e, data) { | ||
if (data.event.originalEvent && data.event.originalEvent.dataTransfer) { | ||
data.event.originalEvent.dataTransfer.dropEffect = 'none'; | ||
//data.event.originalEvent.dataTransfer.dropEffect = 'none'; | ||
} | ||
@@ -536,3 +548,3 @@ marker.hide(); | ||
if(vakata_dnd.helper) { | ||
vakata_dnd.helper.appendTo("body"); | ||
vakata_dnd.helper.appendTo(document.body); | ||
vakata_dnd.helper_w = vakata_dnd.helper.outerWidth(); | ||
@@ -539,0 +551,0 @@ } |
@@ -629,2 +629,30 @@ /* global jQuery */ | ||
})); | ||
// conditional close | ||
(function (factory) { | ||
"use strict"; | ||
if (typeof define === 'function' && define.amd) { | ||
define('jstree.conditionalclose', ['jquery','jstree'], factory); | ||
} | ||
else if(typeof exports === 'object') { | ||
factory(require('jquery'), require('jstree')); | ||
} | ||
else { | ||
factory(jQuery, jQuery.jstree); | ||
} | ||
}(function ($, jstree, undefined) { | ||
"use strict"; | ||
if($.jstree.plugins.conditionalclose) { return; } | ||
$.jstree.defaults.conditionalclose = function () { return true; }; | ||
$.jstree.plugins.conditionalclose = function (options, parent) { | ||
// own function | ||
this.close_node = function (obj, animation) { | ||
if(this.settings.conditionalclose.close.call(this, this.get_node(obj), e)) { | ||
return parent.deselect_node.call(this, obj, animation); | ||
} | ||
}; | ||
}; | ||
})); |
@@ -14,3 +14,3 @@ (function (factory) { | ||
"use strict"; | ||
if(document.registerElement && Object && Object.create) { | ||
if((window.customElements || document.registerElement) && Object && Object.create) { | ||
var proto = Object.create(HTMLElement.prototype); | ||
@@ -36,5 +36,8 @@ proto.createdCallback = function () { | ||
try { | ||
window.customElements.define("vakata-jstree", function() {}, { prototype: proto }); | ||
} catch (ignore) { } | ||
try { | ||
document.registerElement("vakata-jstree", { prototype: proto }); | ||
} catch(ignore) { } | ||
} catch (ignore) { } | ||
} | ||
})); |
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 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 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
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1222916
25296