Merge a few more things from Zixaphir

This commit is contained in:
ccd0 2014-05-11 01:26:23 -07:00
parent 20f845ed1a
commit a80cedbd3e

View File

@ -120,8 +120,8 @@ Navigate =
updateBoard: (boardID) -> updateBoard: (boardID) ->
fullBoardList = $ '#full-board-list', Header.boardList fullBoardList = $ '#full-board-list', Header.boardList
$('.current', fullBoardList)?.classList.remove 'current' $.rmClass current, 'current' if current = $ '.current', fullBoardList
$("a[href*='/#{boardID}/']", fullBoardList)?.classList.add 'current' $.addClass current, 'current' if current = $ "a[href*='/#{boardID}/']", fullBoardList
Header.generateBoardList Conf['boardnav'].replace /(\r\n|\n|\r)/g, ' ' Header.generateBoardList Conf['boardnav'].replace /(\r\n|\n|\r)/g, ' '
QR.flagsInput() QR.flagsInput()
@ -207,8 +207,7 @@ Navigate =
path = @pathname path = @pathname
path += @hash if @hash path += @hash if @hash
history.pushState null, '', path unless @id is 'popState' Navigate.pushState path unless @id is 'popState'
Navigate.path = @pathname
unless view is 'index' and 'index' is g.VIEW and boardID is g.BOARD.ID unless view is 'index' and 'index' is g.VIEW and boardID is g.BOARD.ID
Navigate.disconnect() Navigate.disconnect()