diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f2008d30..6d363c808 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,71 +1,7 @@
-## v1.6.0
+## v1.7.0
*2014-04-06*
-**MayhemYDG**:
-- Thread and post hiding changes:
- - The posts' menu now has a label entry listing the reasons why a post got hidden or highlighted.
- - `Thread Hiding` and `Reply Hiding` settings are merged into one: `Post Hiding`.
- - `Thread Hiding Link` and `Reply Hiding Link` settings are merged into one: `Post Hiding Link`.
- - Hiding a thread removes it from the index in `Paged` or `All threads` modes.
-
- - Hidden threads can be seen by clicking the `[Show]` button the the top of the index.
-
- The `Anchor Hidden Threads` setting has been removed.
-
-- Added `Image Size` setting for the catalog.
-- Added `Open threads in a new tab` setting for the catalog.
-- Added `board-mode:"type"` and `board-sort:"type"` parameters to custom board navigation.
-- Added OP name/date tooltip in the catalog.
-- Added a keybind to cycle through index sort types, `Ctrl+x` by default.
-- Added keybindings for index modes, `Ctrl+{1,2,3}` by default.
-- `Index Mode` and `Index Sort` have been moved out of the header's menu into the index page.
-- Minor captcha fixes.
-- New setting: `Quote Markers`, enabled by default
- - This merges `Mark Quotes of You`, `Mark OP Quotes` and `Mark Cross-thread Quotes` into one feature.
- - Backlinks now also get these markers.
- - Multiple markers are now more compact, for example `>>123 (You/OP)` instead of `>>123 (You) (OP)`.
-- New setting: `Image Hover in Catalog`
- - Like `Image Hover`, but for the catalog only.
-- Added `Archive link` to the Custom Board Navigation Rice
-- Added a setting to configure the number of threads per page for the paged mode of the index.
-- Dropped support for the official catalog.
-- More index navigation improvements:
- - Threads in catalog mode have the usual menu.
- - When in catalog mode, the menu now also allows to pin/unpin threads.
- - The index will now display how many threads are hidden.
- - When in catalog mode, you can toggle between hidden/non-hidden threads.
- - New index mode: `catalog`
- 
- - When in catalog mode, use `Shift+Click` to hide, and `Alt+Click` to pin threads.
- - Existing features affect the catalog mode such as:
-
- - Filter (hiding, highlighting)
-
- Thread Hiding
-
- Linkify
-
- Thumbnail Replacemenu
-
- Image Hover
-
- - Support for the official catalog will be removed in the future, once the catalog mode for the index is deemed satisfactory.
-- Added `Original filename` variable to Sauce panel.
-- Fixed a bug which prevented QR cooldowns from being pruned from storage.
- - On Chrome, the storage could reach the quota and prevent 4chan X from saving data like QR name/mail or auto-watch for example.
-- Clicking on the border of the Header will not toggle `Header auto-hide` anymore.
- You can still change the setting in the Header menu → Header.
-- Bugfixes
-- WebM support fixes.
-
-**Vampiricwulf**
-- Flash embedding and other Flash features.
-
**Zixaphir**
-- Update Custom Navigation legend to reflect index mode changes.
-- JSON Navigation now works for backlinks (when Quote Inlining is disabled) and backlink hashlinks.
-- JSON Navigation (Index, Catalog) performance improvements.
-- Added a nifty bread-crumb for the JSON Navigation.
-- Added a return button to the JSON Navigation that will switch you back to non-catalog view (requires NavLinks not to be hidden).
-- Rewrote "Scroll to post quoting you" functionality, solving several small issues with it.
-- Improved Linkifier link detection.
-- Fixed an issue with Thread Updater intervals not saving correctly.
-- Many spiffy performance, state awareness, and sanity improvements to JSON Navigation.
- Reload captcha if there are posts in the queue.
**ccd0**
@@ -80,6 +16,7 @@
**Zixaphir**:
- Fix file info bug.
+
**ccd0**:
- Fix memory issue.
diff --git a/LICENSE b/LICENSE
index 17b08c379..c67ca1242 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.6.0 - 2014-04-06
+* 4chan X - Version 1.7.0 - 2014-04-06
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index abb3501f5..ce4b60c96 100755
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.6.0
+// @version 1.7.0
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index cb70f416b..1045b7c56 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.6.0
+// @version 1.7.0
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.6.0 - 2014-04-06
+* 4chan X - Version 1.7.0 - 2014-04-06
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -131,7 +131,7 @@
Config = {
main: {
'Miscellaneous': {
- 'JSON Navigation': [true, 'Use JSON for loading the Board Index and Threads. Also allows searching and sorting the board index and infinite scolling.'],
+ 'JSON Navigation': [false, 'Use JSON for loading the Board Index and Threads. Also allows searching and sorting the board index and infinite scolling.'],
'Catalog Links': [true, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'],
'External Catalog': [false, 'Link to external catalog instead of the internal one.'],
'QR Shortcut': [false, 'Adds a small [QR] link in the header.'],
@@ -372,7 +372,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.6.0',
+ VERSION: '1.7.0',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8090,7 +8090,7 @@
$.after(position, el);
}
return $.asap((function() {
- return isVideo || el.naturalHeight;
+ return el.videoHeight || el.naturalHeight;
}), function() {
return ImageExpand.completeExpand(post);
});
@@ -8350,7 +8350,7 @@
latestEvent: e,
endEvents: 'mouseout click',
asapTest: function() {
- return isVideo || el.naturalHeight;
+ return el.videoHeight || el.naturalHeight;
},
noRemove: true,
cb: function() {
diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json
index 1c53f6607..9816dfb8b 100755
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
{
"name": "4chan X",
- "version": "1.6.0",
+ "version": "1.7.0",
"manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 2e039cdac..7b50828aa 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
-* 4chan X - Version 1.6.0 - 2014-04-06
+* 4chan X - Version 1.7.0 - 2014-04-06
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -107,7 +107,7 @@
Config = {
main: {
'Miscellaneous': {
- 'JSON Navigation': [true, 'Use JSON for loading the Board Index and Threads. Also allows searching and sorting the board index and infinite scolling.'],
+ 'JSON Navigation': [false, 'Use JSON for loading the Board Index and Threads. Also allows searching and sorting the board index and infinite scolling.'],
'Catalog Links': [true, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'],
'External Catalog': [false, 'Link to external catalog instead of the internal one.'],
'QR Shortcut': [false, 'Adds a small [QR] link in the header.'],
@@ -348,7 +348,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.6.0',
+ VERSION: '1.7.0',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8129,7 +8129,7 @@
$.after(position, el);
}
return $.asap((function() {
- return isVideo || el.naturalHeight;
+ return el.videoHeight || el.naturalHeight;
}), function() {
return ImageExpand.completeExpand(post);
});
@@ -8378,7 +8378,7 @@
latestEvent: e,
endEvents: 'mouseout click',
asapTest: function() {
- return isVideo || el.naturalHeight;
+ return el.videoHeight || el.naturalHeight;
},
noRemove: true,
cb: function() {
diff --git a/builds/updates.xml b/builds/updates.xml
index ad944604f..03c3966a7 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/latest.js b/latest.js
index 3749b544b..900d8b06d 100755
--- a/latest.js
+++ b/latest.js
@@ -1 +1 @@
-postMessage({version:'1.6.0'},'*')
+postMessage({version:'1.7.0'},'*')
diff --git a/package.json b/package.json
index e85ea50c8..efc041281 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "4chan-X",
- "version": "1.6.0",
+ "version": "1.7.0",
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index f3fa41d41..1242b5b65 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -2,7 +2,7 @@ Config =
main:
'Miscellaneous':
'JSON Navigation' : [
- true
+ false
'Use JSON for loading the Board Index and Threads. Also allows searching and sorting the board index and infinite scolling.'
]
'Catalog Links': [
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 1d6c1e5da..3571acc1b 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -114,7 +114,7 @@ ImageExpand =
el.src = src or post.file.URL
position = if isVideo and Conf['Show Controls'] then thumb.parentNode else thumb
$.after position, el unless el is position.nextSibling
- $.asap (-> isVideo or el.naturalHeight), ->
+ $.asap (-> el.videoHeight or el.naturalHeight), ->
ImageExpand.completeExpand post
completeExpand: (post) ->
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 15ba073b5..46da0fa45 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -46,7 +46,7 @@ ImageHover =
el: el
latestEvent: e
endEvents: 'mouseout click'
- asapTest: -> (isVideo or el.naturalHeight)
+ asapTest: -> (el.videoHeight or el.naturalHeight)
noRemove: true
cb: ->
if isVideo