diff --git a/bower.json b/bower.json index 0ae05af..ecfef3c 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,6 @@ "license": "MIT", "dependencies": { "jqtree": "~1.1.0", - "jquery.cookie": "~1.4.1", "jqTreeContextMenu": "https://github.com/DavidUv/jqTreeContextMenu" }, "overrides": { diff --git a/ps_tree/static/css/vendor/jqtree.css b/ps_tree/static/css/vendor/jqtree.css index 81720bf..071f3de 100644 --- a/ps_tree/static/css/vendor/jqtree.css +++ b/ps_tree/static/css/vendor/jqtree.css @@ -143,4 +143,4 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover { ul.jqtree-tree .jqtree-moving > .jqtree-element .jqtree-title { outline: dashed 1px #0000ff; -} \ No newline at end of file +} diff --git a/ps_tree/static/js/__ps_tree.js b/ps_tree/static/js/__ps_tree.js index 314811a..26f2c5d 100644 --- a/ps_tree/static/js/__ps_tree.js +++ b/ps_tree/static/js/__ps_tree.js @@ -3,8 +3,6 @@ if (typeof $ === 'undefined') { require('jquery'); } -require('./vendor/jquery.cookie.js'); - (function($){ $(window).load(function(){ @@ -21,7 +19,6 @@ require('./vendor/jquery.cookie.js'); 'async': false }); - $tree .on('tree.init', function(){ var treeData = $tree.tree('getTree'); @@ -91,6 +88,7 @@ require('./vendor/jquery.cookie.js'); } } else { window.location = event.node.url_update; + localStorage.clear(); } if(selectedNodes === allNodes){ @@ -164,126 +162,7 @@ require('./vendor/jquery.cookie.js'); }); })(jQuery); -},{"./vendor/jquery.cookie.js":2,"jquery":3}],2:[function(require,module,exports){ -/*! - * jQuery Cookie Plugin v1.4.1 - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2013 Klaus Hartl - * Released under the MIT license - */ -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD - define(['jquery'], factory); - } else if (typeof exports === 'object') { - // CommonJS - factory(require('jquery')); - } else { - // Browser globals - factory(jQuery); - } -}(function ($) { - - var pluses = /\+/g; - - function encode(s) { - return config.raw ? s : encodeURIComponent(s); - } - - function decode(s) { - return config.raw ? s : decodeURIComponent(s); - } - - function stringifyCookieValue(value) { - return encode(config.json ? JSON.stringify(value) : String(value)); - } - - function parseCookieValue(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape... - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - - try { - // Replace server-side written pluses with spaces. - // If we can't decode the cookie, ignore it, it's unusable. - // If we can't parse the cookie, ignore it, it's unusable. - s = decodeURIComponent(s.replace(pluses, ' ')); - return config.json ? JSON.parse(s) : s; - } catch(e) {} - } - - function read(s, converter) { - var value = config.raw ? s : parseCookieValue(s); - return $.isFunction(converter) ? converter(value) : value; - } - - var config = $.cookie = function (key, value, options) { - - // Write - - if (value !== undefined && !$.isFunction(value)) { - options = $.extend({}, config.defaults, options); - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setTime(+t + days * 864e+5); - } - - return (document.cookie = [ - encode(key), '=', stringifyCookieValue(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // Read - - var result = key ? undefined : {}; - - // To prevent the for loop in the first place assign an empty array - // in case there are no cookies at all. Also prevents odd result when - // calling $.cookie(). - var cookies = document.cookie ? document.cookie.split('; ') : []; - - for (var i = 0, l = cookies.length; i < l; i++) { - var parts = cookies[i].split('='); - var name = decode(parts.shift()); - var cookie = parts.join('='); - - if (key && key === name) { - // If second argument (value) is a function it's a converter... - result = read(cookie, value); - break; - } - - // Prevent storing a cookie that we couldn't decode. - if (!key && (cookie = read(cookie)) !== undefined) { - result[name] = cookie; - } - } - - return result; - }; - - config.defaults = {}; - - $.removeCookie = function (key, options) { - if ($.cookie(key) === undefined) { - return false; - } - - // Must not alter options, thus extending a fresh object... - $.cookie(key, '', $.extend({}, options, { expires: -1 })); - return !$.cookie(key); - }; - -})); - -},{"jquery":3}],3:[function(require,module,exports){ +},{"jquery":2}],2:[function(require,module,exports){ (function (global){ ; var __browserify_shim_require__=require;(function browserifyShim(module, exports, require, define, browserify_shim__define__module__export__) { /*! diff --git a/ps_tree/static/js/main.js b/ps_tree/static/js/main.js index 02eb20b..b172e1f 100644 --- a/ps_tree/static/js/main.js +++ b/ps_tree/static/js/main.js @@ -2,8 +2,6 @@ if (typeof $ === 'undefined') { require('jquery'); } -require('./vendor/jquery.cookie.js'); - (function($){ $(window).load(function(){ @@ -20,7 +18,6 @@ require('./vendor/jquery.cookie.js'); 'async': false }); - $tree .on('tree.init', function(){ var treeData = $tree.tree('getTree'); @@ -90,6 +87,7 @@ require('./vendor/jquery.cookie.js'); } } else { window.location = event.node.url_update; + localStorage.clear(); } if(selectedNodes === allNodes){ diff --git a/ps_tree/static/js/vendor/jquery.cookie.js b/ps_tree/static/js/vendor/jquery.cookie.js deleted file mode 100644 index c7f3a59..0000000 --- a/ps_tree/static/js/vendor/jquery.cookie.js +++ /dev/null @@ -1,117 +0,0 @@ -/*! - * jQuery Cookie Plugin v1.4.1 - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2013 Klaus Hartl - * Released under the MIT license - */ -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD - define(['jquery'], factory); - } else if (typeof exports === 'object') { - // CommonJS - factory(require('jquery')); - } else { - // Browser globals - factory(jQuery); - } -}(function ($) { - - var pluses = /\+/g; - - function encode(s) { - return config.raw ? s : encodeURIComponent(s); - } - - function decode(s) { - return config.raw ? s : decodeURIComponent(s); - } - - function stringifyCookieValue(value) { - return encode(config.json ? JSON.stringify(value) : String(value)); - } - - function parseCookieValue(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape... - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - - try { - // Replace server-side written pluses with spaces. - // If we can't decode the cookie, ignore it, it's unusable. - // If we can't parse the cookie, ignore it, it's unusable. - s = decodeURIComponent(s.replace(pluses, ' ')); - return config.json ? JSON.parse(s) : s; - } catch(e) {} - } - - function read(s, converter) { - var value = config.raw ? s : parseCookieValue(s); - return $.isFunction(converter) ? converter(value) : value; - } - - var config = $.cookie = function (key, value, options) { - - // Write - - if (value !== undefined && !$.isFunction(value)) { - options = $.extend({}, config.defaults, options); - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setTime(+t + days * 864e+5); - } - - return (document.cookie = [ - encode(key), '=', stringifyCookieValue(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // Read - - var result = key ? undefined : {}; - - // To prevent the for loop in the first place assign an empty array - // in case there are no cookies at all. Also prevents odd result when - // calling $.cookie(). - var cookies = document.cookie ? document.cookie.split('; ') : []; - - for (var i = 0, l = cookies.length; i < l; i++) { - var parts = cookies[i].split('='); - var name = decode(parts.shift()); - var cookie = parts.join('='); - - if (key && key === name) { - // If second argument (value) is a function it's a converter... - result = read(cookie, value); - break; - } - - // Prevent storing a cookie that we couldn't decode. - if (!key && (cookie = read(cookie)) !== undefined) { - result[name] = cookie; - } - } - - return result; - }; - - config.defaults = {}; - - $.removeCookie = function (key, options) { - if ($.cookie(key) === undefined) { - return false; - } - - // Must not alter options, thus extending a fresh object... - $.cookie(key, '', $.extend({}, options, { expires: -1 })); - return !$.cookie(key); - }; - -}));