Merge branch 'bstable'

CHANGELOG.md

@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.34
 
+**v1.11.34.9** *(2016-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix loading icon getting stuck on in Firefox.
+
 **v1.11.34.8** *(2016-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.8/builds/4chan-X-noupdate.crx "Chromium version")]
 - Replace malicious ad blacklist with a Javascript whitelist, which can be configured on the `Advanced` settings tab.
 

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

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.34.8
+// @version      1.11.34.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X

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

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.34.8
+// @version      1.11.34.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.11.34.8',
+  VERSION:   '1.11.34.9',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -16907,9 +16907,10 @@ ThreadUpdater = (function() {
       if (g.VIEW !== 'thread' || !Conf['Thread Updater']) {
         return;
       }
-      this.audio = $.el('audio', {
+      this.audio = $.el('audio');
-        src: ThreadUpdater.beep
+      if ($.engine !== 'gecko') {
-      });
+        this.audio.src = this.beep;
+      }
       if (Conf['Updater and Stats in Header']) {
         this.dialog = sc = $.el('span', {
           id: 'updater'
@@ -17010,6 +17011,7 @@ ThreadUpdater = (function() {
     playBeep: function() {
       var audio;
       audio = ThreadUpdater.audio;
+      audio.src || (audio.src = ThreadUpdater.beep);
       if (audio.paused) {
         return audio.play();
       } else {

builds/4chan-X-noupdate.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.34.8
+// @version      1.11.34.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.11.34.8',
+  VERSION:   '1.11.34.9',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -16907,9 +16907,10 @@ ThreadUpdater = (function() {
       if (g.VIEW !== 'thread' || !Conf['Thread Updater']) {
         return;
       }
-      this.audio = $.el('audio', {
+      this.audio = $.el('audio');
-        src: ThreadUpdater.beep
+      if ($.engine !== 'gecko') {
-      });
+        this.audio.src = this.beep;
+      }
       if (Conf['Updater and Stats in Header']) {
         this.dialog = sc = $.el('span', {
           id: 'updater'
@@ -17010,6 +17011,7 @@ ThreadUpdater = (function() {
     playBeep: function() {
       var audio;
       audio = ThreadUpdater.audio;
+      audio.src || (audio.src = ThreadUpdater.beep);
       if (audio.paused) {
         return audio.play();
       } else {

builds/4chan-X.meta.js

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

builds/4chan-X.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.34.8
+// @version      1.11.34.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.11.34.8',
+  VERSION:   '1.11.34.9',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -16907,9 +16907,10 @@ ThreadUpdater = (function() {
       if (g.VIEW !== 'thread' || !Conf['Thread Updater']) {
         return;
       }
-      this.audio = $.el('audio', {
+      this.audio = $.el('audio');
-        src: ThreadUpdater.beep
+      if ($.engine !== 'gecko') {
-      });
+        this.audio.src = this.beep;
+      }
       if (Conf['Updater and Stats in Header']) {
         this.dialog = sc = $.el('span', {
           id: 'updater'
@@ -17010,6 +17011,7 @@ ThreadUpdater = (function() {
     playBeep: function() {
       var audio;
       audio = ThreadUpdater.audio;
+      audio.src || (audio.src = ThreadUpdater.beep);
       if (audio.paused) {
         return audio.play();
       } else {

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://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.34.8' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.34.9' />
   </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://www.4chan-x.net/builds/4chan-X.crx' version='1.11.34.8' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.34.9' />
   </app>
 </gupdate>
 

src/Monitoring/ThreadUpdater.coffee

@@ -2,7 +2,11 @@ ThreadUpdater =
   init: ->
     return if g.VIEW isnt 'thread' or !Conf['Thread Updater']
 
-    @audio = $.el 'audio', src: ThreadUpdater.beep
+    # Chromium won't play audio created in an inactive tab until the tab has been focused, so set it up now.
+    # XXX Sometimes the loading stalls in Firefox, esp. when opening in private browsing window followed by normal window.
+    # Don't let it keep the loading icon on indefinitely.
+    @audio = $.el 'audio'
+    @audio.src = @beep unless $.engine is 'gecko'
 
     if Conf['Updater and Stats in Header']
       @dialog = sc = $.el 'span',
@@ -90,6 +94,7 @@ ThreadUpdater =
 
   playBeep: ->
     {audio} = ThreadUpdater
+    audio.src or= ThreadUpdater.beep
     if audio.paused
       audio.play()
     else

version.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.11.34.8",
+  "version": "1.11.34.9",
-  "date": "2016-06-03T03:25:30.866Z"
+  "date": "2016-06-03T13:15:29.064Z"
 }