From 2390251e5991ec8f60bc69c47a57b9878e8dc9ea Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 4 Jan 2012 22:12:46 +0100 Subject: [PATCH] Shave a line, don't repeat $.extend. --- 4chan_x.user.js | 76 +++++++++++++++++++++++-------------------------- script.coffee | 7 ++--- 2 files changed, 39 insertions(+), 44 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 1e3f2c462..87e1c61d0 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -475,48 +475,44 @@ $.cache.requests = {}; - if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) { - $.extend($, { - "delete": function(name) { - name = NAMESPACE + name; - return GM_deleteValue(name); - }, - get: function(name, defaultValue) { - var value; - name = NAMESPACE + name; - if (value = GM_getValue(name)) { - return JSON.parse(value); - } else { - return defaultValue; - } - }, - set: function(name, value) { - name = NAMESPACE + name; - localStorage[name] = JSON.stringify(value); - return GM_setValue(name, JSON.stringify(value)); + $.extend($, typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null ? { + "delete": function(name) { + name = NAMESPACE + name; + return GM_deleteValue(name); + }, + get: function(name, defaultValue) { + var value; + name = NAMESPACE + name; + if (value = GM_getValue(name)) { + return JSON.parse(value); + } else { + return defaultValue; } - }); - } else { - $.extend($, { - "delete": function(name) { - name = NAMESPACE + name; - return delete localStorage[name]; - }, - get: function(name, defaultValue) { - var value; - name = NAMESPACE + name; - if (value = localStorage[name]) { - return JSON.parse(value); - } else { - return defaultValue; - } - }, - set: function(name, value) { - name = NAMESPACE + name; - return localStorage[name] = JSON.stringify(value); + }, + set: function(name, value) { + name = NAMESPACE + name; + localStorage[name] = JSON.stringify(value); + return GM_setValue(name, JSON.stringify(value)); + } + } : { + "delete": function(name) { + name = NAMESPACE + name; + return delete localStorage[name]; + }, + get: function(name, defaultValue) { + var value; + name = NAMESPACE + name; + if (value = localStorage[name]) { + return JSON.parse(value); + } else { + return defaultValue; } - }); - } + }, + set: function(name, value) { + name = NAMESPACE + name; + return localStorage[name] = JSON.stringify(value); + } + }); for (key in conf) { val = conf[key]; diff --git a/script.coffee b/script.coffee index 2b95d9565..00c31dfa7 100644 --- a/script.coffee +++ b/script.coffee @@ -358,8 +358,8 @@ $.extend $, $.cache.requests = {} -if GM_deleteValue? - $.extend $, +$.extend $, + if GM_deleteValue? delete: (name) -> name = NAMESPACE + name GM_deleteValue name @@ -374,8 +374,7 @@ if GM_deleteValue? # for `storage` events localStorage[name] = JSON.stringify value GM_setValue name, JSON.stringify value -else - $.extend $, + else delete: (name) -> name = NAMESPACE + name delete localStorage[name]