From cf786f282ed6b701e4ad34e6a71cee66e06ab078 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 25 Oct 2014 21:59:17 +0100 Subject: [PATCH] remove cookie processing --- Netdisco/lib/App/Netdisco/Web/Device.pm | 27 ------ .../share/public/javascripts/jquery.cookie.js | 96 ------------------- Netdisco/share/views/layouts/main.tt | 1 - 3 files changed, 124 deletions(-) delete mode 100644 Netdisco/share/public/javascripts/jquery.cookie.js diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm index e4fccf93..f7d9e07f 100644 --- a/Netdisco/lib/App/Netdisco/Web/Device.pm +++ b/Netdisco/lib/App/Netdisco/Web/Device.pm @@ -58,33 +58,6 @@ hook 'before' => sub { return unless (index(request->path, uri_for('/device')->path) == 0 or index(request->path, uri_for('/ajax/content/device')->path) == 0); - # override ports form defaults with cookie settings - - my $cookie = (cookie('nd_ports-form') || ''); - my $cdata = url_params_mixed($cookie); - - if ($cdata and ref {} eq ref $cdata and not param('reset')) { - foreach my $item (@{ var('port_columns') }) { - my $key = $item->{name}; - next unless defined $cdata->{$key} - and $cdata->{$key} =~ m/^[[:alnum:]_]+$/; - $item->{default} = $cdata->{$key}; - } - - foreach my $item (@{ var('connected_properties') }) { - my $key = $item->{name}; - next unless defined $cdata->{$key} - and $cdata->{$key} =~ m/^[[:alnum:]_]+$/; - $item->{default} = $cdata->{$key}; - } - - foreach my $key (qw/age_num age_unit mac_format/) { - params->{$key} ||= $cdata->{$key} - if defined $cdata->{$key} - and $cdata->{$key} =~ m/^[[:alnum:]_]+$/; - } - } - # copy ports form defaults into request query params if this is # a redirect from within the application (tab param is not set) diff --git a/Netdisco/share/public/javascripts/jquery.cookie.js b/Netdisco/share/public/javascripts/jquery.cookie.js deleted file mode 100644 index f8f852cd..00000000 --- a/Netdisco/share/public/javascripts/jquery.cookie.js +++ /dev/null @@ -1,96 +0,0 @@ -/*! - * jQuery Cookie Plugin v1.3.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. Register as anonymous module. - define(['jquery'], factory); - } else { - // Browser globals. - factory(jQuery); - } -}(function ($) { - - var pluses = /\+/g; - - function decode(s) { - if (config.raw) { - return s; - } - return decodeURIComponent(s.replace(pluses, ' ')); - } - - function decodeAndParse(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape... - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - - s = decode(s); - - try { - return config.json ? JSON.parse(s) : s; - } catch(e) {} - } - - var config = $.cookie = function (key, value, options) { - - // Write - if (value !== undefined) { - options = $.extend({}, config.defaults, options); - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = config.json ? JSON.stringify(value) : String(value); - - return (document.cookie = [ - config.raw ? key : encodeURIComponent(key), - '=', - config.raw ? value : encodeURIComponent(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 cookies = document.cookie.split('; '); - var result = key ? undefined : {}; - 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) { - result = decodeAndParse(cookie); - break; - } - - if (!key) { - result[name] = decodeAndParse(cookie); - } - } - - return result; - }; - - config.defaults = {}; - - $.removeCookie = function (key, options) { - if ($.cookie(key) !== undefined) { - // Must not alter options, thus extending a fresh object... - $.cookie(key, '', $.extend({}, options, { expires: -1 })); - return true; - } - return false; - }; - -})); diff --git a/Netdisco/share/views/layouts/main.tt b/Netdisco/share/views/layouts/main.tt index 3dd49bdb..b584dc70 100644 --- a/Netdisco/share/views/layouts/main.tt +++ b/Netdisco/share/views/layouts/main.tt @@ -15,7 +15,6 @@ -