-
-
-
-
-
-
- {script "js/al_playlists.js"}
{/block}
diff --git a/Web/Presenters/templates/Gifts/Pick.xml b/Web/Presenters/templates/Gifts/Pick.xml
index 22345389..53538b78 100644
--- a/Web/Presenters/templates/Gifts/Pick.xml
+++ b/Web/Presenters/templates/Gifts/Pick.xml
@@ -13,7 +13,7 @@
{block content}
-
-
-
-
-
- {include "player.xml", audio => $audio, hideButtons => true}
-
-
- {_add_to_playlist}
-
-
- {_show_more_audios}
-
-
@@ -41,18 +41,3 @@
]}
{/block}
-
-{block bodyScripts}
-
-{/block}
\ No newline at end of file
diff --git a/Web/Presenters/templates/Group/Followers.xml b/Web/Presenters/templates/Group/Followers.xml
index 7a1654d2..6ddece4f 100644
--- a/Web/Presenters/templates/Group/Followers.xml
+++ b/Web/Presenters/templates/Group/Followers.xml
@@ -82,23 +82,25 @@
{/block}
diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml
index f1eb8fe8..327dd2f5 100644
--- a/Web/Presenters/templates/Group/View.xml
+++ b/Web/Presenters/templates/Group/View.xml
@@ -318,7 +318,3 @@
{/block}
-
-{block bodyScripts}
- {script "js/al_despacito_wall.js"}
-{/block}
\ No newline at end of file
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index b3e34d56..44c7a6ce 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -745,7 +745,3 @@
{include "banned.xml"}
{/if}
{/block}
-
-{block bodyScripts}
- {script "js/al_despacito_wall.js"}
-{/block}
diff --git a/Web/static/css/audios.css b/Web/static/css/audios.css
index bd60d046..bbb29989 100644
--- a/Web/static/css/audios.css
+++ b/Web/static/css/audios.css
@@ -13,7 +13,7 @@
}
.musicIcon {
- background-image: url('/assets/packages/static/openvk/img/audios_controls.png?v=2');
+ background-image: url('/assets/packages/static/openvk/img/audios_controls.png?v=6');
background-repeat: no-repeat;
cursor: pointer;
}
@@ -150,7 +150,7 @@
}
.bigPlayer .slider, .audioEmbed .track .slider {
- width: 18px;
+ width: 15px;
height: 7px;
background: #606060;
position: absolute;
@@ -231,13 +231,13 @@
}
.bigPlayer .trackPanel .track .selectableTrack > div {
- width: 95%;
+ width: 96%;
position: relative;
}
.bigPlayer .volumePanel .selectableTrack > div {
position: relative;
- width: 72%
+ width: 77%;
}
.audioEmbed .track > .selectableTrack, .bigPlayer .selectableTrack {
@@ -881,3 +881,137 @@
margin-top: 6px;
padding: 1px;
}
+
+/* AJAX player */
+#ajax_audio_player {
+ transition: background .1s ease-out;
+ background: rgba(44, 44, 44, 0.7);
+ padding: 1px;
+ width: 500px;
+ height: 37px;
+ position: fixed;
+ z-index: 99;
+ border-radius: 3px;
+}
+
+#ajax_audio_player.hidden {
+ display: none;
+}
+
+#ajax_audio_player #aj_player {
+ position: relative;
+ height: 100%;
+}
+
+#ajax_audio_player #aj_player #aj_player_internal_controls {
+ padding: 7px 8px;
+ display: flex;
+ gap: 7px;
+}
+
+#ajax_audio_player.ui-draggable-dragging {
+ background: rgba(20, 20, 20, 0.9);
+}
+
+#ajax_audio_player #aj_player_close_btn, #ajax_audio_player #aj_player_play {
+ padding: 3px 0px;
+}
+
+#ajax_audio_player #aj_player_close_btn,
+#ajax_audio_player #aj_player_play #aj_player_play_btn,
+#ajax_audio_player #aj_player_buttons > div {
+ background: url('/assets/packages/static/openvk/img/audios_controls.png?v=6');
+ background-repeat: no-repeat;
+ cursor: pointer;
+}
+
+#ajax_audio_player #aj_player_close_btn {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 10px;
+ height: 9px;
+ background-position: 0px -77px;
+ opacity: 0.6;
+}
+
+#ajax_audio_player #aj_player_close_btn:hover {
+ opacity: 1;
+}
+
+#ajax_audio_player #aj_player_play #aj_player_play_btn {
+ width: 16px;
+ height: 16px;
+ background-position: -147px -28px;
+}
+
+#ajax_audio_player #aj_player_play #aj_player_play_btn.paused {
+ background-position: -165px -28px;
+}
+
+#ajax_audio_player #aj_player_track {
+ width: 100%;
+ position: relative;
+}
+
+#ajax_audio_player #aj_player_track #aj_player_track_name {
+ display: flex;
+ justify-content: space-between;
+}
+
+#ajax_audio_player #aj_player_track #aj_player_track_name #aj_player_track_title,
+#ajax_audio_player #aj_player_track #aj_player_track_name #aj_player_track_title b,
+#ajax_audio_player #aj_player_track #aj_player_track_name #aj_player_track_title span,
+#ajax_audio_player #aj_player_track #aj_player_track_name span {
+ color: white;
+}
+
+#ajax_audio_player .selectableTrack {
+ width: 100%;
+ position: relative;
+ height: 6px;
+ border-top: #ffffff 1px solid;
+ user-select: none;
+}
+
+#ajax_audio_player .selectableTrack .slider {
+ width: 11px;
+ height: 6px;
+ background: #ffffff;
+ position: absolute;
+}
+
+#ajax_audio_player #aj_player_volume {
+ width: 60px;
+ padding-top: 15px;
+ position: relative;
+}
+
+#ajax_audio_player #aj_player_buttons {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 10px;
+}
+
+#ajax_audio_player #aj_player_buttons #aj_player_previous {
+ width: 14px;
+ height: 12px;
+ background-position: -194px -5px;
+}
+
+#ajax_audio_player #aj_player_buttons #aj_player_repeat {
+ width: 14px;
+ height: 13px;
+ background-position: -233px -5px;
+}
+
+#ajax_audio_player #aj_player_buttons #aj_player_repeat.pressed {
+ opacity: 0.6;
+}
+
+#ajax_audio_player #aj_player_buttons #aj_player_next {
+ width: 15px;
+ height: 12px;
+ background-position: -214px -5px;
+}
diff --git a/Web/static/img/audios_controls.png b/Web/static/img/audios_controls.png
index 47f39673fcee892f989fc9c8790cf753060bc631..2b02c7c0168d00083e82e80c25b5c7f84e3d2e35 100644
GIT binary patch
delta 4592
zcmV
+
+ `)
+ u('body').append(miniplayer_template)
+ miniplayer_template.attr('style', `left:${previous_time_x}px;top:${previous_time_y}px`)
+ miniplayer_template.find('#aj_player_close_btn').on('click', (e) => {
+ this.ajClose()
+ })
+ miniplayer_template.find('#aj_player_track_title').on('click', (e) => {
+ if(window.player && window.player.context && window.player.context.object) {
+ window.router.route(window.player.context.object.url)
+ }
+ })
+ $('#ajax_audio_player').draggable({
+ cursor: 'grabbing',
+ containment: 'window',
+ cancel: '#aj_player_track .selectableTrack, #aj_player_volume .selectableTrack',
+ stop: function(e) {
+ if(window.player.ajaxPlayer.length > 0) {
+ const left = parseInt(window.player.ajaxPlayer.nodes[0].style.left)
+ const top = parseInt(window.player.ajaxPlayer.nodes[0].style.top)
+
+ localStorage.setItem('audio.lastX', left)
+ localStorage.setItem('audio.lastY', top)
+ }
+ }
+ })
+ }
}
document.addEventListener("DOMContentLoaded", async () => {
await window.player.init(window.__current_page_audio_context)
})
-u(document).on('click', '.audioEntry .playerButton > .playIcon', (e) => {
+u(document).on('click', '.audioEntry .playerButton > .playIcon', async (e) => {
const audioPlayer = u(e.target).closest('.audioEmbed')
const id = Number(audioPlayer.attr('data-realid'))
if(!window.player) {
@@ -540,7 +742,7 @@ u(document).on('click', '.audioEntry .playerButton > .playIcon', (e) => {
}
if(window.player.current_track_id != id) {
- window.player.setTrack(id)
+ await window.player.setTrack(id)
}
if(window.player.audioPlayer.paused) {
@@ -563,7 +765,7 @@ u(document).on('click', '.audioEntry .playerButton > .playIcon', (e) => {
}
})
-u(document).on('click', '.bigPlayer .playButton', (e) => {
+u(document).on('click', '.bigPlayer .playButton, #ajax_audio_player #aj_player_play_btn', (e) => {
if(window.player.audioPlayer.paused) {
window.player.play()
} else {
@@ -571,12 +773,12 @@ u(document).on('click', '.bigPlayer .playButton', (e) => {
}
})
-u(document).on('click', '.bigPlayer .backButton', (e) => {
- window.player.playNextTrack()
+u(document).on('click', '.bigPlayer .backButton, #ajax_audio_player #aj_player_next', async (e) => {
+ await window.player.playNextTrack()
})
-u(document).on('click', '.bigPlayer .nextButton', (e) => {
- window.player.playPreviousTrack()
+u(document).on('click', '.bigPlayer .nextButton, #ajax_audio_player #aj_player_previous', async (e) => {
+ await window.player.playPreviousTrack()
})
u(document).on("click", ".bigPlayer .elapsedTime", (e) => {
@@ -588,7 +790,7 @@ u(document).on("click", ".bigPlayer .elapsedTime", (e) => {
window.player.__updateTime(window.player.audioPlayer.currentTime)
})
-u(document).on("click", ".bigPlayer .additionalButtons .repeatButton", (e) => {
+u(document).on("click", ".bigPlayer .additionalButtons .repeatButton, #ajax_audio_player #aj_player_repeat", (e) => {
if(window.player.current_track_id == 0)
return
@@ -601,11 +803,11 @@ u(document).on("click", ".bigPlayer .additionalButtons .repeatButton", (e) => {
window.player.audioPlayer.loop = false
})
-u(document).on("click", ".bigPlayer .additionalButtons .shuffleButton", (e) => {
+u(document).on("click", ".bigPlayer .additionalButtons .shuffleButton", async (e) => {
if(window.player.current_track_id == 0)
return
- window.player.shuffle()
+ await window.player.shuffle()
})
u(document).on("click", ".bigPlayer .additionalButtons .deviceButton", (e) => {
@@ -693,7 +895,7 @@ u(document).on('keyup', (e) => {
}
})
-u(document).on("mousemove click mouseup", ".bigPlayer .trackPanel .selectableTrack, .audioEntry .subTracks .lengthTrackWrapper .selectableTrack", (e) => {
+u(document).on("mousemove click mouseup", ".bigPlayer .trackPanel .selectableTrack, .audioEntry .subTracks .lengthTrackWrapper .selectableTrack, #aj_player_track_length .selectableTrack", (e) => {
if(window.player.isAtAudiosPage() && window.player.current_track_id == 0)
return
@@ -724,17 +926,17 @@ u(document).on("mousemove click mouseup", ".bigPlayer .trackPanel .selectableTra
parent.find('.tip_result').html(fmtTime(time)).attr('style', `left:min(${width - 15}px, 315.5px)`)
})
-u(document).on("mouseout", ".bigPlayer .trackPanel .selectableTrack, .audioEntry .subTracks .lengthTrackWrapper .selectableTrack", (e) => {
+u(document).on("mouseout", ".bigPlayer .trackPanel .selectableTrack, .audioEntry .subTracks .lengthTrackWrapper .selectableTrack, #aj_player_track_length .selectableTrack", (e) => {
if(window.player.isAtAudiosPage() && window.player.current_track_id == 0)
return
u(e.target).closest('.selectableTrack').parent().find('.tip_result').remove()
})
-u(document).on("mousemove click mouseup", ".bigPlayer .volumePanelTrack .selectableTrack, .audioEntry .subTracks .volumeTrack .selectableTrack", (e) => {
+u(document).on("mousemove click mouseup", ".bigPlayer .volumePanelTrack .selectableTrack, .audioEntry .subTracks .volumeTrack .selectableTrack, #aj_player_volume .selectableTrack", (e) => {
if(window.player.isAtAudiosPage() && window.player.current_track_id == 0)
return
-
+
function __defaultAction(i_volume) {
window.player.audioPlayer.volume = i_volume
}
@@ -761,7 +963,7 @@ u(document).on("mousemove click mouseup", ".bigPlayer .volumePanelTrack .selecta
parent.find('.tip_result').html((volume * 100).toFixed(0) + '%').attr('style', `left:${width - 15}px`)
})
-u(document).on("mouseout", ".bigPlayer .volumePanelTrack .selectableTrack, .audioEntry .subTracks .volumeTrack .selectableTrack", (e) => {
+u(document).on("mouseout", ".bigPlayer .volumePanelTrack .selectableTrack, .audioEntry .subTracks .volumeTrack .selectableTrack, #aj_player_volume .selectableTrack", (e) => {
if(window.player.isAtAudiosPage() && window.player.current_track_id == 0)
return
@@ -924,8 +1126,6 @@ u(document).on("click", ".musicIcon.edit-icon", (e) => {
if(url.searchParams.p != null)
page = String(url.searchParams.p)
-
- window.savedAudiosPages[page] = null
} else
fastError(response.flash.message)
}
@@ -1483,49 +1683,6 @@ $(document).on("click", ".musicIcon.report-icon", (e) => {
Function.noop])
})
-u(document).on("click", ".audiosContainer .paginator a", (e) => {
- e.preventDefault()
- e.stopPropagation()
-
- let url = new URL(e.currentTarget.href)
- let page = url.searchParams.get("p")
-
- function searchNode(id) {
- let node = document.querySelector(`.audioEmbed[data-realid='${id}'] .audioEntry`)
-
- if(node != null) {
- node.classList.add("nowPlaying")
- }
- }
-
- if(window.savedAudiosPages[page] != null) {
- history.pushState({}, "", e.currentTarget.href)
- document.querySelector(".audiosContainer").innerHTML = window.savedAudiosPages[page].innerHTML
- searchNode(window.player.currentTrack != null ? window.player.currentTrack.id : 0)
-
- return
- }
-
- e.currentTarget.parentNode.classList.add("lagged")
- $.ajax({
- type: "GET",
- url: e.currentTarget.href,
- success: (response) => {
- let domparser = new DOMParser()
- let result = domparser.parseFromString(response, "text/html")
-
- document.querySelector(".audiosContainer").innerHTML = result.querySelector(".audiosContainer").innerHTML
- history.pushState({}, "", e.currentTarget.href)
- window.savedAudiosPages[page] = result.querySelector(".audiosContainer")
- searchNode(window.player.currentTrack != null ? window.player.currentTrack.id : 0)
-
- if(!window.player.context["playedPages"].includes(page)) {
- window.player.loadContext(page)
- }
- }
- })
-})
-
$(document).on("click", ".addToPlaylist", (e) => {
let audios = document.querySelector("input[name='audios']")
let id = e.currentTarget.dataset.id
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 74c54002..c0c1ebf5 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -473,6 +473,7 @@ u(document).on('keydown', '.edit_menu #write', (e) => {
e.target.closest('.edit_menu').querySelector('#__edit_save').click()
})
+// Migrated from inline start
function reportPhoto(photo_id) {
uReportMsgTxt = tr("going_to_report_photo");
uReportMsgTxt += "
+
+
+
+ "+tr("report_question_text"); @@ -539,6 +540,132 @@ function reportUser(user_id) { ]); } +$(document).on("click", "#_photoDelete, #_videoDelete", function(e) { + var formHtml = ""; + u("body").append(formHtml); + + MessageBox(tr('warning'), tr('question_confirm'), [ + tr('yes'), + tr('no') + ], [ + (function() { + u("#tmpPhDelF").nodes[0].submit(); + }), + (function() { + u("#tmpPhDelF").remove(); + }), + ]); + + e.stopPropagation() + return e.preventDefault(); +}); +/* @rem-pai why this func wasn't named as "#_deleteDialog"? It looks universal IMO */ + +u(document).on("click", "#_noteDelete", function(e) { + var formHtml = ""; + u("body").append(formHtml); + + MessageBox(tr('warning'), tr('question_confirm'), [ + tr('yes'), + tr('no') + ], [ + (function() { + u("#tmpPhDelF").nodes[0].submit(); + }), + (function() { + u("#tmpPhDelF").remove(); + }), + ]); + + e.stopPropagation() + return e.preventDefault(); +}); + +// TODO REWRITE cuz its a little broken +u(document).on("click", "#_pinGroup", async function(e) { + e.preventDefault(); + e.stopPropagation() + + let link = u(this).attr("href"); + let thisButton = u(this); + let groupName = u(this).attr("data-group-name"); + let groupUrl = u(this).attr("data-group-url"); + let list = u('#_groupListPinnedGroups'); + + thisButton.nodes[0].classList.add('loading'); + thisButton.nodes[0].classList.add('disable'); + + let req = await ky(link); + if(req.ok == false) { + NewNotification(tr('error'), tr('error_1'), null); + thisButton.nodes[0].classList.remove('loading'); + thisButton.nodes[0].classList.remove('disable'); + return; + } + + if(!parseAjaxResponse(await req.text())) { + thisButton.nodes[0].classList.remove('loading'); + thisButton.nodes[0].classList.remove('disable'); + return; + } + + // Adding a divider if not already there + if(list.nodes[0].children.length == 0) { + list.nodes[0].append(u('').first()); + } + + // Changing the button name + if(thisButton.html().trim() == tr('remove_from_left_menu')) { + thisButton.html(tr('add_to_left_menu')); + for(let i = 0; i < list.nodes[0].children.length; i++) { + let element = list.nodes[0].children[i]; + if(element.pathname == groupUrl) { + element.remove(); + } + } + }else{ + thisButton.html(tr('remove_from_left_menu')); + list.nodes[0].append(u('' + groupName + '').first()); + } + + // Adding the group to the left group list + if(list.nodes[0].children[0].className != "menu_divider" || list.nodes[0].children.length == 1) { + list.nodes[0].children[0].remove(); + } + + thisButton.nodes[0].classList.remove('loading'); + thisButton.nodes[0].classList.remove('disable'); + + return false; +}); + +u(document).handle("submit", "#_submitUserSubscriptionAction", async function(e) { + e.preventDefault() + e.stopPropagation() + + u(this).nodes[0].parentElement.classList.add('loading'); + u(this).nodes[0].parentElement.classList.add('disable'); + console.log(e.target); + const data = await fetch(u(this).attr('action'), { method: 'POST', body: new FormData(e.target) }); + if (data.ok) { + u(this).nodes[0].parentElement.classList.remove('loading'); + u(this).nodes[0].parentElement.classList.remove('disable'); + if (e.target[0].value == "add") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_add_msg"); + } else if (e.target[0].value == "rej") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_rej_msg"); + } else if (e.target[0].value == "rem") { + u(this).nodes[0].parentElement.innerHTML = tr("friends_rem_msg"); + } + } +}) + +// Migrated from inline end + var tooltipClientTemplate = Handlebars.compile(`