Merge branch 'master' into dev

This commit is contained in:
James Campos 2011-04-08 01:53:14 -07:00
commit 9b6667be1a
3 changed files with 4 additions and 2 deletions

View File

@ -46,6 +46,7 @@
/* CONTRIBUTORS /* CONTRIBUTORS
* *
* Mayhem - fix updater default options
* Ongpot - sfw favicon * Ongpot - sfw favicon
* thisisanon - nsfw + 404 favicons * thisisanon - nsfw + 404 favicons
* Anonymous - empty favicon * Anonymous - empty favicon
@ -1577,7 +1578,7 @@
$.bind(interval, 'change', updateInterval); $.bind(interval, 'change', updateInterval);
$.bind($('input[type=button]', div), 'click', updateNow); $.bind($('input[type=button]', div), 'click', updateNow);
d.body.appendChild(div); d.body.appendChild(div);
if (GM_getValue('autoG')) { if (GM_getValue('autoG', true)) {
return updateAuto.call($("input[name=autoL]", div)); return updateAuto.call($("input[name=autoL]", div));
} }
}; };

1
header
View File

@ -46,6 +46,7 @@
/* CONTRIBUTORS /* CONTRIBUTORS
* *
* Mayhem - fix updater default options
* Ongpot - sfw favicon * Ongpot - sfw favicon
* thisisanon - nsfw + 404 favicons * thisisanon - nsfw + 404 favicons
* Anonymous - empty favicon * Anonymous - empty favicon

View File

@ -1213,7 +1213,7 @@ updaterMake = ->
d.body.appendChild div d.body.appendChild div
if GM_getValue 'autoG' then updateAuto.call $("input[name=autoL]", div) if GM_getValue 'autoG', true then updateAuto.call $("input[name=autoL]", div)
watcher = watcher =
init: -> init: ->