Merge branch 'bstable'

Conflicts:
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2015-03-16 12:43:51 -07:00
commit faa7263bd3
2 changed files with 4 additions and 5 deletions

View File

@ -20,6 +20,9 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.4
**v1.10.4.8** *(2015-03-16)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.4.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.4.8/builds/4chan-X-noupdate.crx "Chromium version")]
- Revert workaround for Greasemonkey 3.0 bug requiring popup permissions. Users having problems with multiple tabs opening should update to [Greasemonkey 3.1](https://addons.mozilla.org/en-US/firefox/addon/greasemonkey/versions/) (currently in beta).
**v1.10.4.7** *(2015-03-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.4.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.4.7/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix maximum updater interval when `Optional Increase` is enabled.

View File

@ -221,11 +221,7 @@ $.event = (event, detail, root=d) ->
$.open =
<% if (type === 'userscript') { %>
if GM_info.version is 'unknown' # GM_info.version is broken in GM3.0
# XXX https://github.com/greasemonkey/greasemonkey/issues/2094
(URL) -> $.globalEval "window.open(#{JSON.stringify URL}, '_blank');"
else
GM_openInTab
GM_openInTab
<% } else { %>
(URL) -> window.open URL, '_blank'
<% } %>