phschoen
/
ESPuino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Tiny fixes

master
Torsten Stauder 4 years ago
parent
b3d8c12b75
commit
b754ad60d5
3 changed files with 15 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      html/management.html
  2. 6
      src/HTMLmanagement.h
  3. 3
      src/main.cpp

6
html/management.html
View File

@ -523,7 +523,7 @@
var lastFolder = cur['id'].split('/').filter(function (el) { var lastFolder = cur['id'].split('/').filter(function (el) {
return el.trim().length > 0; return el.trim().length > 0;
}).pop(); }).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'); data.instance.set_type(data.instance._model.data[key], 'audio');
} else { } else {
if (data.instance._model.data[key]['type'] == "file") { if (data.instance._model.data[key]['type'] == "file") {
@ -545,10 +545,6 @@
$('#SubTab.nav-tabs a[id="rfid-music-tab"]').tab('show'); $('#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") { if (data.node.type == "folder") {
$('.option-folder').show(); $('.option-folder').show();
$('.option-file').hide(); $('.option-file').hide();

6
src/HTMLmanagement.h
View File

@ -523,7 +523,7 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
var lastFolder = cur['id'].split('/').filter(function (el) {\ var lastFolder = cur['id'].split('/').filter(function (el) {\
return el.trim().length > 0;\ return el.trim().length > 0;\
}).pop();\ }).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');\ data.instance.set_type(data.instance._model.data[key], 'audio');\
} else {\ } else {\
if (data.instance._model.data[key]['type'] == \"file\") {\ if (data.instance._model.data[key]['type'] == \"file\") {\
@ -544,10 +544,6 @@ static const char management_HTML[] PROGMEM = "<!DOCTYPE html>\
if (ActiveSubTab !== 'rfid-music-tab') {\ if (ActiveSubTab !== 'rfid-music-tab') {\
$('#SubTab.nav-tabs a[id=\"rfid-music-tab\"]').tab('show');\ $('#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\") {\ if (data.node.type == \"folder\") {\
$('.option-folder').show();\ $('.option-folder').show();\

3
src/main.cpp
View File

@ -3021,6 +3021,7 @@ void doCmdAction(const uint16_t mod) {
} }
#endif #endif
case ENABLE_FTP_SERVER: { case ENABLE_FTP_SERVER: {
#ifdef FTP_ENABLE
if (wifiManager() == WL_CONNECTED && !ftpEnableLastStatus && !ftpEnableCurrentStatus) { if (wifiManager() == WL_CONNECTED && !ftpEnableLastStatus && !ftpEnableCurrentStatus) {
ftpEnableLastStatus = true; ftpEnableLastStatus = true;
#ifdef NEOPIXEL_ENABLE #ifdef NEOPIXEL_ENABLE
@ -3032,7 +3033,7 @@ void doCmdAction(const uint16_t mod) {
loggerNl(serialDebug, (char *) FPSTR(unableToStartFtpServer), LOGLEVEL_ERROR); loggerNl(serialDebug, (char *) FPSTR(unableToStartFtpServer), LOGLEVEL_ERROR);
#endif #endif
} }
#endif
break; break;
} }
case CMD_PLAYPAUSE: { case CMD_PLAYPAUSE: {

Write Preview
Loading…
Cancel
Save