Forgot an if.

This commit is contained in:
Zixaphir 2014-03-02 23:23:28 -07:00
parent 7a7a7facf7
commit 7677f6bb35
3 changed files with 15 additions and 10 deletions

View File

@ -2666,6 +2666,7 @@
$.on($('#returnlink a', this.navLinks), 'click', Navigate.navigate); $.on($('#returnlink a', this.navLinks), 'click', Navigate.navigate);
if (g.VIEW === 'index') { if (g.VIEW === 'index') {
this.update(); this.update();
this.cb.toggleCatalogMode();
} }
$.asap((function() { $.asap((function() {
return $('.board', doc) || d.readyState !== 'loading'; return $('.board', doc) || d.readyState !== 'loading';
@ -2677,12 +2678,13 @@
$.rm(navLink); $.rm(navLink);
} }
$.after($.x('child::form/preceding-sibling::hr[1]'), Index.navLinks); $.after($.x('child::form/preceding-sibling::hr[1]'), Index.navLinks);
return g.VIEW !== 'index'; if (g.VIEW !== 'index') {
return;
}
board = $('.board'); board = $('.board');
$.replace(board, Index.root); $.replace(board, Index.root);
return d.implementation.createDocument(null, null, null).appendChild(board); return d.implementation.createDocument(null, null, null).appendChild(board);
}); });
this.cb.toggleCatalogMode();
return $.asap((function() { return $.asap((function() {
return $('.pagelist', doc) || d.readyState !== 'loading'; return $('.pagelist', doc) || d.readyState !== 'loading';
}), function() { }), function() {

View File

@ -2725,6 +2725,7 @@
$.on($('#returnlink a', this.navLinks), 'click', Navigate.navigate); $.on($('#returnlink a', this.navLinks), 'click', Navigate.navigate);
if (g.VIEW === 'index') { if (g.VIEW === 'index') {
this.update(); this.update();
this.cb.toggleCatalogMode();
} }
$.asap((function() { $.asap((function() {
return $('.board', doc) || d.readyState !== 'loading'; return $('.board', doc) || d.readyState !== 'loading';
@ -2736,12 +2737,13 @@
$.rm(navLink); $.rm(navLink);
} }
$.after($.x('child::form/preceding-sibling::hr[1]'), Index.navLinks); $.after($.x('child::form/preceding-sibling::hr[1]'), Index.navLinks);
return g.VIEW !== 'index'; if (g.VIEW !== 'index') {
return;
}
board = $('.board'); board = $('.board');
$.replace(board, Index.root); $.replace(board, Index.root);
return d.implementation.createDocument(null, null, null).appendChild(board); return d.implementation.createDocument(null, null, null).appendChild(board);
}); });
this.cb.toggleCatalogMode();
return $.asap((function() { return $.asap((function() {
return $('.pagelist', doc) || d.readyState !== 'loading'; return $('.pagelist', doc) || d.readyState !== 'loading';
}), function() { }), function() {

View File

@ -119,12 +119,15 @@ Index =
$.on $('#index-search-clear', @navLinks), 'click', @clearSearch $.on $('#index-search-clear', @navLinks), 'click', @clearSearch
$.on $('#returnlink a', @navLinks), 'click', Navigate.navigate $.on $('#returnlink a', @navLinks), 'click', Navigate.navigate
@update() if g.VIEW is 'index' if g.VIEW is 'index'
@update()
@cb.toggleCatalogMode()
$.asap (-> $('.board', doc) or d.readyState isnt 'loading'), -> $.asap (-> $('.board', doc) or d.readyState isnt 'loading'), ->
$.rm navLink for navLink in $$ '.navLinks' $.rm navLink for navLink in $$ '.navLinks'
$.after $.x('child::form/preceding-sibling::hr[1]'), Index.navLinks $.after $.x('child::form/preceding-sibling::hr[1]'), Index.navLinks
return g.VIEW isnt 'index' return if g.VIEW isnt 'index'
board = $ '.board' board = $ '.board'
$.replace board, Index.root $.replace board, Index.root
@ -137,8 +140,6 @@ Index =
# Does not work on Firefox unfortunately. bugzil.la/939713 # Does not work on Firefox unfortunately. bugzil.la/939713
d.implementation.createDocument(null, null, null).appendChild board d.implementation.createDocument(null, null, null).appendChild board
@cb.toggleCatalogMode()
$.asap (-> $('.pagelist', doc) or d.readyState isnt 'loading'), -> $.asap (-> $('.pagelist', doc) or d.readyState isnt 'loading'), ->
if pagelist = $('.pagelist') if pagelist = $('.pagelist')
$.replace pagelist, Index.pagelist $.replace pagelist, Index.pagelist