From 6750437071f93d71d4d667b535cfa5ce32d5716d Mon Sep 17 00:00:00 2001 From: ahodesuka Date: Wed, 9 May 2012 03:37:31 -0500 Subject: [PATCH] Revert 'Move $.open by rest of the GM_ functions. Coffeescript.' --- 4chan_x.user.js | 9 +++------ script.coffee | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 48149a363..bbbccf8d6 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -450,6 +450,9 @@ el.removeEventListener(event, handler, false); } }, + open: function(url) { + return (GM_openInTab || window.open)(location.protocol + url, '_blank'); + }, isDST: function() { /* http://en.wikipedia.org/wiki/Eastern_Time_Zone @@ -518,9 +521,6 @@ return defaultValue; } }, - open: function(url) { - return GM_openInTab(location.protocol + url); - }, set: function(name, value) { name = Main.namespace + name; localStorage.setItem(name, JSON.stringify(value)); @@ -540,9 +540,6 @@ }, set: function(name, value) { return localStorage.setItem(Main.namespace + name, JSON.stringify(value)); - }, - open: function(url) { - return window.open(location.protocol + url, '_blank'); } }); diff --git a/script.coffee b/script.coffee index 36db6c35b..022c8f4ef 100644 --- a/script.coffee +++ b/script.coffee @@ -347,6 +347,8 @@ $.extend $, for event in events.split ' ' el.removeEventListener event, handler, false return + open: (url) -> + (GM_openInTab or window.open) url, '_blank' isDST: -> ### http://en.wikipedia.org/wiki/Eastern_Time_Zone @@ -418,8 +420,6 @@ $.extend $, JSON.parse value else defaultValue - open: (url) -> - GM_openInTab location.protocol + url set: (name, value) -> name = Main.namespace + name # for `storage` events @@ -435,8 +435,6 @@ $.extend $, defaultValue set: (name, value) -> localStorage.setItem Main.namespace + name, JSON.stringify value - open: (url) -> - window.open location.protocol + url, '_blank' $$ = (selector, root=d.body) -> Array::slice.call root.querySelectorAll selector