Merge branch 'v3' of git://github.com/zixaphir/appchan-x

This commit is contained in:
Jordan Bates 2013-04-24 12:14:53 -07:00
commit 0587155d8b
4 changed files with 30 additions and 15 deletions

View File

@ -4811,17 +4811,21 @@
return $.id('boardNavMobile') || d.readyState === 'complete';
}), Header.setBoardList);
$.prepend(d.body, _this.bar);
$.add(d.body, Header.hover);
return _this.setBarPosition(Conf['Bottom Header']);
});
return $.ready(function() {
var a, footer;
var a, cs;
_this.footer = $.id('boardNavDesktopFoot');
if (a = $("a[href*='/" + g.BOARD + "/']", $.id('boardNavDesktopFoot'))) {
a.className = 'current';
}
$.add(d.body, Header.hover);
Header.footer = footer = $.id('boardNavDesktopFoot');
_this.footer = $.id('boardNavDesktopFoot');
cs = $.id('settingsWindowLink');
cs.textContent = 'Catalog Settings';
if (g.VIEW === 'catalog') {
_this.addShortcut(cs);
}
Header.setFooterVisibility(Conf['Footer auto-hide']);
$.sync('Footer auto-hide', Header.setFooterVisibility);
return $.sync('Bottom Board List', Header.setFooterVisibility);

View File

@ -4802,17 +4802,21 @@
return $.id('boardNavMobile') || d.readyState === 'complete';
}), Header.setBoardList);
$.prepend(d.body, _this.bar);
$.add(d.body, Header.hover);
return _this.setBarPosition(Conf['Bottom Header']);
});
return $.ready(function() {
var a, footer;
var a, cs;
_this.footer = $.id('boardNavDesktopFoot');
if (a = $("a[href*='/" + g.BOARD + "/']", $.id('boardNavDesktopFoot'))) {
a.className = 'current';
}
$.add(d.body, Header.hover);
Header.footer = footer = $.id('boardNavDesktopFoot');
_this.footer = $.id('boardNavDesktopFoot');
cs = $.id('settingsWindowLink');
cs.textContent = 'Catalog Settings';
if (g.VIEW === 'catalog') {
_this.addShortcut(cs);
}
Header.setFooterVisibility(Conf['Footer auto-hide']);
$.sync('Footer auto-hide', Header.setFooterVisibility);
return $.sync('Bottom Board List', Header.setFooterVisibility);

View File

@ -4666,17 +4666,21 @@
return $.id('boardNavMobile') || d.readyState === 'complete';
}), Header.setBoardList);
$.prepend(d.body, _this.bar);
$.add(d.body, Header.hover);
return _this.setBarPosition(Conf['Bottom Header']);
});
return $.ready(function() {
var a, footer;
var a, cs;
_this.footer = $.id('boardNavDesktopFoot');
if (a = $("a[href*='/" + g.BOARD + "/']", $.id('boardNavDesktopFoot'))) {
a.className = 'current';
}
$.add(d.body, Header.hover);
Header.footer = footer = $.id('boardNavDesktopFoot');
_this.footer = $.id('boardNavDesktopFoot');
cs = $.id('settingsWindowLink');
cs.textContent = 'Catalog Settings';
if (g.VIEW === 'catalog') {
_this.addShortcut(cs);
}
Header.setFooterVisibility(Conf['Footer auto-hide']);
$.sync('Footer auto-hide', Header.setFooterVisibility);
return $.sync('Bottom Board List', Header.setFooterVisibility);

View File

@ -65,15 +65,18 @@ Header =
# it might be incomplete otherwise.
$.asap (-> $.id('boardNavMobile') or d.readyState is 'complete'), Header.setBoardList
$.prepend d.body, @bar
$.add d.body, Header.hover
@setBarPosition Conf['Bottom Header']
$.ready =>
@footer = $.id 'boardNavDesktopFoot'
if a = $ "a[href*='/#{g.BOARD}/']", $.id 'boardNavDesktopFoot'
a.className = 'current'
$.add d.body, Header.hover
Header.footer = footer = $.id 'boardNavDesktopFoot'
@footer = $.id 'boardNavDesktopFoot'
cs = $.id('settingsWindowLink')
cs.textContent = 'Catalog Settings'
@addShortcut cs if g.VIEW is 'catalog'
Header.setFooterVisibility Conf['Footer auto-hide']
$.sync 'Footer auto-hide', Header.setFooterVisibility
$.sync 'Bottom Board List', Header.setFooterVisibility