From b754ad60d56996493eaa62f220ddb7341d614cfc Mon Sep 17 00:00:00 2001 From: Torsten Stauder Date: Fri, 26 Feb 2021 10:14:47 +0100 Subject: [PATCH] Tiny fixes --- html/management.html | 6 +----- src/HTMLmanagement.h | 6 +----- src/main.cpp | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/html/management.html b/html/management.html index ee61b83..81fbd6d 100644 --- a/html/management.html +++ b/html/management.html @@ -523,7 +523,7 @@ var lastFolder = cur['id'].split('/').filter(function (el) { return el.trim().length > 0; }).pop(); - if ((/\.(mp3|MP3|ogg|wav|WAV|OGG|wma|WMA|acc|ACC|flac|FLAC)$/i).test(lastFolder)) { + if ((/\.(mp3|MP3|ogg|wav|WAV|OGG|wma|WMA|acc|ACC|flac|FLAC|.m4a|.M4A)$/i).test(lastFolder)) { data.instance.set_type(data.instance._model.data[key], 'audio'); } else { if (data.instance._model.data[key]['type'] == "file") { @@ -545,10 +545,6 @@ $('#SubTab.nav-tabs a[id="rfid-music-tab"]').tab('show'); } - if (ActiveSubTab !== 'rfid-music-tab') { - $('#SubTab.nav-tabs a[id="rfid-music-tab"]').tab('show'); - } - if (data.node.type == "folder") { $('.option-folder').show(); $('.option-file').hide(); diff --git a/src/HTMLmanagement.h b/src/HTMLmanagement.h index 70a6807..9093b9a 100644 --- a/src/HTMLmanagement.h +++ b/src/HTMLmanagement.h @@ -523,7 +523,7 @@ static const char management_HTML[] PROGMEM = "\ var lastFolder = cur['id'].split('/').filter(function (el) {\ return el.trim().length > 0;\ }).pop();\ - if ((/\\.(mp3|MP3|ogg|wav|WAV|OGG|wma|WMA|acc|ACC|flac|FLAC)$/i).test(lastFolder)) {\ + if ((/\\.(mp3|MP3|ogg|wav|WAV|OGG|wma|WMA|acc|ACC|flac|FLAC|.m4a|.M4A)$/i).test(lastFolder)) {\ data.instance.set_type(data.instance._model.data[key], 'audio');\ } else {\ if (data.instance._model.data[key]['type'] == \"file\") {\ @@ -540,10 +540,6 @@ static const char management_HTML[] PROGMEM = "\ $('#explorerTree').on('select_node.jstree', function (e, data) {\ \ $('input[name=fileOrUrl]').val(data.node.data.path);\ - \ - if (ActiveSubTab !== 'rfid-music-tab') {\ - $('#SubTab.nav-tabs a[id=\"rfid-music-tab\"]').tab('show');\ - }\ \ if (ActiveSubTab !== 'rfid-music-tab') {\ $('#SubTab.nav-tabs a[id=\"rfid-music-tab\"]').tab('show');\ diff --git a/src/main.cpp b/src/main.cpp index 804db80..204a494 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3021,18 +3021,19 @@ void doCmdAction(const uint16_t mod) { } #endif case ENABLE_FTP_SERVER: { - if (wifiManager() == WL_CONNECTED && !ftpEnableLastStatus && !ftpEnableCurrentStatus) { - ftpEnableLastStatus = true; - #ifdef NEOPIXEL_ENABLE - showLedOk = true; - #endif - } else { - #ifdef NEOPIXEL_ENABLE - showLedError = true; - loggerNl(serialDebug, (char *) FPSTR(unableToStartFtpServer), LOGLEVEL_ERROR); - #endif - } - + #ifdef FTP_ENABLE + if (wifiManager() == WL_CONNECTED && !ftpEnableLastStatus && !ftpEnableCurrentStatus) { + ftpEnableLastStatus = true; + #ifdef NEOPIXEL_ENABLE + showLedOk = true; + #endif + } else { + #ifdef NEOPIXEL_ENABLE + showLedError = true; + loggerNl(serialDebug, (char *) FPSTR(unableToStartFtpServer), LOGLEVEL_ERROR); + #endif + } + #endif break; } case CMD_PLAYPAUSE: {