diff --git a/CHANGELOG.md b/CHANGELOG.md index b32b210c2..5c758bfa0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,12 @@ Based on v1.9.19.10. - Improved performance on long threads. +### v1.9.19.12 +*2015-01-13* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.12/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.12/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Fix conflict with native catalog due to bottom board list changes. + ### v1.9.19.11 *2015-01-12* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.11/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/src/General/Header.coffee b/src/General/Header.coffee index 93c1db719..9bb199bd4 100755 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -44,6 +44,7 @@ Header = @setBarVisibility Conf['Header auto-hide'] @setLinkJustify Conf['Centered links'] @setShortcutIcons Conf['Shortcut Icons'] + @setFooterVisibility Conf['Bottom Board List'] $.sync 'Fixed Header', @setBarFixed $.sync 'Header auto-hide on scroll', @setHideBarOnScroll @@ -51,6 +52,7 @@ Header = $.sync 'Shortcut Icons', @setShortcutIcons $.sync 'Header auto-hide', @setBarVisibility $.sync 'Centered links', @setLinkJustify + $.sync 'Bottom Board List', @setFooterVisibility @addShortcut menuButton @@ -86,17 +88,19 @@ Header = # Wait for #boardNavMobile instead of #boardNavDesktop, # it might be incomplete otherwise. $.asap (-> $.id('boardNavMobile') or d.readyState isnt 'loading'), -> - Header.footer = footer = $.id('boardNavDesktop').cloneNode true + footer = $.id('boardNavDesktop').cloneNode true footer.id = 'boardNavDesktopFoot' - $.rm $('#navtopright', footer) + $('#navtopright', footer).id = 'navbotright' + $('#settingsWindowLink', footer).id = 'settingsWindowLinkBot' + Header.bottomBoardList = $ '.boardList', footer if a = $ "a[href*='/#{g.BOARD}/']", footer a.className = 'current' - Header.setFooterVisibility Conf['Bottom Board List'] - $.sync 'Bottom Board List', Header.setFooterVisibility Main.ready -> - $.rm oldFooter if oldFooter = $.id 'boardNavDesktopFoot' - $.globalEval 'window.cloneTopNav = function() {};' - $.before $.id('absbot'), footer + if oldFooter = $.id 'boardNavDesktopFoot' + $.replace $('.boardList', oldFooter), Header.bottomBoardList + else + $.before $.id('absbot'), footer + $.globalEval 'window.cloneTopNav = function() {};' Header.setBoardList() $.prepend d.body, @bar $.add d.body, Header.hover @@ -360,14 +364,14 @@ Header = setFooterVisibility: (hide) -> Header.footerToggler.checked = hide - Header.footer.hidden = hide + doc.classList.toggle 'hide-bottom-board-list', hide toggleFooterVisibility: -> $.event 'CloseMenu' hide = if @nodeName is 'INPUT' @checked else - !!Header.footer.hidden + $.hasClass doc, 'hide-bottom-board-list' Header.setFooterVisibility hide $.set 'Bottom Board List', hide message = if hide diff --git a/src/General/css/style.css b/src/General/css/style.css index b0f680d71..f3a043f0a 100755 --- a/src/General/css/style.css +++ b/src/General/css/style.css @@ -59,6 +59,9 @@ a[href="javascript:;"] { #boardNavDesktop, #boardNavMobile { display: none !important; } +:root.hide-bottom-board-list #boardNavDesktopFoot { + display: none; +} body.hasDropDownNav{ margin-top: 5px; } diff --git a/src/Miscellaneous/CatalogLinks.coffee b/src/Miscellaneous/CatalogLinks.coffee index 2f4294b27..bdd9c6491 100755 --- a/src/Miscellaneous/CatalogLinks.coffee +++ b/src/Miscellaneous/CatalogLinks.coffee @@ -53,7 +53,7 @@ CatalogLinks = CatalogLinks.set @checked set: (useCatalog) -> - for a in $$('a:not([data-only])', Header.boardList).concat $$('a', Header.footer) + for a in $$('a:not([data-only])', Header.boardList).concat $$('a', Header.bottomBoardList) continue if a.hostname not in ['boards.4chan.org', 'catalog.neet.tv', '4index.gropes.us'] or !(board = a.pathname.split('/')[1]) or board in ['f', 'status', '4chan'] or