diff --git a/CHANGELOG.md b/CHANGELOG.md
index e693ba4a1..f2eb37a74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
### v1.12.1
+**v1.12.1.2** *(2016-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.2/builds/4chan-X-noupdate.crx)]
+- Merge branch 'bstable'
+- Release 4chan X v1.12.0.9.
+- Revert "Remove crude shim for ES6 Set. #904"
+- Merge branch 'bstable'
+- Update devDependencies.
+
**v1.12.1.1** *(2016-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.1.1/builds/4chan-X-noupdate.crx)]
- Merge v1.12.0.8: Restore `Restart when Opened` option.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 6b365439a..9627c1bec 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 73e74aa47..cdd94e667 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.12.1.1
+// @version 1.12.1.2
// @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 d0ee2df75..2e1b8b829 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.12.1.1
+// @version 1.12.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -121,7 +121,7 @@
'use strict';
-var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
+var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, ShimSet, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
var Conf, E, c, d, doc, docSet, g;
@@ -136,7 +136,7 @@ docSet = function() {
};
g = {
- VERSION: '1.12.1.1',
+ VERSION: '1.12.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6038,6 +6038,47 @@ RandomAccessList = (function() {
}).call(this);
+ShimSet = (function() {
+ var ShimSet;
+
+ ShimSet = (function() {
+ function ShimSet() {
+ this.elements = {};
+ this.size = 0;
+ }
+
+ ShimSet.prototype.has = function(value) {
+ return value in this.elements;
+ };
+
+ ShimSet.prototype.add = function(value) {
+ if (this.elements[value]) {
+ return;
+ }
+ this.elements[value] = true;
+ return this.size++;
+ };
+
+ ShimSet.prototype["delete"] = function(value) {
+ if (!this.elements[value]) {
+ return;
+ }
+ delete this.elements[value];
+ return this.size--;
+ };
+
+ return ShimSet;
+
+ })();
+
+ if (!('Set' in window)) {
+ window.Set = ShimSet;
+ }
+
+ return ShimSet;
+
+}).call(this);
+
SimpleDict = (function() {
var SimpleDict,
slice = [].slice;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 2fa8d786b..9ef9e139a 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 106320f17..616502166 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.12.1.1
+// @version 1.12.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -121,7 +121,7 @@
'use strict';
-var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
+var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, ShimSet, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
var Conf, E, c, d, doc, docSet, g;
@@ -136,7 +136,7 @@ docSet = function() {
};
g = {
- VERSION: '1.12.1.1',
+ VERSION: '1.12.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6038,6 +6038,47 @@ RandomAccessList = (function() {
}).call(this);
+ShimSet = (function() {
+ var ShimSet;
+
+ ShimSet = (function() {
+ function ShimSet() {
+ this.elements = {};
+ this.size = 0;
+ }
+
+ ShimSet.prototype.has = function(value) {
+ return value in this.elements;
+ };
+
+ ShimSet.prototype.add = function(value) {
+ if (this.elements[value]) {
+ return;
+ }
+ this.elements[value] = true;
+ return this.size++;
+ };
+
+ ShimSet.prototype["delete"] = function(value) {
+ if (!this.elements[value]) {
+ return;
+ }
+ delete this.elements[value];
+ return this.size--;
+ };
+
+ return ShimSet;
+
+ })();
+
+ if (!('Set' in window)) {
+ window.Set = ShimSet;
+ }
+
+ return ShimSet;
+
+}).call(this);
+
SimpleDict = (function() {
var SimpleDict,
slice = [].slice;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 7012d3e1f..3826e69fb 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 0a57aafe1..3d0f76397 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.12.1.1
+// @version 1.12.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index cc9a1bb15..7b6bc825c 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.12.1.1
+// @version 1.12.1.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -121,7 +121,7 @@
'use strict';
-var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
+var $, $$, Anonymize, AntiAutoplay, ArchiveLink, Banner, Board, Build, CSS, Callbacks, Captcha, CatalogLinks, CatalogThread, Config, Connection, CrossOrigin, CustomCSS, DataBoard, DeleteLink, DownloadLink, Embedding, ExpandComment, ExpandThread, FappeTyme, Favicon, Fetcher, FileInfo, Filter, Flash, Fourchan, Gallery, Get, Header, IDColor, IDHighlight, IDPostCount, ImageCommon, ImageExpand, ImageHover, ImageLoader, Index, Keybinds, Linkify, Main, MarkNewIPs, Menu, Metadata, Nav, NormalizeURL, Notice, PSAHiding, PassLink, Polyfill, Post, PostHiding, PostSuccessful, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, QuoteStrikeThrough, QuoteThreading, QuoteYou, Quotify, RandomAccessList, Recursive, Redirect, RelativeDates, RemoveSpoilers, ReplyPruning, Report, ReportLink, RevealSpoilers, Sauce, Settings, ShimSet, SimpleDict, Thread, ThreadHiding, ThreadLinks, ThreadStats, ThreadUpdater, ThreadWatcher, Time, UI, Unread, Volume;
var Conf, E, c, d, doc, docSet, g;
@@ -136,7 +136,7 @@ docSet = function() {
};
g = {
- VERSION: '1.12.1.1',
+ VERSION: '1.12.1.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6038,6 +6038,47 @@ RandomAccessList = (function() {
}).call(this);
+ShimSet = (function() {
+ var ShimSet;
+
+ ShimSet = (function() {
+ function ShimSet() {
+ this.elements = {};
+ this.size = 0;
+ }
+
+ ShimSet.prototype.has = function(value) {
+ return value in this.elements;
+ };
+
+ ShimSet.prototype.add = function(value) {
+ if (this.elements[value]) {
+ return;
+ }
+ this.elements[value] = true;
+ return this.size++;
+ };
+
+ ShimSet.prototype["delete"] = function(value) {
+ if (!this.elements[value]) {
+ return;
+ }
+ delete this.elements[value];
+ return this.size--;
+ };
+
+ return ShimSet;
+
+ })();
+
+ if (!('Set' in window)) {
+ window.Set = ShimSet;
+ }
+
+ return ShimSet;
+
+}).call(this);
+
SimpleDict = (function() {
var SimpleDict,
slice = [].slice;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 98a057ffc..6187cab0a 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 510785439..6f3832f8d 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 aa34e779c..3d7651d32 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index e13c6040d..3e020275b 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.12.1.1",
- "date": "2016-07-07T00:33:54.869Z"
+ "version": "1.12.1.2",
+ "date": "2016-07-07T15:48:51.980Z"
}
\ No newline at end of file