Merge branch 'v3'

Conflicts:
	src/General/Navigate.coffee
This commit is contained in:
Zixaphir 2014-03-08 16:53:23 -07:00
commit 1a7d266cc8
3 changed files with 3 additions and 3 deletions

View File

@ -16289,7 +16289,7 @@
index: function() {
delete g.THREADID;
if (Conf['Index Mode'] === 'catalog') {
return $.addClass(doc, 'catalog-mode');
return Index.cb.toggleCatalogMode();
}
},
thread: function() {

View File

@ -16309,7 +16309,7 @@
index: function() {
delete g.THREADID;
if (Conf['Index Mode'] === 'catalog') {
return $.addClass(doc, 'catalog-mode');
return Index.cb.toggleCatalogMode();
}
},
thread: function() {

View File

@ -92,7 +92,7 @@ Navigate =
{
index: ->
delete g.THREADID
$.addClass doc, 'catalog-mode' if Conf['Index Mode'] is 'catalog'
Index.cb.toggleCatalogMode() if Conf['Index Mode'] is 'catalog'
thread: ->
$.rmClass doc, 'catalog-mode' if Conf['Index Mode'] is 'catalog'