Merge branch '1.9.0.x'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### v1.9.0.6 
+*2014-08-31*
+
+**ccd0**
+- Fix an embedding bug that lead to sounds playing with no way to stop them.
+
 ### v1.9.0.5 
 *2014-08-30*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.0.5
+* 4chan X - Version 1.9.0.6
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE

builds/4chan-X-beta.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.5
+// @version      1.9.0.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.5
+// @version      1.9.0.6
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

builds/updates-beta.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.0.5' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.0.6' />
   </app>
 </gupdate>
 

builds/updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.0.5' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.0.6' />
   </app>
 </gupdate>
 

package.json

@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.9.0.5",
+    "version": "1.9.0.6",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",
@@ -57,4 +57,4 @@
   "engines": {
     "node": ">=0.10"
   }
-}
+}

src/Linkification/Linkify.coffee

@@ -163,7 +163,9 @@ Linkify =
     $.on embed, 'click', Linkify.cb.toggle
     $.after link, [$.tn(' '), embed]
 
-    Linkify.cb.toggle.call embed if Conf['Auto-embed'] and !post.isFetchedQuote
+    if Conf['Auto-embed'] and !post.isFetchedQuote
+      $.asap (-> doc.contains embed), ->
+        Linkify.cb.toggle.call embed
 
   title: (data) ->
     [key, uid, options, link, post] = data
@@ -279,7 +281,8 @@ Linkify =
       style: 'border: 0;'
       el: (a) ->
         el = $.el 'div'
-        $.cache "https://mediacru.sh/#{a.dataset.uid}.json", ->
+        $.queueTask -> $.cache "https://mediacru.sh/#{a.dataset.uid}.json", ->
+          return unless doc.contains el
           {status} = @
           return el.textContent = "ERROR #{status}" unless status in [200, 304]
           {files} = @response