diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dc2b53a3..7eda51b53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v2.6.4 +*2013-12-06* + ### v2.6.3 *2013-11-27* diff --git a/LICENSE b/LICENSE index 610fb6e4c..56b247cf2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* appchan x - Version 2.6.3 - 2013-12-06 +* appchan x - Version 2.6.4 - 2013-12-06 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js index 63119b73d..fd7a712d3 100644 --- a/builds/appchan-x.meta.js +++ b/builds/appchan-x.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name appchan x -// @version 2.6.3 +// @version 2.6.4 // @minGMVer 1.12 // @minFFVer 22 // @namespace zixaphir diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 8f20a05c6..dfd070a8c 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name appchan x -// @version 2.6.3 +// @version 2.6.4 // @minGMVer 1.12 // @minFFVer 22 // @namespace zixaphir @@ -22,7 +22,7 @@ // ==/UserScript== /* -* appchan x - Version 2.6.3 - 2013-12-06 +* appchan x - Version 2.6.4 - 2013-12-06 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE @@ -444,7 +444,7 @@ doc = d.documentElement; g = { - VERSION: '2.6.3', + VERSION: '2.6.4', NAMESPACE: 'appchan_x.', TYPE: 'sfw', boards: {}, @@ -7908,9 +7908,16 @@ LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function(a) { - return $.el('object', { - innerHTML: "" + var ret; + + ret = $.el('iframe', { + width: "640", + height: "360", + src: "http://www.liveleak.com/ll_embed?i=" + a.dataset.uid, + frameborder: "0" }); + ret.setAttribute("allowfullscreen", "true"); + return ret; } }, MediaCrush: { diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip index 27055c04b..915da1c7e 100644 Binary files a/builds/appchan-x.zip and b/builds/appchan-x.zip differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 156f92a7d..0098a2184 100644 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "appchan x", - "version": "2.6.3", + "version": "2.6.4", "manifest_version": 2, "description": "The most comprehensive 4chan userscript.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 889c7eacd..d0e5224f3 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* appchan x - Version 2.6.3 - 2013-12-06 +* appchan x - Version 2.6.4 - 2013-12-06 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE @@ -423,7 +423,7 @@ doc = d.documentElement; g = { - VERSION: '2.6.3', + VERSION: '2.6.4', NAMESPACE: 'appchan_x.', TYPE: 'sfw', boards: {}, @@ -7914,9 +7914,16 @@ LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function(a) { - return $.el('object', { - innerHTML: "" + var ret; + + ret = $.el('iframe', { + width: "640", + height: "360", + src: "http://www.liveleak.com/ll_embed?i=" + a.dataset.uid, + frameborder: "0" }); + ret.setAttribute("allowfullscreen", "true"); + return ret; } }, MediaCrush: { diff --git a/latest.js b/latest.js index 7c7367453..c312a0ddf 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.6.3'},'*') +postMessage({version:'2.6.4'},'*') diff --git a/package.json b/package.json index 4835faa85..2fc061cf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appchan-x", - "version": "2.6.3", + "version": "2.6.4", "description": "The most comprehensive 4chan userscript.", "meta": { "name": "appchan x",