Merge branch 'v3'

This commit is contained in:
Zixaphir 2014-03-08 16:36:47 -07:00
commit 479d6be09a
2 changed files with 2 additions and 2 deletions

View File

@ -16402,11 +16402,11 @@
if (this.hash && view === 'thread') {
path += this.hash;
}
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
if (this.id !== 'popState') {
history.pushState(null, '', path);
}
Navigate.path = this.pathname;
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
_ref1 = this.dataset, indexMode = _ref1.indexMode, indexSort = _ref1.indexSort;
if (indexMode && Conf['Index Mode'] !== indexMode) {
$.set('Index Mode', Conf['Index Mode'] = Index.selectMode.value = indexMode);

View File

@ -16422,11 +16422,11 @@
if (this.hash && view === 'thread') {
path += this.hash;
}
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
if (this.id !== 'popState') {
history.pushState(null, '', path);
}
Navigate.path = this.pathname;
Navigate.makeBreadCrumb(this.href, view, boardID, threadID);
_ref1 = this.dataset, indexMode = _ref1.indexMode, indexSort = _ref1.indexSort;
if (indexMode && Conf['Index Mode'] !== indexMode) {
$.set('Index Mode', Conf['Index Mode'] = Index.selectMode.value = indexMode);