diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c864d3c..e5b08f4ac 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.11
+**v1.10.11.6** *(2015-04-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.6/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix size of window for reporting to fgts archive.
+
**v1.10.11.5** *(2015-04-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.5/builds/4chan-X-noupdate.crx "Chromium version")]
- Reduce unwanted scrolling from captcha.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index e53fc53fb..393156e0f 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 6154503b4..aa031f68b 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.10.11.5
+// @version 1.10.11.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index ed9ca7bdf..ea41cc847 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
-// @version 1.10.11.5
+// @version 1.10.11.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.11.5',
+ VERSION: '1.10.11.6',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -11824,19 +11824,27 @@
el: a,
order: 10,
open: function(post) {
- ReportLink.url = !post.isDead ? "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post : Conf['Archive Report'] ? Redirect.to('report', {
- boardID: post.board.ID,
- postID: post.ID
- }) : void 0;
+ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
+ ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
+ ReportLink.height = 200;
+ } else if (Conf['Archive Report']) {
+ ReportLink.url = Redirect.to('report', {
+ boardID: post.board.ID,
+ postID: post.ID
+ });
+ ReportLink.height = 350;
+ } else {
+ ReportLink.url = '';
+ }
return !!ReportLink.url;
}
});
},
report: function() {
- var id, set, url;
- url = ReportLink.url;
+ var height, id, set, url;
+ url = ReportLink.url, height = ReportLink.height;
id = Date.now();
- set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=685,height=200";
+ set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
return window.open(url, id, set);
}
};
@@ -15412,7 +15420,7 @@
}
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
$.globalEval('self.close = function(){};');
- window.resizeTo(685, 320);
+ window.resizeBy(0, 350 - doc.clientHeight);
location.replace(url);
return;
}
@@ -15422,7 +15430,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
- return window.resizeTo(685, 320);
+ return window.resizeBy(0, 350 - doc.clientHeight);
}
});
return $.add(d.body, [$.tn(' ['), link, $.tn(']')]);
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index b0c0ea121..8258a5247 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 10676d2ff..c2fc0426d 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.10.11.5
+// @version 1.10.11.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.11.5',
+ VERSION: '1.10.11.6',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -11823,19 +11823,27 @@
el: a,
order: 10,
open: function(post) {
- ReportLink.url = !post.isDead ? "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post : Conf['Archive Report'] ? Redirect.to('report', {
- boardID: post.board.ID,
- postID: post.ID
- }) : void 0;
+ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
+ ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
+ ReportLink.height = 200;
+ } else if (Conf['Archive Report']) {
+ ReportLink.url = Redirect.to('report', {
+ boardID: post.board.ID,
+ postID: post.ID
+ });
+ ReportLink.height = 350;
+ } else {
+ ReportLink.url = '';
+ }
return !!ReportLink.url;
}
});
},
report: function() {
- var id, set, url;
- url = ReportLink.url;
+ var height, id, set, url;
+ url = ReportLink.url, height = ReportLink.height;
id = Date.now();
- set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=685,height=200";
+ set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
return window.open(url, id, set);
}
};
@@ -15411,7 +15419,7 @@
}
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
$.globalEval('self.close = function(){};');
- window.resizeTo(685, 320);
+ window.resizeBy(0, 350 - doc.clientHeight);
location.replace(url);
return;
}
@@ -15421,7 +15429,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
- return window.resizeTo(685, 320);
+ return window.resizeBy(0, 350 - doc.clientHeight);
}
});
return $.add(d.body, [$.tn(' ['), link, $.tn(']')]);
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 64ebede0c..674ddfa31 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index b9184cd3d..d49adfa32 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.11.5
+// @version 1.10.11.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 06163337b..686e84c60 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.10.11.5
+// @version 1.10.11.6
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.11.5',
+ VERSION: '1.10.11.6',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -11824,19 +11824,27 @@
el: a,
order: 10,
open: function(post) {
- ReportLink.url = !post.isDead ? "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post : Conf['Archive Report'] ? Redirect.to('report', {
- boardID: post.board.ID,
- postID: post.ID
- }) : void 0;
+ if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
+ ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
+ ReportLink.height = 200;
+ } else if (Conf['Archive Report']) {
+ ReportLink.url = Redirect.to('report', {
+ boardID: post.board.ID,
+ postID: post.ID
+ });
+ ReportLink.height = 350;
+ } else {
+ ReportLink.url = '';
+ }
return !!ReportLink.url;
}
});
},
report: function() {
- var id, set, url;
- url = ReportLink.url;
+ var height, id, set, url;
+ url = ReportLink.url, height = ReportLink.height;
id = Date.now();
- set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=685,height=200";
+ set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
return window.open(url, id, set);
}
};
@@ -15412,7 +15420,7 @@
}
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
$.globalEval('self.close = function(){};');
- window.resizeTo(685, 320);
+ window.resizeBy(0, 350 - doc.clientHeight);
location.replace(url);
return;
}
@@ -15422,7 +15430,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
- return window.resizeTo(685, 320);
+ return window.resizeBy(0, 350 - doc.clientHeight);
}
});
return $.add(d.body, [$.tn(' ['), link, $.tn(']')]);
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 957558295..3b343d0cb 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 917465bc2..ffba80588 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.xml b/builds/updates.xml
index 867caa650..03d37af02 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 4cedf66da..aac38cb5d 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.10.11.5",
- "date": "2015-04-27T01:01:04.114Z",
+ "version": "1.10.11.6",
+ "date": "2015-04-27T06:05:56.128Z",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",