diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3eaadb9c..a7a57145a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v1.7.48
+*2014-05-27*
+
+**ccd0**
+- Fix bug causing broken WebM files to be perpetually redownloaded.
+
### v1.7.47
*2014-05-26*
diff --git a/LICENSE b/LICENSE
index c0561baa1..db22fc816 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.7.47 - 2014-05-26
+* 4chan X - Version 1.7.48 - 2014-05-27
*
* 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 2fb52ba6e..2dbec90a1 100755
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.7.47
+// @version 1.7.48
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 893827f84..39dc9be82 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.7.47
+// @version 1.7.48
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.7.47 - 2014-05-26
+* 4chan X - Version 1.7.48 - 2014-05-27
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -372,7 +372,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.7.47',
+ VERSION: '1.7.48',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8323,6 +8323,7 @@
},
noRemove: true,
cb: function() {
+ $.off(el, 'error', ImageHover.error);
if (isVideo) {
el.pause();
TrashQueue.add(el, post);
@@ -12884,7 +12885,7 @@
Settings.dialog = dialog = $.el('div', {
id: 'fourchanx-settings',
className: 'dialog',
- innerHTML: ''
+ innerHTML: ''
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13729,7 +13730,7 @@
}
if (previousversion) {
el = $.el('span', {
- innerHTML: '4chan X has been updated to version 1.7.47.'
+ innerHTML: '4chan X has been updated to version 1.7.48.'
});
new Notice('info', el, 15);
} else {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 826a2db61..add43ba07 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/crx.crx b/builds/crx.crx
index b561464e6..b09ee3c2b 100644
Binary files a/builds/crx.crx and b/builds/crx.crx differ
diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json
index 1756ec217..e4c7233a0 100755
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
{
"name": "4chan X",
- "version": "1.7.47",
+ "version": "1.7.48",
"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 0e10af832..12c0c739f 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
-* 4chan X - Version 1.7.47 - 2014-05-26
+* 4chan X - Version 1.7.48 - 2014-05-27
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -348,7 +348,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.7.47',
+ VERSION: '1.7.48',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8329,6 +8329,7 @@
},
noRemove: true,
cb: function() {
+ $.off(el, 'error', ImageHover.error);
if (isVideo) {
el.pause();
TrashQueue.add(el, post);
@@ -10807,18 +10808,11 @@
return $.before(post.data.nodes.root, Unread.hr);
}
},
- update: function(dontrepeat) {
+ update: function() {
var count;
count = Unread.posts.length;
if (Conf['Unread Count']) {
d.title = "" + (Conf['Quoted Title'] && Unread.postsQuotingYou.length ? '(!) ' : '') + (count || !Conf['Hide Unread Count at (0)'] ? "(" + count + ") " : '') + (g.DEAD ? "/" + g.BOARD + "/ - 404" : "" + Unread.title);
- if (dontrepeat) {
- return;
- }
- setTimeout(function() {
- d.title = '';
- return Unread.update(true);
- }, $.SECOND);
}
if (!Conf['Unread Favicon']) {
return;
@@ -12890,7 +12884,7 @@
Settings.dialog = dialog = $.el('div', {
id: 'fourchanx-settings',
className: 'dialog',
- innerHTML: ''
+ innerHTML: ''
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13722,7 +13716,7 @@
}
if (previousversion) {
el = $.el('span', {
- innerHTML: '4chan X has been updated to version 1.7.47.'
+ innerHTML: '4chan X has been updated to version 1.7.48.'
});
new Notice('info', el, 15);
} else {
diff --git a/builds/updates.xml b/builds/updates.xml
index f9fafe763..a8e3b3891 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/wcrx/manifest.json b/builds/wcrx/manifest.json
index a4d950825..c57fb70b7 100644
--- a/builds/wcrx/manifest.json
+++ b/builds/wcrx/manifest.json
@@ -1,6 +1,6 @@
{
"name": "4chan X",
- "version": "1.7.47",
+ "version": "1.7.48",
"manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": {
diff --git a/builds/wcrx/script.js b/builds/wcrx/script.js
index 0e10af832..12c0c739f 100644
--- a/builds/wcrx/script.js
+++ b/builds/wcrx/script.js
@@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
-* 4chan X - Version 1.7.47 - 2014-05-26
+* 4chan X - Version 1.7.48 - 2014-05-27
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -348,7 +348,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.7.47',
+ VERSION: '1.7.48',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -8329,6 +8329,7 @@
},
noRemove: true,
cb: function() {
+ $.off(el, 'error', ImageHover.error);
if (isVideo) {
el.pause();
TrashQueue.add(el, post);
@@ -10807,18 +10808,11 @@
return $.before(post.data.nodes.root, Unread.hr);
}
},
- update: function(dontrepeat) {
+ update: function() {
var count;
count = Unread.posts.length;
if (Conf['Unread Count']) {
d.title = "" + (Conf['Quoted Title'] && Unread.postsQuotingYou.length ? '(!) ' : '') + (count || !Conf['Hide Unread Count at (0)'] ? "(" + count + ") " : '') + (g.DEAD ? "/" + g.BOARD + "/ - 404" : "" + Unread.title);
- if (dontrepeat) {
- return;
- }
- setTimeout(function() {
- d.title = '';
- return Unread.update(true);
- }, $.SECOND);
}
if (!Conf['Unread Favicon']) {
return;
@@ -12890,7 +12884,7 @@
Settings.dialog = dialog = $.el('div', {
id: 'fourchanx-settings',
className: 'dialog',
- innerHTML: ''
+ innerHTML: ''
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
@@ -13722,7 +13716,7 @@
}
if (previousversion) {
el = $.el('span', {
- innerHTML: '4chan X has been updated to version 1.7.47.'
+ innerHTML: '4chan X has been updated to version 1.7.48.'
});
new Notice('info', el, 15);
} else {
diff --git a/package.json b/package.json
index d63a0ec13..137069aaf 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "4chan-X",
- "version": "1.7.47",
+ "version": "1.7.48",
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 777eb1b7f..378de4e71 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -38,6 +38,7 @@ ImageHover =
asapTest: -> (if isVideo then el.videoHeight else el.naturalHeight)
noRemove: true
cb: ->
+ $.off el, 'error', ImageHover.error
if isVideo
el.pause()
TrashQueue.add el, post