diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca415abf4..0595e08f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
## v1.13.0
+**v1.13.0.15** *(2016-10-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.15/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.15/builds/4chan-X-noupdate.crx)]
+- Merge branch 'bstable'
+- Release 4chan X v1.12.3.10.
+- Update due to 4chan's ad changes.
+
**v1.13.0.14** *(2016-10-23)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.14/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.0.14/builds/4chan-X-noupdate.crx)]
- Fix bug from v1.13.0.3 causing index/catalog search to not search comment.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 5faf66ac1..07af8149c 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 63ba644ba..bc6bfdc4a 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.13.0.14
+// @version 1.13.0.15
// @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 ac167b12a..b2de4749a 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.13.0.14
+// @version 1.13.0.15
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.0.14',
+ VERSION: '1.13.0.15',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1317,12 +1317,13 @@ body > div[style*=\" top: -10000px;\"] {\n\
:root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
+:root:not(.ads-loaded) .adg-rects,\n\
:root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\
display: none;\n\
}\n\
-hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {\n\
+div.center[style] {\n\
display: none !important;\n\
}\n\
/* Anti-autoplay */\n\
@@ -10429,8 +10430,8 @@ Settings = (function() {
}
},
ads: function(cb) {
- return $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ return $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
var url;
url = Redirect.to('thread', {
boardID: 'qa',
@@ -23270,8 +23271,8 @@ Main = (function() {
if ($.engine) {
$.addClass(doc, "ua-" + $.engine);
}
- $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded');
});
});
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 27327b5b8..1507c77b9 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 04027ae35..0cca61e3b 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.13.0.14
+// @version 1.13.0.15
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.0.14',
+ VERSION: '1.13.0.15',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1317,12 +1317,13 @@ body > div[style*=\" top: -10000px;\"] {\n\
:root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
+:root:not(.ads-loaded) .adg-rects,\n\
:root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\
display: none;\n\
}\n\
-hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {\n\
+div.center[style] {\n\
display: none !important;\n\
}\n\
/* Anti-autoplay */\n\
@@ -10429,8 +10430,8 @@ Settings = (function() {
}
},
ads: function(cb) {
- return $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ return $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
var url;
url = Redirect.to('thread', {
boardID: 'qa',
@@ -23270,8 +23271,8 @@ Main = (function() {
if ($.engine) {
$.addClass(doc, "ua-" + $.engine);
}
- $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded');
});
});
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 0ebcfc36b..cdb867628 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 5a41624f9..2b491d7ea 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.0.14
+// @version 1.13.0.15
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 3039a82d4..d4aa4e8aa 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.13.0.14
+// @version 1.13.0.15
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
};
g = {
- VERSION: '1.13.0.14',
+ VERSION: '1.13.0.15',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -1317,12 +1317,13 @@ body > div[style*=\" top: -10000px;\"] {\n\
:root:not(.ads-loaded) .ad-cnt > * {\n\
height: auto;\n\
}\n\
+:root:not(.ads-loaded) .adg-rects,\n\
:root:not(.ads-loaded) .ad-plea,\n\
:root:not(.ads-loaded) hr.abovePostForm,\n\
:root:not(.ads-loaded) .ad-plea-bottom + hr {\n\
display: none;\n\
}\n\
-hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {\n\
+div.center[style] {\n\
display: none !important;\n\
}\n\
/* Anti-autoplay */\n\
@@ -10429,8 +10430,8 @@ Settings = (function() {
}
},
ads: function(cb) {
- return $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ return $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
var url;
url = Redirect.to('thread', {
boardID: 'qa',
@@ -23270,8 +23271,8 @@ Main = (function() {
if ($.engine) {
$.addClass(doc, "ua-" + $.engine);
}
- $.onExists(doc, '.ad-cnt', function(ad) {
- return $.onExists(ad, 'img', function() {
+ $.onExists(doc, '.ad-cnt, .adg-rects', function(ad) {
+ return $.onExists(ad, 'img, iframe', function() {
return $.addClass(doc, 'ads-loaded');
});
});
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index ba23d05c3..d99b4cfd4 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 cb53dfca6..afca1a21f 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 404ebad30..76a92eae1 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 239621a00..f0f8b84f1 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.13.0.14",
- "date": "2016-10-23T04:09:53.323Z"
+ "version": "1.13.0.15",
+ "date": "2016-10-27T17:36:24.555Z"
}
\ No newline at end of file