Merge branch 'master' into next

This commit is contained in:
ccd0 2016-10-09 04:26:54 -07:00
commit 25c30120b2
14 changed files with 22 additions and 19 deletions

View File

@ -4,6 +4,9 @@
## v1.13.0 ## v1.13.0
**v1.13.0.9** *(2016-10-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.9/builds/4chan-X-noupdate.crx)]
- Fix bug from v1.13.0.0 that broke Quote Inlining / Previewing of OPs on /f/.
**v1.13.0.8** *(2016-10-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.8/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.8/builds/4chan-X-noupdate.crx)] **v1.13.0.8** *(2016-10-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.8/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.8/builds/4chan-X-noupdate.crx)]
- (AchtBit) Add keybind for toggling custom cooldown (default: `Alt+Comma`). - (AchtBit) Add keybind for toggling custom cooldown (default: `Alt+Comma`).
- Add keybind to post file from URL (default: `Alt+l`). - Add keybind to post file from URL (default: `Alt+l`).

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.0.8 // @version 1.13.0.9
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.0.8 // @version 1.13.0.9
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.0.8', VERSION: '1.13.0.9',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -6128,7 +6128,7 @@ Post = (function() {
_Class.prototype.isClone = true; _Class.prototype.isClone = true;
function _Class(origin, context, contractThumb) { function _Class(origin, context, contractThumb) {
var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, root, val; var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, ref5, root, val;
this.origin = origin; this.origin = origin;
this.context = context; this.context = context;
ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply']; ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply'];
@ -6178,7 +6178,7 @@ Post = (function() {
this.file.text = fileRoot.firstElementChild; this.file.text = fileRoot.firstElementChild;
this.file.link = $('.fileText > a, .fileText-original', fileRoot); this.file.link = $('.fileText > a, .fileText-original', fileRoot);
this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot); this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot);
this.file.thumbLink = this.file.thumb.parentNode; this.file.thumbLink = (ref5 = this.file.thumb) != null ? ref5.parentNode : void 0;
this.file.fullImage = $('.full-image', fileRoot); this.file.fullImage = $('.full-image', fileRoot);
this.file.videoControls = $('.video-controls', this.file.text); this.file.videoControls = $('.video-controls', this.file.text);
if (this.file.videoThumb) { if (this.file.videoThumb) {

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.0.8 // @version 1.13.0.9
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.0.8', VERSION: '1.13.0.9',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -6128,7 +6128,7 @@ Post = (function() {
_Class.prototype.isClone = true; _Class.prototype.isClone = true;
function _Class(origin, context, contractThumb) { function _Class(origin, context, contractThumb) {
var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, root, val; var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, ref5, root, val;
this.origin = origin; this.origin = origin;
this.context = context; this.context = context;
ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply']; ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply'];
@ -6178,7 +6178,7 @@ Post = (function() {
this.file.text = fileRoot.firstElementChild; this.file.text = fileRoot.firstElementChild;
this.file.link = $('.fileText > a, .fileText-original', fileRoot); this.file.link = $('.fileText > a, .fileText-original', fileRoot);
this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot); this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot);
this.file.thumbLink = this.file.thumb.parentNode; this.file.thumbLink = (ref5 = this.file.thumb) != null ? ref5.parentNode : void 0;
this.file.fullImage = $('.full-image', fileRoot); this.file.fullImage = $('.full-image', fileRoot);
this.file.videoControls = $('.video-controls', this.file.text); this.file.videoControls = $('.video-controls', this.file.text);
if (this.file.videoThumb) { if (this.file.videoThumb) {

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.0.8 // @version 1.13.0.9
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.0.8 // @version 1.13.0.9
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -136,7 +136,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.0.8', VERSION: '1.13.0.9',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -6128,7 +6128,7 @@ Post = (function() {
_Class.prototype.isClone = true; _Class.prototype.isClone = true;
function _Class(origin, context, contractThumb) { function _Class(origin, context, contractThumb) {
var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, root, val; var base, fileRoot, i, inline, inlined, j, k, key, l, len, len1, len2, len3, node, nodes, ref, ref1, ref2, ref3, ref4, ref5, root, val;
this.origin = origin; this.origin = origin;
this.context = context; this.context = context;
ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply']; ref = ['ID', 'fullID', 'board', 'thread', 'info', 'quotes', 'isReply'];
@ -6178,7 +6178,7 @@ Post = (function() {
this.file.text = fileRoot.firstElementChild; this.file.text = fileRoot.firstElementChild;
this.file.link = $('.fileText > a, .fileText-original', fileRoot); this.file.link = $('.fileText > a, .fileText-original', fileRoot);
this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot); this.file.thumb = $('a.fileThumb > [data-md5]', fileRoot);
this.file.thumbLink = this.file.thumb.parentNode; this.file.thumbLink = (ref5 = this.file.thumb) != null ? ref5.parentNode : void 0;
this.file.fullImage = $('.full-image', fileRoot); this.file.fullImage = $('.full-image', fileRoot);
this.file.videoControls = $('.video-controls', this.file.text); this.file.videoControls = $('.video-controls', this.file.text);
if (this.file.videoThumb) { if (this.file.videoThumb) {

Binary file not shown.

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.8' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.0.9' />
</app> </app>
</gupdate> </gupdate>

View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.8' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.0.9' />
</app> </app>
</gupdate> </gupdate>

View File

@ -48,7 +48,7 @@ Post.Clone = class extends Post
@file.text = fileRoot.firstElementChild @file.text = fileRoot.firstElementChild
@file.link = $ '.fileText > a, .fileText-original', fileRoot @file.link = $ '.fileText > a, .fileText-original', fileRoot
@file.thumb = $ 'a.fileThumb > [data-md5]', fileRoot @file.thumb = $ 'a.fileThumb > [data-md5]', fileRoot
@file.thumbLink = @file.thumb.parentNode @file.thumbLink = @file.thumb?.parentNode
@file.fullImage = $ '.full-image', fileRoot @file.fullImage = $ '.full-image', fileRoot
@file.videoControls = $ '.video-controls', @file.text @file.videoControls = $ '.video-controls', @file.text

View File

@ -1,4 +1,4 @@
{ {
"version": "1.13.0.8", "version": "1.13.0.9",
"date": "2016-10-08T19:18:35.432Z" "date": "2016-10-09T10:48:46.406Z"
} }