diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js index ccac9f3e967..2905ad3fbe0 100644 --- a/backend/app/assets/javascripts/spree/backend.js +++ b/backend/app/assets/javascripts/spree/backend.js @@ -6,7 +6,6 @@ //= require jquery-ui/sortable //= require jquery-ui/autocomplete //= require jquery.cookie -//= require jquery.jstree/jquery.jstree //= require jquery.powertip //= require jquery.sticky-kit.min //= require underscore-min diff --git a/backend/app/assets/javascripts/spree/backend/taxonomy.js.coffee b/backend/app/assets/javascripts/spree/backend/taxonomy.js.coffee index 6a4eda05b27..f694120a37f 100644 --- a/backend/app/assets/javascripts/spree/backend/taxonomy.js.coffee +++ b/backend/app/assets/javascripts/spree/backend/taxonomy.js.coffee @@ -1,120 +1,93 @@ -base_url = null +taxons_template = null +Handlebars.registerHelper 'isRootTaxon', -> + !@parent_id? -tree_error_handler = (data) -> - rollback = data.rlbk - (XMLHttpRequest, textStatus, errorThrown) -> - $.jstree.rollback(rollback) - $("#ajax_error").show().html("#{server_error}
" + taxonomy_tree_error) - -handle_move = (e, data) -> - position = data.rslt.cp - node = data.rslt.o - new_parent = data.rslt.np - - url = "#{base_url}/#{node.prop("id")}" +get_taxonomy = -> Spree.ajax - type: "PUT", - dataType: "json", - url: url, - data: ({"taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }), - error: tree_error_handler(data) - - true - -handle_create = (e, data) -> - node = data.rslt.obj - name = data.rslt.name - position = data.rslt.position - new_parent = data.rslt.parent + url: "#{Spree.routes.taxonomy_path}?set=nested" +create_taxon = ({name, parent_id, child_index}) -> Spree.ajax type: "POST", dataType: "json", - url: base_url, - data: { - "taxon[name]": name, - "taxon[parent_id]": new_parent.prop("id"), - "taxon[child_index]": position, - }, - error: tree_error_handler(data) - success: (data,result) -> - node.prop('id', data.id) - -handle_rename = (e, data) -> - node = data.rslt.obj - name = data.rslt.new_name - - url = "#{base_url}/#{node.prop("id")}" + url: Spree.routes.taxonomy_taxons_path, + data: + taxon: {name, parent_id, child_index} + complete: redraw_tree +update_taxon = ({id, parent_id, child_index}) -> Spree.ajax - type: "PUT", - dataType: "json", - url: url, - data: { - "taxon[name]": name, - }, - error: tree_error_handler(data) - -handle_delete = (e, data) -> - node = data.rslt.obj - delete_url = "#{base_url}/#{node.prop("id")}" + type: "PUT" + dataType: "json" + url: "#{Spree.routes.taxonomy_taxons_path}/#{id}" + data: + taxon: {parent_id, child_index} + error: redraw_tree + +delete_taxon = ({id}) -> + Spree.ajax + type: "DELETE" + dataType: "json" + url: "#{Spree.routes.taxonomy_taxons_path}/#{id}" + error: redraw_tree + +draw_tree = (taxonomy) -> + $('#taxonomy_tree') + .html( taxons_template({ taxons: [taxonomy.root] }) ) + .find('ul') + .sortable + connectWith: '#taxonomy_tree ul' + placeholder: 'sortable-placeholder ui-state-highlight' + tolerance: 'pointer' + cursorAt: { left: 5 } + +redraw_tree = -> + get_taxonomy().done(draw_tree) + +resize_placeholder = (ui) -> + handleHeight = ui.helper.find('.sortable-handle').outerHeight() + ui.placeholder.height(handleHeight) + +restore_sort_targets = -> + $('.ui-sortable-over').removeClass('ui-sortable-over') + +highlight_sort_targets = (ui) -> + restore_sort_targets() + ui.placeholder.parents('ul').addClass('ui-sortable-over') + +handle_move = (el) -> + update_taxon + id: el.data('taxon-id') + parent_id: el.parent().closest('li').data('taxon-id') + child_index: el.index() + +handle_delete = (e) -> + el = $(e.target).closest('li') if confirm(Spree.translations.are_you_sure_delete) - Spree.ajax - type: "DELETE", - dataType: "json", - url: delete_url, - error: tree_error_handler(data) - else - $.jstree.rollback(data.rlbk) - -@setup_taxonomy_tree = (taxonomy_id) -> - if taxonomy_id != undefined - # this is defined within admin/taxonomies/edit - base_url = Spree.routes.taxonomy_taxons_path - - Spree.ajax - url: base_url.replace("/taxons", "/jstree"), - success: (taxonomy) -> - last_rollback = null + delete_taxon({id: el.data('taxon-id')}) + el.remove() - conf = - json_data: - data: taxonomy, - ajax: - headers: { "X-Spree-Token": Spree.api_key } - url: (e) -> - "#{base_url}/#{e.prop('id')}/jstree" - themes: - theme: "apple", - url: Spree.routes.jstree_theme_path - strings: - new_node: new_taxon, - loading: Spree.translations.loading + "..." - crrm: - move: - check_move: (m) -> - position = m.cp - node = m.o - new_parent = m.np +get_create_handler = (taxonomy_id) -> + handle_create = (e) -> + e.preventDefault() + name = 'New node' + parent_id = taxonomy_id + child_index = 0 + create_taxon({name, parent_id, child_index}) - # no parent or cant drag and drop - if !new_parent || node.prop("rel") == "root" - return false - - # can't drop before root - if new_parent.prop("id") == "taxonomy_tree" && position == 0 - return false - - true - contextmenu: - items: (obj) -> - taxon_tree_menu(obj, this) - plugins: ["themes", "json_data", "dnd", "crrm", "contextmenu"] - - $("#taxonomy_tree").jstree(conf) - .bind("move_node.jstree", handle_move) - .bind("remove.jstree", handle_delete) - .bind("create.jstree", handle_create) - .bind("rename.jstree", handle_rename) - .bind "loaded.jstree", -> - $(this).jstree("core").toggle_node($('.jstree-icon').first()) +@setup_taxonomy_tree = (taxonomy_id) -> + return unless taxonomy_id? + taxons_template_text = $('#taxons-list-template').text() + taxons_template = Handlebars.compile(taxons_template_text) + Handlebars.registerPartial( 'taxons', taxons_template_text ) + redraw_tree() + $('#taxonomy_tree').on + sortstart: (e, ui) -> + resize_placeholder(ui) + sortover: (e, ui) -> + highlight_sort_targets(ui) + sortstop: restore_sort_targets + sortupdate: (e, ui) -> + handle_move(ui.item) unless ui.sender? + .on('click', '.delete-taxon-button', handle_delete) + $('.add-taxon-button').on('click', get_create_handler(taxonomy_id)) diff --git a/backend/app/assets/stylesheets/spree/backend/plugins/_jstree.scss b/backend/app/assets/stylesheets/spree/backend/plugins/_jstree.scss deleted file mode 100644 index ed20a9d18e8..00000000000 --- a/backend/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +++ /dev/null @@ -1,135 +0,0 @@ -#taxonomy_tree { - > ul, .jstree-icon { - background-image: none; - } - - .jstree-icon { - @extend [class^="icon-"]:before; - @extend .fa; - } - - .jstree-open > .jstree-icon { - @extend .fa-caret-down; - } - .jstree-closed > .jstree-icon { - @extend .fa-caret-right; - } - - li { - background-image: none; - - a { - background-color: very-light($color-3); - border: 1px solid $color-border; - color: $color-body-text; - font-weight: $font-weight-bold; - text-shadow: none; - width: 90%; - height: auto; - line-height: inherit; - padding: 5px 0 5px 10px; - margin-bottom: 10px; - - .jstree-icon { - padding-left: 0px; - @extend .fa; - @extend .fa-arrows; - } - } - } -} - -#vakata-dragged.jstree-apple .jstree-invalid, -#vakata-dragged.jstree-apple .jstree-ok, -#jstree-marker { - background-image: none !important; - background-color: transparent !important; - @extend [class^="icon-"]:before; -} -#vakata-dragged.jstree-apple .jstree-invalid { - @extend .fa; - @extend .fa-bars; - color: $color-5; -} -#vakata-dragged.jstree-apple .jstree-ok { - @extend .fa; - @extend .fa-check; - color: $color-2; -} - -#jstree-marker { - @extend .fa-caret-right; - color: $color-body-text !important; - width: 4px !important; -} - -#jstree-marker-line { - height: 0px !important; - margin-left: 5px !important; - margin-top: -2px !important; - border: none !important; - border-bottom: 1px solid $color-body-text !important; - - background-color: very-light($color-3) !important; - - -webkit-box-shadow: none !important; - -moz-box-shadow: none !important; - box-shadow: none !important; - -} - -#vakata-contextmenu { - background-color: $color-3 !important; - -moz-box-shadow: none !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; - border: none !important; - border-radius: $border-radius !important; - - &:before { - content: ''; - position: absolute; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-bottom: 10px solid $color-3; - top: 0px; - margin-top: -10px; - left: 25px; - z-index: 1; - } - - a { - color: $color-1 !important; - line-height: inherit !important; - padding: 5px 10px !important; - margin: 0 !important; - font-size: 90% !important; - - &:hover { - background-color: $color-2 !important; - border: none !important; - border-radius: $border-radius !important; - -moz-box-shadow: none !important; - -webkit-box-shadow: none !important; - line-height: inherit !important; - padding: 5px 10px !important; - margin: 0 !important; - } - } - - li:first-child a:hover:before { - content: ''; - position: absolute; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-bottom: 10px solid $color-2; - top: 0px; - margin-top: -10px; - left: 25px; - z-index: 1; - } - - li.vakata-separator { - display: none; - } -} diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss b/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss new file mode 100644 index 00000000000..c18760f18f6 --- /dev/null +++ b/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss @@ -0,0 +1,60 @@ +#taxonomy_tree { + padding: 0 3em; + + &, + ul { + list-style: none; + } + + ul { + min-height: 0.5em; + } + + .ui-sortable { + margin-bottom: 0.5em; + } + + > li { + > .sortable-handle { + text-indent: 2em; + + * { + text-indent: 0; + } + } + + > .ui-sortable { + padding-bottom: 5em; + } + } + + .sortable-handle , + .sortable-placeholder { + border-radius: $border-radius; + } + + .sortable-handle { + background-color: very-light($color-3); + border: 1px solid $color-border; + color: $color-body-text; + font-weight: $font-weight-bold; + padding: 0.5em; + cursor: move; + + i { + @include margin(null 4px 0 6px); + } + + .actions a { + margin-left: 8px; + } + } + + .ui-sortable-over { + padding-bottom: 1em; + } + + .ui-sortable-handle:first-child { + margin-top: 1em; + } +} diff --git a/backend/app/assets/stylesheets/spree/backend/spree_admin.scss b/backend/app/assets/stylesheets/spree/backend/spree_admin.scss index fdafedb42a3..bd574339c0f 100644 --- a/backend/app/assets/stylesheets/spree/backend/spree_admin.scss +++ b/backend/app/assets/stylesheets/spree/backend/spree_admin.scss @@ -31,7 +31,6 @@ @import 'spree/backend/plugins/powertip'; @import 'spree/backend/plugins/select2'; @import 'spree/backend/plugins/token-input'; -@import 'spree/backend/plugins/jstree'; @import 'spree/backend/sections/adjustments_table'; @import 'spree/backend/sections/orders'; @@ -42,6 +41,7 @@ @import 'spree/backend/sections/return_authorizations'; @import 'spree/backend/sections/tax_zones'; @import 'spree/backend/sections/log_entries'; +@import 'spree/backend/sections/taxonomies'; @import 'spree/backend/sections/taxons'; @import 'spree/backend/sections/users'; @import 'spree/backend/sections/store_credits'; diff --git a/backend/app/helpers/spree/admin/navigation_helper.rb b/backend/app/helpers/spree/admin/navigation_helper.rb index 754be382900..aa75944e912 100644 --- a/backend/app/helpers/spree/admin/navigation_helper.rb +++ b/backend/app/helpers/spree/admin/navigation_helper.rb @@ -88,6 +88,7 @@ def button(text, icon_name = nil, button_type = 'submit', options={}) end def button_link_to(text, url, html_options = {}) + html_options = {class: ''}.merge(html_options) if (html_options[:method] && html_options[:method].to_s.downcase != 'get' && !html_options[:remote]) @@ -102,7 +103,7 @@ def button_link_to(text, url, html_options = {}) html_options.delete('data-update') unless html_options['data-update'] - html_options[:class] = 'button' + html_options[:class] += ' button' if html_options[:icon] html_options[:class] += " fa fa-#{html_options[:icon]}" diff --git a/backend/app/views/spree/admin/taxonomies/edit.erb b/backend/app/views/spree/admin/taxonomies/edit.erb index 34e1971936a..1e01ae62358 100644 --- a/backend/app/views/spree/admin/taxonomies/edit.erb +++ b/backend/app/views/spree/admin/taxonomies/edit.erb @@ -1,5 +1,6 @@ <%= render :partial => 'spree/admin/shared/configuration_menu' %> +<%= render :partial => 'spree/admin/taxons/list_template' %> <%= render :partial => 'js_head' %> <% content_for :page_title do %> @@ -10,6 +11,9 @@
  • <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
    • +
  • + <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { icon: 'plus', class: 'add-taxon-button' } %> +
    • <% end %> @@ -26,14 +30,11 @@
    - <%= label_tag nil, Spree.t(:tree) %>
    - -
    <%= Spree.t(:taxonomy_tree_instruction) %>
    <% end %> diff --git a/backend/app/views/spree/admin/taxons/_list_template.html.erb b/backend/app/views/spree/admin/taxons/_list_template.html.erb new file mode 100644 index 00000000000..0a16ea4ddb5 --- /dev/null +++ b/backend/app/views/spree/admin/taxons/_list_template.html.erb @@ -0,0 +1,17 @@ + diff --git a/backend/lib/spree/backend/engine.rb b/backend/lib/spree/backend/engine.rb index 1f045082540..a963f109ae3 100644 --- a/backend/lib/spree/backend/engine.rb +++ b/backend/lib/spree/backend/engine.rb @@ -20,7 +20,6 @@ class Engine < ::Rails::Engine spree/backend/address_states.js jqPlot/excanvas.min.js spree/backend/images/new.js - jquery.jstree/themes/apple/* fontawesome-webfont* select2_locale* ] diff --git a/backend/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js b/backend/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js deleted file mode 100755 index d5d2ea91551..00000000000 --- a/backend/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +++ /dev/null @@ -1,4540 +0,0 @@ -/* - * jsTree 1.0-rc3 - * http://jstree.com/ - * - * Copyright (c) 2010 Ivan Bozhanov (vakata.com) - * - * Licensed same as jquery - under the terms of either the MIT License or the GPL Version 2 License - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * $Date: 2011-02-09 01:17:14 +0200 (ср, 09 февр 2011) $ - * $Revision: 236 $ - */ - -/*jslint browser: true, onevar: true, undef: true, bitwise: true, strict: true */ -/*global window : false, clearInterval: false, clearTimeout: false, document: false, setInterval: false, setTimeout: false, jQuery: false, navigator: false, XSLTProcessor: false, DOMParser: false, XMLSerializer: false*/ - -"use strict"; - -// top wrapper to prevent multiple inclusion (is this OK?) -(function () { if(jQuery && jQuery.jstree) { return; } - var is_ie6 = false, is_ie7 = false, is_ff2 = false; - -/* - * jsTree core - */ -(function ($) { - // Common functions not related to jsTree - // decided to move them to a `vakata` "namespace" - $.vakata = {}; - // CSS related functions - $.vakata.css = { - get_css : function(rule_name, delete_flag, sheet) { - rule_name = rule_name.toLowerCase(); - var css_rules = sheet.cssRules || sheet.rules, - j = 0; - do { - if(css_rules.length && j > css_rules.length + 5) { return false; } - if(css_rules[j].selectorText && css_rules[j].selectorText.toLowerCase() == rule_name) { - if(delete_flag === true) { - if(sheet.removeRule) { sheet.removeRule(j); } - if(sheet.deleteRule) { sheet.deleteRule(j); } - return true; - } - else { return css_rules[j]; } - } - } - while (css_rules[++j]); - return false; - }, - add_css : function(rule_name, sheet) { - if($.jstree.css.get_css(rule_name, false, sheet)) { return false; } - if(sheet.insertRule) { sheet.insertRule(rule_name + ' { }', 0); } else { sheet.addRule(rule_name, null, 0); } - return $.vakata.css.get_css(rule_name); - }, - remove_css : function(rule_name, sheet) { - return $.vakata.css.get_css(rule_name, true, sheet); - }, - add_sheet : function(opts) { - var tmp = false, is_new = true; - if(opts.str) { - if(opts.title) { tmp = $("style[id='" + opts.title + "-stylesheet']")[0]; } - if(tmp) { is_new = false; } - else { - tmp = document.createElement("style"); - tmp.setAttribute('type',"text/css"); - if(opts.title) { tmp.setAttribute("id", opts.title + "-stylesheet"); } - } - if(tmp.styleSheet) { - if(is_new) { - document.getElementsByTagName("head")[0].appendChild(tmp); - tmp.styleSheet.cssText = opts.str; - } - else { - tmp.styleSheet.cssText = tmp.styleSheet.cssText + " " + opts.str; - } - } - else { - tmp.appendChild(document.createTextNode(opts.str)); - document.getElementsByTagName("head")[0].appendChild(tmp); - } - return tmp.sheet || tmp.styleSheet; - } - if(opts.url) { - if(document.createStyleSheet) { - try { tmp = document.createStyleSheet(opts.url); } catch (e) { } - } - else { - tmp = document.createElement('link'); - tmp.rel = 'stylesheet'; - tmp.type = 'text/css'; - tmp.media = "all"; - tmp.href = opts.url; - document.getElementsByTagName("head")[0].appendChild(tmp); - return tmp.styleSheet; - } - } - } - }; - - // private variables - var instances = [], // instance array (used by $.jstree.reference/create/focused) - focused_instance = -1, // the index in the instance array of the currently focused instance - plugins = {}, // list of included plugins - prepared_move = {}; // for the move_node function - - // jQuery plugin wrapper (thanks to jquery UI widget function) - $.fn.jstree = function (settings) { - var isMethodCall = (typeof settings == 'string'), // is this a method call like $().jstree("open_node") - args = Array.prototype.slice.call(arguments, 1), - returnValue = this; - - // if a method call execute the method on all selected instances - if(isMethodCall) { - if(settings.substring(0, 1) == '_') { return returnValue; } - this.each(function() { - var instance = instances[$.data(this, "jstree-instance-id")], - methodValue = (instance && $.isFunction(instance[settings])) ? instance[settings].apply(instance, args) : instance; - if(typeof methodValue !== "undefined" && (settings.indexOf("is_") === 0 || (methodValue !== true && methodValue !== false))) { returnValue = methodValue; return false; } - }); - } - else { - this.each(function() { - // extend settings and allow for multiple hashes and $.data - var instance_id = $.data(this, "jstree-instance-id"), - a = [], - b = settings ? $.extend({}, true, settings) : {}, - c = $(this), - s = false, - t = []; - a = a.concat(args); - if(c.data("jstree")) { a.push(c.data("jstree")); } - b = a.length ? $.extend.apply(null, [true, b].concat(a)) : b; - - // if an instance already exists, destroy it first - if(typeof instance_id !== "undefined" && instances[instance_id]) { instances[instance_id].destroy(); } - // push a new empty object to the instances array - instance_id = parseInt(instances.push({}),10) - 1; - // store the jstree instance id to the container element - $.data(this, "jstree-instance-id", instance_id); - // clean up all plugins - b.plugins = $.isArray(b.plugins) ? b.plugins : $.jstree.defaults.plugins.slice(); - b.plugins.unshift("core"); - // only unique plugins - b.plugins = b.plugins.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(","); - - // extend defaults with passed data - s = $.extend(true, {}, $.jstree.defaults, b); - s.plugins = b.plugins; - $.each(plugins, function (i, val) { - if($.inArray(i, s.plugins) === -1) { s[i] = null; delete s[i]; } - else { t.push(i); } - }); - s.plugins = t; - - // push the new object to the instances array (at the same time set the default classes to the container) and init - instances[instance_id] = new $.jstree._instance(instance_id, $(this).addClass("jstree jstree-" + instance_id), s); - // init all activated plugins for this instance - $.each(instances[instance_id]._get_settings().plugins, function (i, val) { instances[instance_id].data[val] = {}; }); - $.each(instances[instance_id]._get_settings().plugins, function (i, val) { if(plugins[val]) { plugins[val].__init.apply(instances[instance_id]); } }); - // initialize the instance - setTimeout(function() { instances[instance_id].init(); }, 0); - }); - } - // return the jquery selection (or if it was a method call that returned a value - the returned value) - return returnValue; - }; - // object to store exposed functions and objects - $.jstree = { - defaults : { - plugins : [] - }, - _focused : function () { return instances[focused_instance] || null; }, - _reference : function (needle) { - // get by instance id - if(instances[needle]) { return instances[needle]; } - // get by DOM (if still no luck - return null - var o = $(needle); - if(!o.length && typeof needle === "string") { o = $("#" + needle); } - if(!o.length) { return null; } - return instances[o.closest(".jstree").data("jstree-instance-id")] || null; - }, - _instance : function (index, container, settings) { - // for plugins to store data in - this.data = { core : {} }; - this.get_settings = function () { return $.extend(true, {}, settings); }; - this._get_settings = function () { return settings; }; - this.get_index = function () { return index; }; - this.get_container = function () { return container; }; - this.get_container_ul = function () { return container.children("ul:eq(0)"); }; - this._set_settings = function (s) { - settings = $.extend(true, {}, settings, s); - }; - }, - _fn : { }, - plugin : function (pname, pdata) { - pdata = $.extend({}, { - __init : $.noop, - __destroy : $.noop, - _fn : {}, - defaults : false - }, pdata); - plugins[pname] = pdata; - - $.jstree.defaults[pname] = pdata.defaults; - $.each(pdata._fn, function (i, val) { - val.plugin = pname; - val.old = $.jstree._fn[i]; - $.jstree._fn[i] = function () { - var rslt, - func = val, - args = Array.prototype.slice.call(arguments), - evnt = new $.Event("before.jstree"), - rlbk = false; - - if(this.data.core.locked === true && i !== "unlock" && i !== "is_locked") { return; } - - // Check if function belongs to the included plugins of this instance - do { - if(func && func.plugin && $.inArray(func.plugin, this._get_settings().plugins) !== -1) { break; } - func = func.old; - } while(func); - if(!func) { return; } - - // context and function to trigger events, then finally call the function - if(i.indexOf("_") === 0) { - rslt = func.apply(this, args); - } - else { - rslt = this.get_container().triggerHandler(evnt, { "func" : i, "inst" : this, "args" : args, "plugin" : func.plugin }); - if(rslt === false) { return; } - if(typeof rslt !== "undefined") { args = rslt; } - - rslt = func.apply( - $.extend({}, this, { - __callback : function (data) { - this.get_container().triggerHandler( i + '.jstree', { "inst" : this, "args" : args, "rslt" : data, "rlbk" : rlbk }); - }, - __rollback : function () { - rlbk = this.get_rollback(); - return rlbk; - }, - __call_old : function (replace_arguments) { - return func.old.apply(this, (replace_arguments ? Array.prototype.slice.call(arguments, 1) : args ) ); - } - }), args); - } - - // return the result - return rslt; - }; - $.jstree._fn[i].old = val.old; - $.jstree._fn[i].plugin = pname; - }); - }, - rollback : function (rb) { - if(rb) { - if(!$.isArray(rb)) { rb = [ rb ]; } - $.each(rb, function (i, val) { - instances[val.i].set_rollback(val.h, val.d); - }); - } - } - }; - // set the prototype for all instances - $.jstree._fn = $.jstree._instance.prototype = {}; - - // load the css when DOM is ready - $(function() { - // code is copied from jQuery ($.browser is deprecated + there is a bug in IE) - var u = navigator.userAgent.toLowerCase(), - v = (u.match( /.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1], - css_string = '' + - '.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } ' + - '.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; } ' + - '.jstree-rtl li { margin-left:0; margin-right:18px; } ' + - '.jstree > ul > li { margin-left:0px; } ' + - '.jstree-rtl > ul > li { margin-right:0px; } ' + - '.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } ' + - '.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' + - '.jstree a:focus { outline: none; } ' + - '.jstree a > ins { height:16px; width:16px; } ' + - '.jstree a > .jstree-icon { margin-right:3px; } ' + - '.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } ' + - 'li.jstree-open > ul { display:block; } ' + - 'li.jstree-closed > ul { display:none; } '; - // Correct IE 6 (does not support the > CSS selector) - if(/msie/.test(u) && parseInt(v, 10) == 6) { - is_ie6 = true; - - // fix image flicker and lack of caching - try { - document.execCommand("BackgroundImageCache", false, true); - } catch (err) { } - - css_string += '' + - '.jstree li { height:18px; margin-left:0; margin-right:0; } ' + - '.jstree li li { margin-left:18px; } ' + - '.jstree-rtl li li { margin-left:0px; margin-right:18px; } ' + - 'li.jstree-open ul { display:block; } ' + - 'li.jstree-closed ul { display:none !important; } ' + - '.jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } ' + - '.jstree li a ins { height:16px; width:16px; margin-right:3px; } ' + - '.jstree-rtl li a ins { margin-right:0px; margin-left:3px; } '; - } - // Correct IE 7 (shifts anchor nodes onhover) - if(/msie/.test(u) && parseInt(v, 10) == 7) { - is_ie7 = true; - css_string += '.jstree li a { border-width:0 !important; padding:0px 2px !important; } '; - } - // correct ff2 lack of display:inline-block - if(!/compatible/.test(u) && /mozilla/.test(u) && parseFloat(v, 10) < 1.9) { - is_ff2 = true; - css_string += '' + - '.jstree ins { display:-moz-inline-box; } ' + - '.jstree li { line-height:12px; } ' + // WHY?? - '.jstree a { display:-moz-inline-box; } ' + - '.jstree .jstree-no-icons .jstree-checkbox { display:-moz-inline-stack !important; } '; - /* this shouldn't be here as it is theme specific */ - } - // the default stylesheet - $.vakata.css.add_sheet({ str : css_string, title : "jstree" }); - }); - - // core functions (open, close, create, update, delete) - $.jstree.plugin("core", { - __init : function () { - this.data.core.locked = false; - this.data.core.to_open = this.get_settings().core.initially_open; - this.data.core.to_load = this.get_settings().core.initially_load; - }, - defaults : { - html_titles : false, - animation : 500, - initially_open : [], - initially_load : [], - open_parents : true, - notify_plugins : true, - rtl : false, - load_open : false, - strings : { - loading : "Loading ...", - new_node : "New node", - multiple_selection : "Multiple selection" - } - }, - _fn : { - init : function () { - this.set_focus(); - if(this._get_settings().core.rtl) { - this.get_container().addClass("jstree-rtl").css("direction", "rtl"); - } - this.get_container().html(""); - this.data.core.li_height = this.get_container_ul().find("li.jstree-closed, li.jstree-leaf").eq(0).height() || 18; - - this.get_container() - .delegate("li > ins", "click.jstree", $.proxy(function (event) { - var trgt = $(event.target); - if(trgt.is("ins") && event.pageY - trgt.offset().top < this.data.core.li_height) { this.toggle_node(trgt); } - }, this)) - .bind("mousedown.jstree", $.proxy(function () { - this.set_focus(); // This used to be setTimeout(set_focus,0) - why? - }, this)) - .bind("dblclick.jstree", function (event) { - var sel; - if(document.selection && document.selection.empty) { document.selection.empty(); } - else { - if(window.getSelection) { - sel = window.getSelection(); - try { - sel.removeAllRanges(); - sel.collapse(); - } catch (err) { } - } - } - }); - if(this._get_settings().core.notify_plugins) { - this.get_container() - .bind("load_node.jstree", $.proxy(function (e, data) { - var o = this._get_node(data.rslt.obj), - t = this; - if(o === -1) { o = this.get_container_ul(); } - if(!o.length) { return; } - o.find("li").each(function () { - var th = $(this); - if(th.data("jstree")) { - $.each(th.data("jstree"), function (plugin, values) { - if(t.data[plugin] && $.isFunction(t["_" + plugin + "_notify"])) { - t["_" + plugin + "_notify"].call(t, th, values); - } - }); - } - }); - }, this)); - } - if(this._get_settings().core.load_open) { - this.get_container() - .bind("load_node.jstree", $.proxy(function (e, data) { - var o = this._get_node(data.rslt.obj), - t = this; - if(o === -1) { o = this.get_container_ul(); } - if(!o.length) { return; } - o.find("li.jstree-open:not(:has(ul))").each(function () { - t.load_node(this, $.noop, $.noop); - }); - }, this)); - } - this.__callback(); - this.load_node(-1, function () { this.loaded(); this.reload_nodes(); }); - }, - destroy : function () { - var i, - n = this.get_index(), - s = this._get_settings(), - _this = this; - - $.each(s.plugins, function (i, val) { - try { plugins[val].__destroy.apply(_this); } catch(err) { } - }); - this.__callback(); - // set focus to another instance if this one is focused - if(this.is_focused()) { - for(i in instances) { - if(instances.hasOwnProperty(i) && i != n) { - instances[i].set_focus(); - break; - } - } - } - // if no other instance found - if(n === focused_instance) { focused_instance = -1; } - // remove all traces of jstree in the DOM (only the ones set using jstree*) and cleans all events - this.get_container() - .unbind(".jstree") - .undelegate(".jstree") - .removeData("jstree-instance-id") - .find("[class^='jstree']") - .andSelf() - .attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); }); - $(document) - .unbind(".jstree-" + n) - .undelegate(".jstree-" + n); - // remove the actual data - instances[n] = null; - delete instances[n]; - }, - - _core_notify : function (n, data) { - if(data.opened) { - this.open_node(n, false, true); - } - }, - - lock : function () { - this.data.core.locked = true; - this.get_container().children("ul").addClass("jstree-locked").css("opacity","0.7"); - this.__callback({}); - }, - unlock : function () { - this.data.core.locked = false; - this.get_container().children("ul").removeClass("jstree-locked").css("opacity","1"); - this.__callback({}); - }, - is_locked : function () { return this.data.core.locked; }, - save_opened : function () { - var _this = this; - this.data.core.to_open = []; - this.get_container_ul().find("li.jstree-open").each(function () { - if(this.id) { _this.data.core.to_open.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); } - }); - this.__callback(_this.data.core.to_open); - }, - save_loaded : function () { }, - reload_nodes : function (is_callback) { - var _this = this, - done = true, - current = [], - remaining = []; - if(!is_callback) { - this.data.core.reopen = false; - this.data.core.refreshing = true; - this.data.core.to_open = $.map($.makeArray(this.data.core.to_open), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); }); - this.data.core.to_load = $.map($.makeArray(this.data.core.to_load), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); }); - if(this.data.core.to_open.length) { - this.data.core.to_load = this.data.core.to_load.concat(this.data.core.to_open); - } - } - if(this.data.core.to_load.length) { - $.each(this.data.core.to_load, function (i, val) { - if(val == "#") { return true; } - if($(val).length) { current.push(val); } - else { remaining.push(val); } - }); - if(current.length) { - this.data.core.to_load = remaining; - $.each(current, function (i, val) { - if(!_this._is_loaded(val)) { - _this.load_node(val, function () { _this.reload_nodes(true); }, function () { _this.reload_nodes(true); }); - done = false; - } - }); - } - } - if(this.data.core.to_open.length) { - $.each(this.data.core.to_open, function (i, val) { - _this.open_node(val, false, true); - }); - } - if(done) { - // TODO: find a more elegant approach to syncronizing returning requests - if(this.data.core.reopen) { clearTimeout(this.data.core.reopen); } - this.data.core.reopen = setTimeout(function () { _this.__callback({}, _this); }, 50); - this.data.core.refreshing = false; - this.reopen(); - } - }, - reopen : function () { - var _this = this; - if(this.data.core.to_open.length) { - $.each(this.data.core.to_open, function (i, val) { - _this.open_node(val, false, true); - }); - } - this.__callback({}); - }, - refresh : function (obj) { - var _this = this; - this.save_opened(); - if(!obj) { obj = -1; } - obj = this._get_node(obj); - if(!obj) { obj = -1; } - if(obj !== -1) { obj.children("UL").remove(); } - else { this.get_container_ul().empty(); } - this.load_node(obj, function () { _this.__callback({ "obj" : obj}); _this.reload_nodes(); }); - }, - // Dummy function to fire after the first load (so that there is a jstree.loaded event) - loaded : function () { - this.__callback(); - }, - // deal with focus - set_focus : function () { - if(this.is_focused()) { return; } - var f = $.jstree._focused(); - if(f) { f.unset_focus(); } - - this.get_container().addClass("jstree-focused"); - focused_instance = this.get_index(); - this.__callback(); - }, - is_focused : function () { - return focused_instance == this.get_index(); - }, - unset_focus : function () { - if(this.is_focused()) { - this.get_container().removeClass("jstree-focused"); - focused_instance = -1; - } - this.__callback(); - }, - - // traverse - _get_node : function (obj) { - var $obj = $(obj, this.get_container()); - if($obj.is(".jstree") || obj == -1) { return -1; } - $obj = $obj.closest("li", this.get_container()); - return $obj.length ? $obj : false; - }, - _get_next : function (obj, strict) { - obj = this._get_node(obj); - if(obj === -1) { return this.get_container().find("> ul > li:first-child"); } - if(!obj.length) { return false; } - if(strict) { return (obj.nextAll("li").size() > 0) ? obj.nextAll("li:eq(0)") : false; } - - if(obj.hasClass("jstree-open")) { return obj.find("li:eq(0)"); } - else if(obj.nextAll("li").size() > 0) { return obj.nextAll("li:eq(0)"); } - else { return obj.parentsUntil(".jstree","li").next("li").eq(0); } - }, - _get_prev : function (obj, strict) { - obj = this._get_node(obj); - if(obj === -1) { return this.get_container().find("> ul > li:last-child"); } - if(!obj.length) { return false; } - if(strict) { return (obj.prevAll("li").length > 0) ? obj.prevAll("li:eq(0)") : false; } - - if(obj.prev("li").length) { - obj = obj.prev("li").eq(0); - while(obj.hasClass("jstree-open")) { obj = obj.children("ul:eq(0)").children("li:last"); } - return obj; - } - else { var o = obj.parentsUntil(".jstree","li:eq(0)"); return o.length ? o : false; } - }, - _get_parent : function (obj) { - obj = this._get_node(obj); - if(obj == -1 || !obj.length) { return false; } - var o = obj.parentsUntil(".jstree", "li:eq(0)"); - return o.length ? o : -1; - }, - _get_children : function (obj) { - obj = this._get_node(obj); - if(obj === -1) { return this.get_container().children("ul:eq(0)").children("li"); } - if(!obj.length) { return false; } - return obj.children("ul:eq(0)").children("li"); - }, - get_path : function (obj, id_mode) { - var p = [], - _this = this; - obj = this._get_node(obj); - if(obj === -1 || !obj || !obj.length) { return false; } - obj.parentsUntil(".jstree", "li").each(function () { - p.push( id_mode ? this.id : _this.get_text(this) ); - }); - p.reverse(); - p.push( id_mode ? obj.attr("id") : this.get_text(obj) ); - return p; - }, - - // string functions - _get_string : function (key) { - return this._get_settings().core.strings[key] || key; - }, - - is_open : function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-open"); }, - is_closed : function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-closed"); }, - is_leaf : function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-leaf"); }, - correct_state : function (obj) { - obj = this._get_node(obj); - if(!obj || obj === -1) { return false; } - obj.removeClass("jstree-closed jstree-open").addClass("jstree-leaf").children("ul").remove(); - this.__callback({ "obj" : obj }); - }, - // open/close - open_node : function (obj, callback, skip_animation) { - obj = this._get_node(obj); - if(!obj.length) { return false; } - if(!obj.hasClass("jstree-closed")) { if(callback) { callback.call(); } return false; } - var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation, - t = this; - if(!this._is_loaded(obj)) { - obj.children("a").addClass("jstree-loading"); - this.load_node(obj, function () { t.open_node(obj, callback, skip_animation); }, callback); - } - else { - if(this._get_settings().core.open_parents) { - obj.parentsUntil(".jstree",".jstree-closed").each(function () { - t.open_node(this, false, true); - }); - } - if(s) { obj.children("ul").css("display","none"); } - obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading"); - if(s) { obj.children("ul").stop(true, true).slideDown(s, function () { this.style.display = ""; t.after_open(obj); }); } - else { t.after_open(obj); } - this.__callback({ "obj" : obj }); - if(callback) { callback.call(); } - } - }, - after_open : function (obj) { this.__callback({ "obj" : obj }); }, - close_node : function (obj, skip_animation) { - obj = this._get_node(obj); - var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation, - t = this; - if(!obj.length || !obj.hasClass("jstree-open")) { return false; } - if(s) { obj.children("ul").attr("style","display:block !important"); } - obj.removeClass("jstree-open").addClass("jstree-closed"); - if(s) { obj.children("ul").stop(true, true).slideUp(s, function () { this.style.display = ""; t.after_close(obj); }); } - else { t.after_close(obj); } - this.__callback({ "obj" : obj }); - }, - after_close : function (obj) { this.__callback({ "obj" : obj }); }, - toggle_node : function (obj) { - obj = this._get_node(obj); - if(obj.hasClass("jstree-closed")) { return this.open_node(obj); } - if(obj.hasClass("jstree-open")) { return this.close_node(obj); } - }, - open_all : function (obj, do_animation, original_obj) { - obj = obj ? this._get_node(obj) : -1; - if(!obj || obj === -1) { obj = this.get_container_ul(); } - if(original_obj) { - obj = obj.find("li.jstree-closed"); - } - else { - original_obj = obj; - if(obj.is(".jstree-closed")) { obj = obj.find("li.jstree-closed").andSelf(); } - else { obj = obj.find("li.jstree-closed"); } - } - var _this = this; - obj.each(function () { - var __this = this; - if(!_this._is_loaded(this)) { _this.open_node(this, function() { _this.open_all(__this, do_animation, original_obj); }, !do_animation); } - else { _this.open_node(this, false, !do_animation); } - }); - // so that callback is fired AFTER all nodes are open - if(original_obj.find('li.jstree-closed').length === 0) { this.__callback({ "obj" : original_obj }); } - }, - close_all : function (obj, do_animation) { - var _this = this; - obj = obj ? this._get_node(obj) : this.get_container(); - if(!obj || obj === -1) { obj = this.get_container_ul(); } - obj.find("li.jstree-open").andSelf().each(function () { _this.close_node(this, !do_animation); }); - this.__callback({ "obj" : obj }); - }, - clean_node : function (obj) { - obj = obj && obj != -1 ? $(obj) : this.get_container_ul(); - obj = obj.is("li") ? obj.find("li").andSelf() : obj.find("li"); - obj.removeClass("jstree-last") - .filter("li:last-child").addClass("jstree-last").end() - .filter(":has(li)") - .not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed"); - obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove(); - this.__callback({ "obj" : obj }); - }, - // rollback - get_rollback : function () { - this.__callback(); - return { i : this.get_index(), h : this.get_container().children("ul").clone(true), d : this.data }; - }, - set_rollback : function (html, data) { - this.get_container().empty().append(html); - this.data = data; - this.__callback(); - }, - // Dummy functions to be overwritten by any datastore plugin included - load_node : function (obj, s_call, e_call) { this.__callback({ "obj" : obj }); }, - _is_loaded : function (obj) { return true; }, - - // Basic operations: create - create_node : function (obj, position, js, callback, is_loaded) { - obj = this._get_node(obj); - position = typeof position === "undefined" ? "last" : position; - var d = $("
  • "), - s = this._get_settings().core, - tmp; - - if(obj !== -1 && !obj.length) { return false; } - if(!is_loaded && !this._is_loaded(obj)) { this.load_node(obj, function () { this.create_node(obj, position, js, callback, true); }); return false; } - - this.__rollback(); - - if(typeof js === "string") { js = { "data" : js }; } - if(!js) { js = {}; } - if(js.attr) { d.attr(js.attr); } - if(js.metadata) { d.data(js.metadata); } - if(js.state) { d.addClass("jstree-" + js.state); } - if(!js.data) { js.data = this._get_string("new_node"); } - if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); } - $.each(js.data, function (i, m) { - tmp = $(""); - if($.isFunction(m)) { m = m.call(this, js); } - if(typeof m == "string") { tmp.attr('href','#')[ s.html_titles ? "html" : "text" ](m); } - else { - if(!m.attr) { m.attr = {}; } - if(!m.attr.href) { m.attr.href = '#'; } - tmp.attr(m.attr)[ s.html_titles ? "html" : "text" ](m.title); - if(m.language) { tmp.addClass(m.language); } - } - tmp.prepend(" "); - if(m.icon) { - if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); } - else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); } - } - d.append(tmp); - }); - d.prepend(" "); - if(obj === -1) { - obj = this.get_container(); - if(position === "before") { position = "first"; } - if(position === "after") { position = "last"; } - } - switch(position) { - case "before": obj.before(d); tmp = this._get_parent(obj); break; - case "after" : obj.after(d); tmp = this._get_parent(obj); break; - case "inside": - case "first" : - if(!obj.children("ul").length) { obj.append("