diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40d98cec9..cc652595a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
+### v1.9.3.3
+*2014-09-17* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.3.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.3.3/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Reduce memory usage by removing contracted images.
+
### v1.9.3.2
*2014-09-16* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.3.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.3.2/builds/4chan-X-noupdate.crx "Chromium version")]
diff --git a/LICENSE b/LICENSE
index 1ad4dc76e..5885cd61f 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.3.2
+* 4chan X - Version 1.9.3.3
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index b12793911..25985ee86 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 d66770b39..82b7e23ed 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.9.3.2
+// @version 1.9.3.3
// @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 488b58b5d..440b65d29 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.9.3.2
+// @version 1.9.3.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.3.2
+* 4chan X - Version 1.9.3.3
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -376,7 +376,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.3.2',
+ VERSION: '1.9.3.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8305,13 +8305,13 @@
$.off(el, 'error', ImageExpand.error);
if (file.isVideo) {
el.pause();
- TrashQueue.add(el, post);
_ref1 = ImageExpand.videoCB;
for (eventName in _ref1) {
cb = _ref1[eventName];
$.off(el, eventName, cb);
}
}
+ return TrashQueue.add(el, post);
}
},
expand: function(post, src) {
@@ -8597,8 +8597,8 @@
cb: function() {
if (isVideo) {
el.pause();
- TrashQueue.add(el, post);
}
+ TrashQueue.add(el, post);
el.removeAttribute('id');
return $.queueTask(function() {
return delete file.isHovered;
@@ -12884,7 +12884,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: "
"
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index ff2197bff..5b5446aa5 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 838866765..5a11cde89 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.9.3.2
+// @version 1.9.3.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -23,7 +23,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.3.2
+* 4chan X - Version 1.9.3.3
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -375,7 +375,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.3.2',
+ VERSION: '1.9.3.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8304,13 +8304,13 @@
$.off(el, 'error', ImageExpand.error);
if (file.isVideo) {
el.pause();
- TrashQueue.add(el, post);
_ref1 = ImageExpand.videoCB;
for (eventName in _ref1) {
cb = _ref1[eventName];
$.off(el, eventName, cb);
}
}
+ return TrashQueue.add(el, post);
}
},
expand: function(post, src) {
@@ -8596,8 +8596,8 @@
cb: function() {
if (isVideo) {
el.pause();
- TrashQueue.add(el, post);
}
+ TrashQueue.add(el, post);
el.removeAttribute('id');
return $.queueTask(function() {
return delete file.isHovered;
@@ -12883,7 +12883,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index c47b499d0..943e00f12 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 4e2c0dc39..157c89e8b 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.3.2
+// @version 1.9.3.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index aedaf6eca..9fb438979 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.9.3.2
+// @version 1.9.3.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.3.2
+* 4chan X - Version 1.9.3.3
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -376,7 +376,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.3.2',
+ VERSION: '1.9.3.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -8305,13 +8305,13 @@
$.off(el, 'error', ImageExpand.error);
if (file.isVideo) {
el.pause();
- TrashQueue.add(el, post);
_ref1 = ImageExpand.videoCB;
for (eventName in _ref1) {
cb = _ref1[eventName];
$.off(el, eventName, cb);
}
}
+ return TrashQueue.add(el, post);
}
},
expand: function(post, src) {
@@ -8597,8 +8597,8 @@
cb: function() {
if (isVideo) {
el.pause();
- TrashQueue.add(el, post);
}
+ TrashQueue.add(el, post);
el.removeAttribute('id');
return $.queueTask(function() {
return delete file.isHovered;
@@ -12884,7 +12884,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 130869be4..e6d55f274 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 84e521883..09b49afdf 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 cce354187..2e5c015eb 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 129b48956..71efc248d 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.9.3.2",
+ "version": "1.9.3.3",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index f4eb535e7..af23e200c 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -137,10 +137,9 @@ ImageExpand =
$.off el, 'error', ImageExpand.error
if file.isVideo
el.pause()
- TrashQueue.add el, post
for eventName, cb of ImageExpand.videoCB
$.off el, eventName, cb
- return
+ TrashQueue.add el, post
expand: (post, src) ->
# Do not expand images of hidden/filtered replies, or already expanded pictures.
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index c2b0462e5..2cca594b2 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -41,7 +41,7 @@ ImageHover =
cb: ->
if isVideo
el.pause()
- TrashQueue.add el, post
+ TrashQueue.add el, post
el.removeAttribute 'id'
$.queueTask -> delete file.isHovered
error: ->