Merge branch 'master' of https://notabug.org/RemixDev/deemix
This commit is contained in:
@@ -181,7 +181,6 @@
|
||||
<p>You are logged in as <b id="settings_username"></b></p>
|
||||
<button onclick="logout()" id="settings_btn_logout">Logout</button>
|
||||
</div>
|
||||
<button id="open_login_prompt" type="button" name="button" onclick="openLoginPrompt()" disabled>Login with e-mail</button>
|
||||
<div class="inline-flex">
|
||||
<input autocomplete="off" type="password" id="login_input_arl" placeholder="ARL"/>
|
||||
<button onclick="copyARLtoClipboard()" id="settings_btn_copyArl"><i class="material-icons">assignment</i></button>
|
||||
@@ -202,7 +201,7 @@
|
||||
<input type="text" v-model="settings.albumTracknameTemplate">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Playlsit track template</p>
|
||||
<p>Playlist track template</p>
|
||||
<input type="text" v-model="settings.playlistTracknameTemplate">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
@@ -210,7 +209,7 @@
|
||||
<input type="checkbox" v-model="settings.createPlaylistFolder">
|
||||
</div>
|
||||
<div class="input_group" v-if="settings.createPlaylistFolder">
|
||||
<p>Playlsit folder template</p>
|
||||
<p>Playlist folder template</p>
|
||||
<input type="text" v-model="settings.playlistNameTemplate">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
@@ -255,7 +254,7 @@
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Concurrent Downloads</p>
|
||||
<input type="number" v-model="settings.queueConcurrency">
|
||||
<input type="number" v-model.number="settings.queueConcurrency">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Preferred Bitrate</p>
|
||||
@@ -302,9 +301,17 @@
|
||||
<input type="checkbox" v-model="settings.saveArtworkArtist">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Artist picture name template</p>
|
||||
<p>Artist image name template</p>
|
||||
<input type="text" v-model="settings.artistImageTemplate">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Local artwork size</p>
|
||||
<input type="number" min="100" max="1800" step="100" v-model.number="settings.localArtworkSize">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Embedded artwork size</p>
|
||||
<input type="number" min="100" max="1800" step="100" v-model.number="settings.embeddedArtworkSize">
|
||||
</div>
|
||||
<div class="input_group">
|
||||
<p>Save images as png</p>
|
||||
<input type="checkbox" v-model="settings.PNGcovers">
|
||||
|
||||
@@ -59,12 +59,6 @@ socket.on("message", function(msg){
|
||||
console.log(msg)
|
||||
})
|
||||
|
||||
window.addEventListener('pywebviewready', function() {
|
||||
if (window.pywebview.platform == "gtk"){
|
||||
$('#open_login_prompt').prop('disabled', false);
|
||||
}
|
||||
})
|
||||
|
||||
$(function(){
|
||||
if (localStorage.getItem("arl")){
|
||||
socket.emit("login", localStorage.getItem("arl"));
|
||||
@@ -95,9 +89,6 @@ document.querySelector("#hide_download_tab").onclick = (ev)=>{
|
||||
}
|
||||
|
||||
// Login stuff
|
||||
function openLoginPrompt(){
|
||||
socket.emit("loginpage")
|
||||
}
|
||||
|
||||
function loginButton(){
|
||||
let arl = document.querySelector("#login_input_arl").value
|
||||
|
||||
Reference in New Issue
Block a user