diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js index 16bcad59..39b39d27 100644 --- a/app/js/tl/notification.js +++ b/app/js/tl/notification.js @@ -98,6 +98,16 @@ function notfColumn(acct_id, tlid, sys) { } $("#notf-box").addClass("fetched"); todc(); + //Markers + var markers = localStorage.getItem("markers"); + if (markers == "no") { + markers = false; + } else { + markers = true + } + if (markers) { + getMarker(tlid, "notf", acct_id) + } } } if (!misskey) { diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index d9c7b9cc..7aa285b7 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -860,6 +860,7 @@ function columnReload(tlid, type) { websocketLocal[wssl].close(); parseColumn(tlid) } else if (type == "notf") { + $("#notice_icon_" + tlid).removeClass("red-text"); notfColumn(acct_id, tlid, "") } else { var wss = localStorage.getItem("wss_" + tlid); @@ -945,7 +946,7 @@ function showUnread(tlid, type, acct_id) { console.error(error); }).then(function (json) { if (!json) { - columnReload(tlid) + columnReload(tlid, type) } if (localStorage.getItem("filter_" + acct_id) != "undefined") { var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type); @@ -994,7 +995,7 @@ function ueload(tlid) { console.error(error); }).then(function (json) { if (!json) { - columnReload(tlid) + columnReload(tlid, type) } if (localStorage.getItem("filter_" + acct_id) != "undefined") { var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type); diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 369559ca..0d70de46 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -190,7 +190,7 @@ function parseColumn(target, dontclose) { } else { var animecss = ""; } - var unread = 'more' + var unread = 'more' if (acct.type == "notf") { var exclude = lang.lang_excluded + ':
' + ' ' + @@ -254,7 +254,7 @@ function parseColumn(target, dontclose) { key + '">On' + lang.lang_layout_linkana + '
hearingOn' + lang.lang_layout_tts + 'TL
refresh' + lang.lang_layout_reconnect + '
' + lang.lang_layout_headercolor + '
refresh' + lang.lang_layout_reconnect + '
' + lang.lang_layout_headercolor + '
' + lang.lang_layout_nodata + '
' if (numtarget) { $('timeline_box_' + key + '_box').html(html) @@ -434,23 +434,23 @@ function setToggle(tlid) { $("#util-box_" + tlid).animate({ 'height': '200px' }, { - 'duration': 300, - 'complete': function () { - $("#util-box_" + tlid).css("overflow-y", "scroll") - $("#util-box_" + tlid).removeClass("column-hide") - } - }); + 'duration': 300, + 'complete': function () { + $("#util-box_" + tlid).css("overflow-y", "scroll") + $("#util-box_" + tlid).removeClass("column-hide") + } + }); } else { $("#util-box_" + tlid).css("overflow-y", "hidden") $("#util-box_" + tlid).animate({ 'height': '0' }, { - 'duration': 300, - 'complete': function () { - $("#util-box_" + tlid).addClass("column-hide") - $("#util-box_" + tlid).css("display", "none") - } - }); + 'duration': 300, + 'complete': function () { + $("#util-box_" + tlid).addClass("column-hide") + $("#util-box_" + tlid).css("display", "none") + } + }); } } function colorpicker(key) { diff --git a/app/js/ui/scroll.js b/app/js/ui/scroll.js index ffee76a5..f75c9816 100644 --- a/app/js/ui/scroll.js +++ b/app/js/ui/scroll.js @@ -41,7 +41,7 @@ function scrollck() { function goTop(id) { if ($("#unread_" + id + " .material-icons").hasClass("teal-text")) { $("#unread_" + id + " .material-icons").removeClass("teal-text") - columnReload(id) + columnReload(id, type) } if ($("#timeline_box_" + id + "_box .tl-box").scrollTop() > 500) { $("#timeline_box_" + id + "_box .tl-box").scrollTop(500)