Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lets approach this with intelligence, m'kay?

Browse Source
This commit is contained in:
Zixaphir 2014-01-10 13:51:32 -07:00
parent e615973436
commit ac4229c578
4 changed files with 32 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builds/4chan-X.user.js
View File

@ -1778,7 +1778,7 @@
} }
$.asap((function() { $.asap((function() {
return $.id('boardNavMobile') || d.readyState !== 'loading'; return $.id('boardNavMobile') || d.readyState !== 'loading';
}), Header.initReady); }), Header.setBoardList);
$.prepend(d.body, _this.bar); $.prepend(d.body, _this.bar);
$.add(d.body, Header.hover); $.add(d.body, Header.hover);
_this.setBarPosition(Conf['Bottom Header']); _this.setBarPosition(Conf['Bottom Header']);
@ -1824,20 +1824,15 @@
id: 'scroll-marker' id: 'scroll-marker'
}), }),
initReady: function() { initReady: function() {
Header.cache();
Header.setBoardList(); Header.setBoardList();
return Header.addNav(); return Header.addNav();
}, },
cache: function() {
var fourchannav;
fourchannav = $.id('boardNavDesktop');
return Header.navCache = "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> " + fourchannav.innerHTML + "</span>";
},
setBoardList: function() { setBoardList: function() {
var a, boardList, btn, fullBoardList, _i, _len, _ref; var a, boardList, btn, fourchannav, fullBoardList, _i, _len, _ref;
boardList = $.el('span', { fourchannav = $.id('boardNavDesktop');
Header.boardList = boardList = $.el('span', {
id: 'board-list', id: 'board-list',
innerHTML: Header.navCache innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> " + fourchannav.innerHTML + "</span>"
}); });
_ref = $$('a', boardList); _ref = $$('a', boardList);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -1852,15 +1847,9 @@
$.on(btn, 'click', Header.toggleBoardList); $.on(btn, 'click', Header.toggleBoardList);
$.rm($('#navtopright', fullBoardList)); $.rm($('#navtopright', fullBoardList));
$.add(boardList, fullBoardList); $.add(boardList, fullBoardList);
if (Header.boardList) {
$.replace(Header.boardList, boardList);
}
Header.boardList = boardList;
return Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
},
addNav: function() {
$.add(Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle]); $.add(Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle]);
Header.setCustomNav(Conf['Custom Board Navigation']); Header.setCustomNav(Conf['Custom Board Navigation']);
Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
$.sync('Custom Board Navigation', Header.setCustomNav); $.sync('Custom Board Navigation', Header.setCustomNav);
return $.sync('boardnav', Header.generateBoardList); return $.sync('boardnav', Header.generateBoardList);
}, },
@ -11957,7 +11946,7 @@
} }
}, },
updateBoard: function(boardID) { updateBoard: function(boardID) {
var onload, req; var fullBoardList, onload, req;
g.BOARD = new Board(boardID); g.BOARD = new Board(boardID);
req = null; req = null;
onload = function(e) { onload = function(e) {
@ -11987,7 +11976,10 @@
]); ]);
} }
}; };
Header.setBoardList(); fullBoardList = $('#full-board-list', Header.boardList);
$.rmClass($('.current', fullBoardList), 'current');
$.addClass($("a[href*='" + boardID + "']", fullBoardList), 'current');
Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
return req = $.ajax('//a.4cdn.org/boards.json', { return req = $.ajax('//a.4cdn.org/boards.json', {
onabort: onload, onabort: onload,
onloadend: onload onloadend: onload

30
builds/crx/script.js
View File

@ -1788,7 +1788,7 @@
} }
$.asap((function() { $.asap((function() {
return $.id('boardNavMobile') || d.readyState !== 'loading'; return $.id('boardNavMobile') || d.readyState !== 'loading';
}), Header.initReady); }), Header.setBoardList);
$.prepend(d.body, _this.bar); $.prepend(d.body, _this.bar);
$.add(d.body, Header.hover); $.add(d.body, Header.hover);
_this.setBarPosition(Conf['Bottom Header']); _this.setBarPosition(Conf['Bottom Header']);
@ -1834,20 +1834,15 @@
id: 'scroll-marker' id: 'scroll-marker'
}), }),
initReady: function() { initReady: function() {
Header.cache();
Header.setBoardList(); Header.setBoardList();
return Header.addNav(); return Header.addNav();
}, },
cache: function() {
var fourchannav;
fourchannav = $.id('boardNavDesktop');
return Header.navCache = "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> " + fourchannav.innerHTML + "</span>";
},
setBoardList: function() { setBoardList: function() {
var a, boardList, btn, fullBoardList, _i, _len, _ref; var a, boardList, btn, fourchannav, fullBoardList, _i, _len, _ref;
boardList = $.el('span', { fourchannav = $.id('boardNavDesktop');
Header.boardList = boardList = $.el('span', {
id: 'board-list', id: 'board-list',
innerHTML: Header.navCache innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> " + fourchannav.innerHTML + "</span>"
}); });
_ref = $$('a', boardList); _ref = $$('a', boardList);
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@ -1862,15 +1857,9 @@
$.on(btn, 'click', Header.toggleBoardList); $.on(btn, 'click', Header.toggleBoardList);
$.rm($('#navtopright', fullBoardList)); $.rm($('#navtopright', fullBoardList));
$.add(boardList, fullBoardList); $.add(boardList, fullBoardList);
if (Header.boardList) {
$.replace(Header.boardList, boardList);
}
Header.boardList = boardList;
return Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
},
addNav: function() {
$.add(Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle]); $.add(Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle]);
Header.setCustomNav(Conf['Custom Board Navigation']); Header.setCustomNav(Conf['Custom Board Navigation']);
Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
$.sync('Custom Board Navigation', Header.setCustomNav); $.sync('Custom Board Navigation', Header.setCustomNav);
return $.sync('boardnav', Header.generateBoardList); return $.sync('boardnav', Header.generateBoardList);
}, },
@ -11946,7 +11935,7 @@
} }
}, },
updateBoard: function(boardID) { updateBoard: function(boardID) {
var onload, req; var fullBoardList, onload, req;
g.BOARD = new Board(boardID); g.BOARD = new Board(boardID);
req = null; req = null;
onload = function(e) { onload = function(e) {
@ -11976,7 +11965,10 @@
]); ]);
} }
}; };
Header.setBoardList(); fullBoardList = $('#full-board-list', Header.boardList);
$.rmClass($('.current', fullBoardList), 'current');
$.addClass($("a[href*='" + boardID + "']", fullBoardList), 'current');
Header.generateBoardList(Conf['boardnav'].replace(/(\r\n|\n|\r)/g, ' '));
return req = $.ajax('//a.4cdn.org/boards.json', { return req = $.ajax('//a.4cdn.org/boards.json', {
onabort: onload, onabort: onload,
onloadend: onload onloadend: onload

21
src/General/Header.coffee
View File

@ -94,7 +94,7 @@ Header =
return unless Main.isThisPageLegit() return unless Main.isThisPageLegit()
# Wait for #boardNavMobile instead of #boardNavDesktop, # Wait for #boardNavMobile instead of #boardNavDesktop,
# it might be incomplete otherwise. # it might be incomplete otherwise.
$.asap (-> $.id('boardNavMobile') or d.readyState isnt 'loading'), Header.initReady $.asap (-> $.id('boardNavMobile') or d.readyState isnt 'loading'), Header.setBoardList
$.prepend d.body, @bar $.prepend d.body, @bar
$.add d.body, Header.hover $.add d.body, Header.hover
@setBarPosition Conf['Bottom Header'] @setBarPosition Conf['Bottom Header']
@ -134,18 +134,14 @@ Header =
id: 'scroll-marker' id: 'scroll-marker'
initReady: -> initReady: ->
Header.cache()
Header.setBoardList() Header.setBoardList()
Header.addNav() Header.addNav()
cache: ->
fourchannav = $.id 'boardNavDesktop'
Header.navCache = "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> #{fourchannav.innerHTML}</span>"
setBoardList: -> setBoardList: ->
boardList = $.el 'span', fourchannav = $.id 'boardNavDesktop'
Header.boardList = boardList = $.el 'span',
id: 'board-list' id: 'board-list'
innerHTML: Header.navCache innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> #{fourchannav.innerHTML}</span>"
for a in $$ 'a', boardList for a in $$ 'a', boardList
$.on a, 'click', Navigate.navigate $.on a, 'click', Navigate.navigate
if a.pathname.split('/')[1] is g.BOARD.ID if a.pathname.split('/')[1] is g.BOARD.ID
@ -156,15 +152,10 @@ Header =
$.rm $ '#navtopright', fullBoardList $.rm $ '#navtopright', fullBoardList
$.add boardList, fullBoardList $.add boardList, fullBoardList
$.replace Header.boardList, boardList if Header.boardList
Header.boardList = boardList
Header.generateBoardList Conf['boardnav'].replace /(\r\n|\n|\r)/g, ' '
addNav: ->
$.add Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle] $.add Header.bar, [Header.boardList, Header.shortcuts, Header.noticesRoot, Header.toggle]
Header.setCustomNav Conf['Custom Board Navigation'] Header.setCustomNav Conf['Custom Board Navigation']
Header.generateBoardList Conf['boardnav'].replace /(\r\n|\n|\r)/g, ' '
$.sync 'Custom Board Navigation', Header.setCustomNav $.sync 'Custom Board Navigation', Header.setCustomNav
$.sync 'boardnav', Header.generateBoardList $.sync 'boardnav', Header.generateBoardList

5
src/General/Navigate.coffee
View File

@ -133,7 +133,10 @@ Navigate =
error: err error: err
] ]
Header.setBoardList() fullBoardList = $ '#full-board-list', Header.boardList
$.rmClass $('.current', fullBoardList), 'current'
$.addClass $("a[href*='#{boardID}']", fullBoardList), 'current'
Header.generateBoardList Conf['boardnav'].replace /(\r\n|\n|\r)/g, ' '
req = $.ajax '//a.4cdn.org/boards.json', req = $.ajax '//a.4cdn.org/boards.json',
onabort: onload onabort: onload