Merge branch 'v3' into Av2
This commit is contained in:
commit
a219231983
@ -4847,7 +4847,10 @@
|
|||||||
this.shortcuts = $.el('span', {
|
this.shortcuts = $.el('span', {
|
||||||
id: 'shortcuts'
|
id: 'shortcuts'
|
||||||
});
|
});
|
||||||
return $.asap((function() {
|
this.hover = $.el('div', {
|
||||||
|
id: 'hoverUI'
|
||||||
|
});
|
||||||
|
$.asap((function() {
|
||||||
return d.body;
|
return d.body;
|
||||||
}), function() {
|
}), function() {
|
||||||
if (!Main.isThisPageLegit()) {
|
if (!Main.isThisPageLegit()) {
|
||||||
@ -4857,6 +4860,9 @@
|
|||||||
return $.id('boardNavMobile');
|
return $.id('boardNavMobile');
|
||||||
}), Header.setBoardList);
|
}), Header.setBoardList);
|
||||||
});
|
});
|
||||||
|
return $.ready(function() {
|
||||||
|
return $.add(d.body, Header.hover);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
setBoardList: function() {
|
setBoardList: function() {
|
||||||
var a, btn, customBoardList, fullBoardList, nav;
|
var a, btn, customBoardList, fullBoardList, nav;
|
||||||
@ -8060,7 +8066,7 @@
|
|||||||
id: 'qp',
|
id: 'qp',
|
||||||
className: 'dialog'
|
className: 'dialog'
|
||||||
});
|
});
|
||||||
$.add(d.body, qp);
|
$.add(Header.hover, qp);
|
||||||
Get.postClone(boardID, threadID, postID, qp, Get.contextFromLink(this));
|
Get.postClone(boardID, threadID, postID, qp, Get.contextFromLink(this));
|
||||||
UI.hover({
|
UI.hover({
|
||||||
root: this,
|
root: this,
|
||||||
@ -9060,7 +9066,7 @@
|
|||||||
src: post.file.URL
|
src: post.file.URL
|
||||||
});
|
});
|
||||||
el.setAttribute('data-fullid', post.fullID);
|
el.setAttribute('data-fullid', post.fullID);
|
||||||
$.add(d.body, el);
|
$.add(Header.hover, el);
|
||||||
UI.hover({
|
UI.hover({
|
||||||
root: this,
|
root: this,
|
||||||
el: el,
|
el: el,
|
||||||
|
|||||||
@ -9,7 +9,6 @@ UI = do ->
|
|||||||
$.on move, 'touchstart mousedown', dragstart
|
$.on move, 'touchstart mousedown', dragstart
|
||||||
el
|
el
|
||||||
|
|
||||||
|
|
||||||
class Menu
|
class Menu
|
||||||
currentMenu = null
|
currentMenu = null
|
||||||
lastToggledButton = null
|
lastToggledButton = null
|
||||||
|
|||||||
@ -4,12 +4,17 @@ Header =
|
|||||||
id: 'notifications'
|
id: 'notifications'
|
||||||
@shortcuts = $.el 'span',
|
@shortcuts = $.el 'span',
|
||||||
id: 'shortcuts'
|
id: 'shortcuts'
|
||||||
|
@hover = $.el 'div',
|
||||||
|
id: 'hoverUI'
|
||||||
$.asap (-> d.body), ->
|
$.asap (-> d.body), ->
|
||||||
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'), Header.setBoardList
|
$.asap (-> $.id 'boardNavMobile'), Header.setBoardList
|
||||||
|
|
||||||
|
$.ready ->
|
||||||
|
$.add d.body, Header.hover
|
||||||
|
|
||||||
setBoardList: ->
|
setBoardList: ->
|
||||||
|
|
||||||
Header.nav = nav = $.id 'boardNavDesktop'
|
Header.nav = nav = $.id 'boardNavDesktop'
|
||||||
@ -2687,10 +2692,12 @@ QuotePreview =
|
|||||||
Post::callbacks.push
|
Post::callbacks.push
|
||||||
name: 'Quote Previewing'
|
name: 'Quote Previewing'
|
||||||
cb: @node
|
cb: @node
|
||||||
|
|
||||||
node: ->
|
node: ->
|
||||||
for link in @nodes.quotelinks.concat [@nodes.backlinks...]
|
for link in @nodes.quotelinks.concat [@nodes.backlinks...]
|
||||||
$.on link, 'mouseover', QuotePreview.mouseover
|
$.on link, 'mouseover', QuotePreview.mouseover
|
||||||
return
|
return
|
||||||
|
|
||||||
mouseover: (e) ->
|
mouseover: (e) ->
|
||||||
return if $.hasClass @, 'inlined'
|
return if $.hasClass @, 'inlined'
|
||||||
|
|
||||||
@ -2699,7 +2706,7 @@ QuotePreview =
|
|||||||
qp = $.el 'div',
|
qp = $.el 'div',
|
||||||
id: 'qp'
|
id: 'qp'
|
||||||
className: 'dialog'
|
className: 'dialog'
|
||||||
$.add d.body, qp
|
$.add Header.hover, qp
|
||||||
Get.postClone boardID, threadID, postID, qp, Get.contextFromLink @
|
Get.postClone boardID, threadID, postID, qp, Get.contextFromLink @
|
||||||
|
|
||||||
UI.hover
|
UI.hover
|
||||||
@ -2725,6 +2732,7 @@ QuotePreview =
|
|||||||
if quote.hash[2..] is quoterID
|
if quote.hash[2..] is quoterID
|
||||||
$.addClass quote, 'forwardlink'
|
$.addClass quote, 'forwardlink'
|
||||||
return
|
return
|
||||||
|
|
||||||
mouseout: ->
|
mouseout: ->
|
||||||
# Stop if it only contains text.
|
# Stop if it only contains text.
|
||||||
return unless root = @el.firstElementChild
|
return unless root = @el.firstElementChild
|
||||||
@ -3425,7 +3433,7 @@ ImageHover =
|
|||||||
id: 'ihover'
|
id: 'ihover'
|
||||||
src: post.file.URL
|
src: post.file.URL
|
||||||
el.setAttribute 'data-fullid', post.fullID
|
el.setAttribute 'data-fullid', post.fullID
|
||||||
$.add d.body, el
|
$.add Header.hover, el
|
||||||
UI.hover
|
UI.hover
|
||||||
root: @
|
root: @
|
||||||
el: el
|
el: el
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user