From 59a52eab655f734e6898814b7f7d4e4c1ede3100 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sat, 13 Aug 2022 16:44:17 +0700
Subject: [PATCH 01/19] Update install.sh

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 11a88d127..4435faa42 100644
--- a/install.sh
+++ b/install.sh
@@ -2,8 +2,8 @@
 
 alias=r1
 
-# 20220810
-sed -i '/#IgnorePkg/ a\IgnorePkg = bluez-utils' /etc/pacman.conf
+# 20220813
+! grep -q bluez-utils /etc/pacman.conf && sed -i '/#IgnorePkg/ a\IgnorePkg = bluez-utils' /etc/pacman.conf
 
 # 20220805
 dirdata=/srv/http/data

From b39ed569e3295dda89574c077b46185f85266f97 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sat, 13 Aug 2022 20:39:08 +0700
Subject: [PATCH 02/19] Update networks-scanbt.sh

---
 srv/http/bash/settings/networks-scanbt.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srv/http/bash/settings/networks-scanbt.sh b/srv/http/bash/settings/networks-scanbt.sh
index 4b38df1c6..6a82ec353 100644
--- a/srv/http/bash/settings/networks-scanbt.sh
+++ b/srv/http/bash/settings/networks-scanbt.sh
@@ -18,11 +18,11 @@ paired=$( listBt paired-devices )
 [[ $paired ]] && devices=$( diff <( echo "$paired" ) <( echo "$devices" ) | grep '^>' | cut -c 3- )
 readarray -t devices <<< "$devices"
 for dev in "${devices[@]}"; do
-        name=${dev/^*}
-        mac=${dev/*^}
-        data+=',{
-  "name"      : "'$name'"
-, "mac"       : "'$mac'"
+	name=${dev/^*}
+	mac=${dev/*^}
+	data+=',{
+  "name" : "'$name'"
+, "mac"  : "'$mac'"
 }'
 done
 

From 284fc3e90c87c1feea9224da35de977d80a7df32 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sat, 13 Aug 2022 20:47:18 +0700
Subject: [PATCH 03/19] u

---
 srv/http/assets/js/networks.js                |  4 +--
 srv/http/assets/js/settings.js                |  4 +--
 ...{networks-scanwlan.sh => networks-scan.sh} | 28 ++++++++++++++++++
 srv/http/bash/settings/networks-scanbt.sh     | 29 -------------------
 4 files changed, 32 insertions(+), 33 deletions(-)
 rename srv/http/bash/settings/{networks-scanwlan.sh => networks-scan.sh} (68%)
 delete mode 100644 srv/http/bash/settings/networks-scanbt.sh

diff --git a/srv/http/assets/js/networks.js b/srv/http/assets/js/networks.js
index 1c7ef487e..46df5c6c2 100644
--- a/srv/http/assets/js/networks.js
+++ b/srv/http/assets/js/networks.js
@@ -504,7 +504,7 @@ function renderQR() {
 	}
 }
 function scanBluetooth() {
-	bash( '/srv/http/bash/settings/networks-scanbt.sh', function( data ) {
+	bash( '/srv/http/bash/settings/networks-scan.sh', function( data ) {
 		if ( data ) {
 			G.listbtscan = data;
 			var htmlbt = '';
@@ -517,7 +517,7 @@ function scanBluetooth() {
 	}, 'json' );
 }
 function scanWlan() {
-	bash( '/srv/http/bash/settings/networks-scanwlan.sh', function( data ) {
+	bash( '/srv/http/bash/settings/networks-scan.sh wlan', function( data ) {
 		if ( data ) {
 			var signals = '';
 			data.forEach( function( list, i, obj ) {
diff --git a/srv/http/assets/js/settings.js b/srv/http/assets/js/settings.js
index d25726a97..018a5520b 100644
--- a/srv/http/assets/js/settings.js
+++ b/srv/http/assets/js/settings.js
@@ -184,7 +184,7 @@ disconnect = () => {
 hiddenSet = () => {
 	if ( page === 'networks' ) {
 		if ( !$( '#divbluetooth' ).hasClass( 'hide' ) || !$( '#divwifi' ).hasClass( 'hide' ) ) {
-			bash( 'killall -q networks-scanbt.sh; killall -q networks-scanwlan.sh' );
+			bash( 'killall -q networks-scan.sh &> /dev/null' );
 			clearTimeout( G.timeoutScan );
 			$( '#scanning-bt, #scanning-wifi' ).removeClass( 'blink' );
 			$( '.back' ).click();
@@ -414,7 +414,7 @@ $( '.container' ).click( function( e ) {
 $( '#close' ).click( function() {
 	if ( page === 'networks' ) {
 		clearTimeout( G.timeoutScan );
-		bash( 'killall networks-scanbt.sh networks-scanwlan.sh &> /dev/null' );
+		bash( 'killall networks-scan.sh &> /dev/null' );
 	}
 	bash( [ 'cmd', 'rebootlist' ], function( list ) {
 		if ( !list ) {
diff --git a/srv/http/bash/settings/networks-scanwlan.sh b/srv/http/bash/settings/networks-scan.sh
similarity index 68%
rename from srv/http/bash/settings/networks-scanwlan.sh
rename to srv/http/bash/settings/networks-scan.sh
index ed8b2cbfb..1ba9b25c7 100644
--- a/srv/http/bash/settings/networks-scanwlan.sh
+++ b/srv/http/bash/settings/networks-scan.sh
@@ -2,6 +2,34 @@
 
 . /srv/http/bash/common.sh
 
+if [[ $1 != wlan ]]; then
+	listBt() {
+		bluetoothctl $1 \
+			| grep -v ' ..-..-..-..-..-..$' \
+			| sed -E 's/Device (..:..:..:..:..:..) (.*)/\2^\1/' \
+			| sort -f
+	}
+
+	bluetoothctl --timeout=10 scan on &> /dev/null
+
+	devices=$( listBt devices )
+	[[ ! $devices ]] && exit
+
+	paired=$( listBt paired-devices )
+	[[ $paired ]] && devices=$( diff <( echo "$paired" ) <( echo "$devices" ) | grep '^>' | cut -c 3- )
+	readarray -t devices <<< "$devices"
+	for dev in "${devices[@]}"; do
+		name=${dev/^*}
+		mac=${dev/*^}
+		data+=',{
+  "name" : "'$name'"
+, "mac"  : "'$mac'"
+}'
+	done
+	data2json "$data"
+	exit
+fi
+
 wlandev=$( cat $dirshm/wlan )
 ip link set $wlandev up
 
diff --git a/srv/http/bash/settings/networks-scanbt.sh b/srv/http/bash/settings/networks-scanbt.sh
deleted file mode 100644
index 6a82ec353..000000000
--- a/srv/http/bash/settings/networks-scanbt.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /srv/http/bash/common.sh
-
-listBt() {
-	bluetoothctl $1 \
-		| grep -v ' ..-..-..-..-..-..$' \
-		| sed -E 's/Device (..:..:..:..:..:..) (.*)/\2^\1/' \
-		| sort -f
-}
-
-bluetoothctl --timeout=10 scan on &> /dev/null
-
-devices=$( listBt devices )
-[[ ! $devices ]] && exit
-
-paired=$( listBt paired-devices )
-[[ $paired ]] && devices=$( diff <( echo "$paired" ) <( echo "$devices" ) | grep '^>' | cut -c 3- )
-readarray -t devices <<< "$devices"
-for dev in "${devices[@]}"; do
-	name=${dev/^*}
-	mac=${dev/*^}
-	data+=',{
-  "name" : "'$name'"
-, "mac"  : "'$mac'"
-}'
-done
-
-data2json "$data"

From 8d360130504f674d3d728dd3d8fccd539f2cac5b Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sat, 13 Aug 2022 22:08:47 +0700
Subject: [PATCH 04/19] u

---
 srv/http/assets/css/info.css  |  1 +
 srv/http/assets/js/main.js    | 40 +++++++++++++----------------------
 srv/http/assets/js/passive.js | 18 +++++++---------
 srv/http/bash/cmd.sh          | 16 ++++++++++++++
 srv/http/cmd.php              | 17 ---------------
 5 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/srv/http/assets/css/info.css b/srv/http/assets/css/info.css
index e88189aa4..dd87936b5 100644
--- a/srv/http/assets/css/info.css
+++ b/srv/http/assets/css/info.css
@@ -276,6 +276,7 @@ hr {
 }
 #infoContent .bklabel {
 	height: auto;
+	line-height: 30px;
 }
 #infoTopBg {
 	width: 100%;
diff --git a/srv/http/assets/js/main.js b/srv/http/assets/js/main.js
index 4f818a5d5..22b2d249c 100644
--- a/srv/http/assets/js/main.js
+++ b/srv/http/assets/js/main.js
@@ -1442,7 +1442,7 @@ $( '#lib-mode-list' ).on( 'click', '.mode-bookmark', function( e ) { // delegate
 } ).on( 'click', '.bk-remove', function() {
 	var $this = $( this ).parent();
 	var path = $this.find( '.lipath' ).text();
-	var name = $this.find( '.bklabel' ).text() || path.split( '/' ).pop();
+	var name = $this.find( '.label' ).text() || path.split( '/' ).pop();
 	var $img = $this.find( 'img' );
 	if ( $img.length ) {
 		var src = $img.attr( 'src' );
@@ -1461,36 +1461,26 @@ $( '#lib-mode-list' ).on( 'click', '.mode-bookmark', function( e ) { // delegate
 		, okcolor : red
 		, ok      : function() {
 			G.bookmarkedit = 1;
-			$.post( cmdphp, {
-				  cmd    : 'bookmarkremove'
-				, path   : path
-				, delete : name
-			} );
-			$this.parent().remove();
+			bash( [ 'bookmarkremove', name, path ] );
 		}
 	} );
 } ).on( 'click', '.bk-rename', function() {
 	var $this = $( this ).parent();
 	var path = $this.find( '.lipath' ).text();
-	var name = $this.find( '.bklabel' ).text() || path.split( '/' ).pop();
+	var name = $this.find( '.label' ).text() || path.split( '/' ).pop();
 	info( {
-		  icon       : 'bookmark'
-		, title      : 'Rename Bookmark'
-		, message    : '<div class="infobookmark"><i class="fa fa-bookmark bookmark"></i>'
+		  icon         : 'bookmark'
+		, title        : 'Rename Bookmark'
+		, message      : '<div class="infobookmark"><i class="fa fa-bookmark bookmark"></i>'
 						+'<br><span class="bklabel">'+ name +'</span></div>'
-		, textlabel  : 'To:'
-		, values     : name
-		, checkblank : 1
-		, oklabel    : '<i class="fa fa-flash"></i>Rename'
-		, ok         : function() {
+		, textlabel    : 'To:'
+		, values       : name
+		, checkblank   : 1
+		, checkchanged : 1
+		, oklabel      : '<i class="fa fa-flash"></i>Rename'
+		, ok           : function() {
 			var newname = infoVal();
-			$.post( cmdphp, {
-				  cmd    : 'bookmarkrename'
-				, path   : path
-				, name   : name
-				, rename : newname
-			} );
-			$this.find( '.bklabel' ).text( newname );
+			bash( [ 'bookmarkrename', name, newname, path ] );
 		}
 	} );
 } ).on( 'click', '.bk-cover .iconcover', function() {
@@ -1532,7 +1522,7 @@ $( '#lib-mode-list' ).on( 'click', '.mode-bookmark', function( e ) { // delegate
 	if ( G.drag ) return
 	
 	G.bookmarkedit = 1;
-	G.bklabel = $( this ).find( '.bklabel' );
+	G.bklabel = $( this ).find( '.label' );
 	$( '.mode-bookmark' ).each( function() {
 		var $this = $( this );
 		var path = $this.find( '.lipath' ).text();
@@ -1543,7 +1533,7 @@ $( '#lib-mode-list' ).on( 'click', '.mode-bookmark', function( e ) { // delegate
 	} );
 	$( '.mode-bookmark' )
 		.css( 'background', 'hsl(0,0%,15%)' )
-		.find( '.fa-bookmark, .bklabel, img' )
+		.find( '.fa-bookmark, .label, img' )
 		.css( 'opacity', 0.33 );
 } );
 new Sortable( document.getElementById( 'lib-mode-list' ), {
diff --git a/srv/http/assets/js/passive.js b/srv/http/assets/js/passive.js
index 19d7bfa37..2ae877a27 100644
--- a/srv/http/assets/js/passive.js
+++ b/srv/http/assets/js/passive.js
@@ -56,8 +56,7 @@ function bookmarkCover( src, path ) {
 				htmlbk += '<img class="bkcoverart" src="'+ src +'">';
 			} else {
 				htmlbk += '<i class="fa fa-bookmark"></i>'
-						 +'<div class="divbklabel">'
-						 +'<span class="bklabel label">'+ path.split( '/' ).pop() +'</span></div>'
+						 +'<a class="label">'+ path.split( '/' ).pop() +'</a>'
 			}
 			$this.find( '.mode' ).html( htmlbk );
 			return false
@@ -159,20 +158,19 @@ function psBookmark( data ) {
 	if ( 'html' in data ) {
 		$( '#lib-mode-list' ).append( data.html );
 	} else {
-		var $bookmark = $( '.lib-mode' ).filter( function() {
-			return $( this ).find( '.lipath' ) === data.path;
+		$( '.lib-mode.bookmark' ).each( function() {
+			var $this = $( this );
+			if ( $this.find( '.lipath' ).text() === data.path ) {
+				data.type === 'delete' ? $this.remove() : $this.find( '.label' ).text( data.name );
+				return false
+			}
 		} );
-		if ( data.type === 'delete' ) {
-			$bookmark.remove();
-		} else {
-			$bookmark.find( '.bklabel' ).text( data.name );
-		}
 	}
-	$( '.mode-bookmark, .bklabel' ).removeAttr( 'style' );
 	if ( 'order' in data ) {
 		G.display.order = data.order;
 		orderLibrary();
 	}
+	$( '#lib-mode-list' ).click();
 }
 function psCoverart( data ) {
 	clearTimeout( G.timeoutCover );
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index eb74becd3..2f723b6d6 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -353,6 +353,22 @@ audiocdtag )
 	sed -i "$track s|.*|$tag|" $dirdata/audiocd/$discid
 	pushstreamPlaylist
 	;;
+bookmarkremove )
+	name=${args[1]//\//\\/}
+	path=${args[2]}
+	rm "$dirdata/bookmarks/$name"
+	[[ -e $dirsystem/order ]] && sed -i '#"'$path'"# d' $dirsystem/order
+	data='{"type":"delete","path":"'$path'","order":'$( cat $dirsystem/order 2> /dev/null )'}'
+	pushstream bookmark "$data"
+	;;
+bookmarkrename )
+	name=${args[1]//\//\\/}
+	newname=${args[2]//\//\\/}
+	path=${args[3]}
+	mv $dirdata/bookmarks/{"$name","$newname"} 
+	data='{"type":"rename","path":"'$path'","name":"'$newname'"}'
+	pushstream bookmark "$data"
+	;;
 bookmarkreset )
 	imagepath=${args[1]}
 	name=${args[2]}
diff --git a/srv/http/cmd.php b/srv/http/cmd.php
index 45c069102..3ab7b7e6e 100644
--- a/srv/http/cmd.php
+++ b/srv/http/cmd.php
@@ -70,23 +70,6 @@
 	];
 	pushstream( 'bookmark', $data );
 	break;
-case 'bookmarkremove':
-	$path = $_POST[ 'path' ];
-	$fileorder = $dirsystem.'order';
-	$order = json_decode( file_get_contents( $fileorder ) );
-	$name = str_replace( '/', '|', $_POST[ 'delete' ] );
-	exec( 'rm "'.$dirbookmarks.escape( $name ).'"' );
-	$index = array_search( $path, $order );
-	array_splice( $order, $index, 1 ); // remove + reindex for json_encode
-	file_put_contents( $fileorder, json_encode( $order, JSON_PRETTY_PRINT ) );
-	pushstream( 'bookmark', [ 'type' => 'delete', 'path' => $path, 'order' => $order ] );
-	break;
-case 'bookmarkrename':
-	$name = $_POST[ 'name' ];
-	$rename = $_POST[ 'rename' ];
-	rename( $dirbookmarks.str_replace( '/', '|', $name ), $dirbookmarks.str_replace( '/', '|', $rename ) );
-	pushstream( 'bookmark', [ 'type' => 'rename', 'path' => $_POST[ 'path' ], 'name' => $rename ] );
-	break;
 case 'datarestore':
 	if ( $_FILES[ 'file' ][ 'error' ] != UPLOAD_ERR_OK ) exit( '-1' );
 	

From 3983344fd20d8d24ba9cd8377a9f281a640b489b Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sat, 13 Aug 2022 22:52:18 +0700
Subject: [PATCH 05/19] u

---
 srv/http/assets/js/context.js | 10 +++-------
 srv/http/assets/js/passive.js | 16 ++++++++++++++--
 srv/http/bash/cmd.sh          | 22 +++++++++++++++++++---
 srv/http/cmd.php              | 30 ------------------------------
 srv/http/index-body.php       |  2 +-
 5 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/srv/http/assets/js/context.js b/srv/http/assets/js/context.js
index 658aa218c..a2fe3a784 100644
--- a/srv/http/assets/js/context.js
+++ b/srv/http/assets/js/context.js
@@ -31,12 +31,7 @@ function bookmarkNew() {
 			}
 			, ok         : function() {
 				var name = infoVal();
-				$.post( cmdphp, {
-					  cmd      : 'bookmark'
-					, path     : path
-					, name     : name
-					, coverart : coverart
-				}, function( std ) {
+				bash( [ 'bookmarkadd', name, path, coverart ], function( std ) {
 					if ( std == -1 ) {
 						bannerHide();
 						info( {
@@ -46,9 +41,10 @@ function bookmarkNew() {
 										+'<br><wh>'+ path +'</wh>'
 										+'<br><br><wh>'+ name +'</wh> already exists.'
 						} );
+					} else {
+						banner( 'Bookmark Added', path, 'bookmark' );
 					}
 				} );
-				banner( 'Bookmark Added', path, 'bookmark' );
 			}
 		} );
 	} );
diff --git a/srv/http/assets/js/passive.js b/srv/http/assets/js/passive.js
index 2ae877a27..1eda4652e 100644
--- a/srv/http/assets/js/passive.js
+++ b/srv/http/assets/js/passive.js
@@ -155,8 +155,20 @@ function psBtReceiver( connected ) {
 	$( '#'+ prefix +'-btsender' ).toggleClass( 'hide', !connected );
 }
 function psBookmark( data ) {
-	if ( 'html' in data ) {
-		$( '#lib-mode-list' ).append( data.html );
+	if ( data.type === 'add' ) {
+		if ( data.src ) {
+			var icon = '<img class="bkcoverart" src="'+ data.src +'">';
+		} else {
+			var icon = '<i class="fa fa-bookmark"></i><a class="label">'+ data.name.replace( /|/g, '/' ) +'</a>';
+		}
+		var html = `
+<div class="lib-mode bookmark">
+	<div class="mode mode-bookmark">
+	<a class="lipath">${ data.path }</a>
+	${ icon }
+</div></div>
+`;
+		$( '#lib-mode-list' ).append( html );
 	} else {
 		$( '.lib-mode.bookmark' ).each( function() {
 			var $this = $( this );
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index 2f723b6d6..4e7237306 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -353,8 +353,24 @@ audiocdtag )
 	sed -i "$track s|.*|$tag|" $dirdata/audiocd/$discid
 	pushstreamPlaylist
 	;;
+bookmarkadd )
+	name=${args[1]//\//|}
+	path=${args[2]}
+	coverart=${args[3]}
+	[[ -e "$dirdata/bookmarks/$name" ]] && echo -1 && exit
+	
+	content=$path
+	if [[ $coverart ]]; then
+		content+="
+$coverart"
+		src=$( php -r "echo rawurlencode( '${coverart//\'/\\\'}' );" )
+	fi
+	echo "$content" > "$dirdata/bookmarks/$name"
+	data='{"type":"add","path":"'$path'", "src":"'$src'","name":"'$name'"}'
+	pushstream bookmark "$data"
+	;;
 bookmarkremove )
-	name=${args[1]//\//\\/}
+	name=${args[1]//\//|}
 	path=${args[2]}
 	rm "$dirdata/bookmarks/$name"
 	[[ -e $dirsystem/order ]] && sed -i '#"'$path'"# d' $dirsystem/order
@@ -362,8 +378,8 @@ bookmarkremove )
 	pushstream bookmark "$data"
 	;;
 bookmarkrename )
-	name=${args[1]//\//\\/}
-	newname=${args[2]//\//\\/}
+	name=${args[1]//\//|}
+	newname=${args[2]//\//|}
 	path=${args[3]}
 	mv $dirdata/bookmarks/{"$name","$newname"} 
 	data='{"type":"rename","path":"'$path'","name":"'$newname'"}'
diff --git a/srv/http/cmd.php b/srv/http/cmd.php
index 3ab7b7e6e..0fa5c9fa7 100644
--- a/srv/http/cmd.php
+++ b/srv/http/cmd.php
@@ -40,36 +40,6 @@
 	echo json_encode( $output );
 	break;
 	
-case 'bookmark':
-	$name = $_POST[ 'name' ];
-	if ( file_exists( $dirbookmarks.$name ) ) exit( '-1' );
-	
-	$path = $_POST[ 'path' ];
-	$coverart = $_POST[ 'coverart' ] ?? '';
-	$fileorder = $dirsystem.'order';
-	$order = json_decode( file_get_contents( $fileorder ) );
-	$order[] = $path;
-	file_put_contents( $fileorder, json_encode( $order, JSON_PRETTY_PRINT ) );
-	if ( $coverart ) {
-		$content = $path."\n".$coverart;
-		$icon = '<img class="bkcoverart" src="'.rawurlencode( $coverart ).'">';
-	} else {
-		$content = $path;
-		$icon ='<i class="fa fa-bookmark"></i><div class="divbklabel"><span class="bklabel label" style="">'.$name.'</span></div>';
-	}
-	file_put_contents( $dirbookmarks.str_replace( '/', '|', $name ), $content );
-	$data = [
-		  'path' => $path
-		, 'html' => '
-			<div class="lib-mode bookmark">
-				<div class="mode mode-bookmark">
-				<a class="lipath">'.$path.'</a>
-				'.$icon.'
-			</div></div>'
-		, 'order' => $order
-	];
-	pushstream( 'bookmark', $data );
-	break;
 case 'datarestore':
 	if ( $_FILES[ 'file' ][ 'error' ] != UPLOAD_ERR_OK ) exit( '-1' );
 	
diff --git a/srv/http/index-body.php b/srv/http/index-body.php
index de91b9d03..5a95de718 100644
--- a/srv/http/index-body.php
+++ b/srv/http/index-body.php
@@ -69,7 +69,7 @@
 $files = array_slice( scandir( $dir ), 2 ); // remove ., ..
 if ( count( $files ) ) {
 	foreach( $files as $name ) {
-		$data = file( $dir.'/'.$name, FILE_IGNORE_NEW_LINES );
+		$data = file( $dir.'/'.str_replace( '|', '/', $name ), FILE_IGNORE_NEW_LINES );
 		$bkpath = $data[ 0 ];
 		$coverart = $data[ 1 ] ?? '';
 		if ( $coverart ) {

From 4494a1c2dee06f383a2b8dfff4dcdb414778d54f Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 07:38:09 +0700
Subject: [PATCH 06/19] Update cmd.php

---
 srv/http/cmd.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/srv/http/cmd.php b/srv/http/cmd.php
index 0fa5c9fa7..34167ff3c 100644
--- a/srv/http/cmd.php
+++ b/srv/http/cmd.php
@@ -59,7 +59,9 @@
 	} else { // gif passed as file
 		$tmpfile = $_FILES[ 'file' ][ 'tmp_name' ];
 	}
-	cmdsh( [ $base64 ? 'thumbjpg' : 'thumbgif', $type, $tmpfile, $imagefile, $covername ] );
+	$sh = [ $base64 ? 'thumbjpg' : 'thumbgif', $type, $tmpfile, $imagefile, $covername ];
+	$script = '/usr/bin/sudo /srv/http/bash/cmd.sh "'.escape( implode( "\n", $sh ) ).'"';
+	shell_exec( $script );
 	if ( $type === 'bookmark' ) {
 		$coverfile = preg_replace( '#^/srv/http#', '', $imagefile ); // radio - /srv/http/data/...
 		$path = exec( 'head -1 "'.$dirbookmarks.$covername.'"' );
@@ -68,7 +70,11 @@
 	}
 	$coverfile = $filenoext.time().$ext;
 	if ( substr( $coverfile, 0, 4 ) === '/mnt' ) $coverfile = rawurlencode( $coverfile );
-	pushstream( 'coverart', json_decode( '{"url":"'.$coverfile.'","type":"'.$type.'"}' ) );
+	$ch = curl_init( 'http://localhost/pub?id=coverart' );
+	curl_setopt( $ch, CURLOPT_HTTPHEADER, array( 'Content-Type:application/json' ) );
+	curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( [ 'url' => $coverfile, 'type' => $type ] ) );
+	curl_exec( $ch );
+	curl_close( $ch );
 	break;
 case 'login':
 	$passwordfile = $dirsystem.'loginset';
@@ -99,18 +105,6 @@
 	break;
 }
 
-function cmdsh( $sh ) {
-	$script = '/usr/bin/sudo /srv/http/bash/cmd.sh "';
-	$script.= escape( implode( "\n", $sh ) ).'"';
-	return shell_exec( $script );
-}
 function escape( $string ) {
 	return preg_replace( '/(["`])/', '\\\\\1', $string );
 }
-function pushstream( $channel, $data ) {
-	$ch = curl_init( 'http://localhost/pub?id='.$channel );
-	curl_setopt( $ch, CURLOPT_HTTPHEADER, array( 'Content-Type:application/json' ) );
-	curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( $data, JSON_NUMERIC_CHECK ) );
-	curl_exec( $ch );
-	curl_close( $ch );
-}

From cdf4b35bd5cf5fac8d0c0eefed52a1eeca5a7555 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 07:41:26 +0700
Subject: [PATCH 07/19] Update cmd.php

---
 srv/http/cmd.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srv/http/cmd.php b/srv/http/cmd.php
index 34167ff3c..4b41fa37b 100644
--- a/srv/http/cmd.php
+++ b/srv/http/cmd.php
@@ -4,9 +4,6 @@
 $dirdata = '/srv/http/data/';
 $dirbookmarks = $dirdata.'bookmarks/';
 $dirsystem = $dirdata.'system/';
-$coverartsize = '200x200';
-$thumbsize = '80x80';
-$unsharp = '0x.5';
 
 switch( $_POST[ 'cmd' ] ) {
 

From 45d498f2cee5cc154f0c88caa2db4d585e3a8861 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 09:58:57 +0700
Subject: [PATCH 08/19] u

---
 srv/http/bash/cmd.sh | 56 +++++++++++++++++++++++++++++++++++---------
 srv/http/cmd.php     | 13 ----------
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index 4e7237306..ff0b4899a 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -56,6 +56,7 @@ gifThumbnail() {
 			rm -f "${target:0:-4}".*
 			[[ $animated ]] && (( ${imgwh[1]/x*} > 200 || ${imgwh[1]/*x} > 200 )) && gifNotify
 			gifsicle -O3 --resize-fit 200x200 "$source" > "$target"
+			[[ -e $target ]] && sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
 			dir=$( dirname "$target" )
@@ -78,6 +79,7 @@ gifThumbnail() {
 			gifsicle -O3 --resize-fit 80x80 $source > $filenoext-thumb.gif
 			;;
 	esac
+	pushstreamImage "$target" $type
 }
 jpgThumbnail() {
 	type=$1
@@ -88,6 +90,7 @@ jpgThumbnail() {
 		bookmark )
 			rm -f "${target:0:-4}".*
 			cp -f "$source" "$target"
+			sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
 			dir=$( dirname "$target" )
@@ -108,6 +111,7 @@ jpgThumbnail() {
 			convert $source -thumbnail 80x80\> -unsharp 0x.5 $filenoext-thumb.jpg
 			;;
 	esac
+	pushstreamImage "$target" $type
 }
 mpdoledLogo() {
 	systemctl stop mpd_oled
@@ -130,6 +134,14 @@ pladdPosition() {
 		pos=$(( $( mpc playlist | wc -l ) + 1 ))
 	fi
 }
+pushstreamImage() {
+	target=$1
+	type=$2
+	coverart=${target:0:-4}.$( date +%s ).${target: -3};
+	[[ ${coverart:0:4} == /mnt ]] && coverart=$( php -r "echo rawurlencode( '${coverart//\'/\\\'}' );" )
+	data='{"url":"'$coverart'","type":"'$type'"}'
+	pushstream coverart "$data"
+}
 pushstreamPlaylist() {
 	pushstream playlist "$( php /srv/http/mpdplaylist.php current )"
 }
@@ -359,22 +371,37 @@ bookmarkadd )
 	coverart=${args[3]}
 	[[ -e "$dirdata/bookmarks/$name" ]] && echo -1 && exit
 	
-	content=$path
-	if [[ $coverart ]]; then
-		content+="
-$coverart"
-		src=$( php -r "echo rawurlencode( '${coverart//\'/\\\'}' );" )
+	echo "\
+$path
+$coverart
+" > "$dirdata/bookmarks/$name"
+	if [[ -e $dirsystem/order ]]; then
+		order=$( jq < $dirsystem/order | jq '. + ["'"$path"'"]' )
+		echo "$order" > $dirsystem/order
 	fi
-	echo "$content" > "$dirdata/bookmarks/$name"
-	data='{"type":"add","path":"'$path'", "src":"'$src'","name":"'$name'"}'
+	[[ $coverart ]] && src=$( php -r "echo rawurlencode( '${coverart//\'/\\\'}' );" )
+	data='{
+  "type"  : "add"
+, "path"  : "'$path'"
+, "src"   : "'$src'"
+, "name"  : "'$name'"
+, "order" : '$order'
+}'
 	pushstream bookmark "$data"
 	;;
 bookmarkremove )
 	name=${args[1]//\//|}
 	path=${args[2]}
 	rm "$dirdata/bookmarks/$name"
-	[[ -e $dirsystem/order ]] && sed -i '#"'$path'"# d' $dirsystem/order
-	data='{"type":"delete","path":"'$path'","order":'$( cat $dirsystem/order 2> /dev/null )'}'
+	if [[ -e $dirsystem/order ]]; then
+		order=$( jq < $dirsystem/order | jq '. - ["'"$path"'"]' )
+		echo "$order" > $dirsystem/order
+	fi
+	data='{
+  "type"  : "delete"
+, "path"  : "'$path'"
+, "order" :'$( cat $dirsystem/order 2> /dev/null )'
+}'
 	pushstream bookmark "$data"
 	;;
 bookmarkrename )
@@ -382,7 +409,11 @@ bookmarkrename )
 	newname=${args[2]//\//|}
 	path=${args[3]}
 	mv $dirdata/bookmarks/{"$name","$newname"} 
-	data='{"type":"rename","path":"'$path'","name":"'$newname'"}'
+	data='{
+  "type" : "rename"
+, "path" : "'$path'"
+, "name" : "'$newname'"
+}'
 	pushstream bookmark "$data"
 	;;
 bookmarkreset )
@@ -390,7 +421,10 @@ bookmarkreset )
 	name=${args[2]}
 	sed -i '2d' "$dirdata/bookmarks/$name"
 	rm -f "$imagepath/coverart".*
-	data='{"url":"'$imagepath/reset'","type":"bookmark"}'
+	data='{
+  "url"  : "'$imagepath/reset'"
+, "type" :"bookmark"
+}'
 	pushstream coverart "$data"
 	;;
 bookmarkthumb )
diff --git a/srv/http/cmd.php b/srv/http/cmd.php
index 4b41fa37b..bcb2bdab4 100644
--- a/srv/http/cmd.php
+++ b/srv/http/cmd.php
@@ -59,19 +59,6 @@
 	$sh = [ $base64 ? 'thumbjpg' : 'thumbgif', $type, $tmpfile, $imagefile, $covername ];
 	$script = '/usr/bin/sudo /srv/http/bash/cmd.sh "'.escape( implode( "\n", $sh ) ).'"';
 	shell_exec( $script );
-	if ( $type === 'bookmark' ) {
-		$coverfile = preg_replace( '#^/srv/http#', '', $imagefile ); // radio - /srv/http/data/...
-		$path = exec( 'head -1 "'.$dirbookmarks.$covername.'"' );
-		if ( file_exists( $imagefile ) ) $path.= "\n".$coverfile;
-		file_put_contents( $dirbookmarks.$covername, $path );
-	}
-	$coverfile = $filenoext.time().$ext;
-	if ( substr( $coverfile, 0, 4 ) === '/mnt' ) $coverfile = rawurlencode( $coverfile );
-	$ch = curl_init( 'http://localhost/pub?id=coverart' );
-	curl_setopt( $ch, CURLOPT_HTTPHEADER, array( 'Content-Type:application/json' ) );
-	curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( [ 'url' => $coverfile, 'type' => $type ] ) );
-	curl_exec( $ch );
-	curl_close( $ch );
 	break;
 case 'login':
 	$passwordfile = $dirsystem.'loginset';

From 27feb46b0f8c4cd228e17ebfd9cfcb49c68b51f0 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 12:02:18 +0700
Subject: [PATCH 09/19] u

---
 srv/http/assets/js/function.js |  4 +++-
 srv/http/bash/cmd.sh           |  4 +++-
 srv/http/mpdlibrary.php        | 20 +++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/srv/http/assets/js/function.js b/srv/http/assets/js/function.js
index e82617c58..2cfc732d5 100644
--- a/srv/http/assets/js/function.js
+++ b/srv/http/assets/js/function.js
@@ -638,7 +638,9 @@ function imageLoad( list ) {
 				var menumode = 'folder';
 			}
 			$lazyload.off( 'error' ).on( 'error', function() {
-				$( this ).replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menumode +'"></i>' );
+				var $this = $( this );
+				if ( $this.parent().hasClass( 'dir' ) ) mode = 'folder';
+				$this.replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menumode +'"></i>' );
 			} );
 		}
 	} else {
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index ff0b4899a..b6c1f527f 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -56,6 +56,7 @@ gifThumbnail() {
 			rm -f "${target:0:-4}".*
 			[[ $animated ]] && (( ${imgwh[1]/x*} > 200 || ${imgwh[1]/*x} > 200 )) && gifNotify
 			gifsicle -O3 --resize-fit 200x200 "$source" > "$target"
+			gifsicle -O3 --resize-fit 80x80 "$source" > "$( dirname "$target" )/thumb.gif"
 			[[ -e $target ]] && sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
@@ -90,6 +91,7 @@ jpgThumbnail() {
 		bookmark )
 			rm -f "${target:0:-4}".*
 			cp -f "$source" "$target"
+			convert "$target" -thumbnail 80x80\> -unsharp 0x.5 "$( dirname "$target" )/thumb.jpg"
 			sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
@@ -97,7 +99,7 @@ jpgThumbnail() {
 			rm -f "$dir/cover".*.backup "$dir/coverart".* "$dir/thumb".*
 			coverfile=$( ls -1 "$dir/cover".* 2> /dev/null | head -1 )
 			[[ -e $coverfile ]] && mv -f "$coverfile" "$coverfile.backup"
-			cp -f "$source" "$dir/cover.jpg" # already resized from client
+			cp -f "$source" "$target" # already resized from client
 			[[ ! -e "$target" ]] && pushstreamNotify ${type^} 'No write permission.' warning && exit
 			
 			convert "$source" -thumbnail 200x200\> -unsharp 0x.5 "$dir/coverart.jpg"
diff --git a/srv/http/mpdlibrary.php b/srv/http/mpdlibrary.php
index f25ed6263..aa86d10ba 100644
--- a/srv/http/mpdlibrary.php
+++ b/srv/http/mpdlibrary.php
@@ -137,8 +137,7 @@
 case 'radio':
 	$dir = '/srv/http/data/'.$gmode.'/';
 	$dirimg = '/data/'.$gmode.'/img/';
-	$path = $string !== '' ? $string.'/' : '';
-	$dir.= $path;
+	$dir.= $string;
 	$subdirs = [];
 	$files = [];
 	$indexes = [];
@@ -151,14 +150,14 @@
 		exec( 'ls -1 "'.$dir.'" | egrep -v "^img|\.jpg$|\.gif$"'
 			, $lists );
 		foreach( $lists as $list ) {
-			if ( is_dir( $dir.$list ) ) {
+			if ( is_dir( $dir.'/'.$list ) ) {
 				$subdirs[] = $list;
 			} else {
 				$files[] = $list;
 			}
 		}
 	}
-	htmlRadio( $subdirs, $files, $dir, $dirimg, $path );
+	htmlRadio( $subdirs, $files, $dir, $dirimg );
 	break;
 case 'search':
 	exec( 'mpc search -f "'.$format.'" any "'.$string.'" | awk NF'
@@ -361,7 +360,7 @@ function htmlList( $lists ) { // non-file 'list' command
 			<div id="lib-index1" class="index index1">'.$indexbar[ 1 ].'</div>';
 	echo $html;
 }
-function htmlRadio( $subdirs, $files, $dir, $dirimg, $path ) {
+function htmlRadio( $subdirs, $files, $dir, $dirimg ) {
 	global $mode;
 	global $gmode;
 	global $html;
@@ -375,6 +374,7 @@ function htmlRadio( $subdirs, $files, $dir, $dirimg, $path ) {
 		usort( $array, function( $a, $b ) {
 			return strnatcasecmp( $a->sort, $b->sort );
 		} );
+		$path = substr( $dir, 9 );
 		foreach( $array as $each ) {
 			if ( count( $files ) ) {
 				$html.= '<li class="dir">';
@@ -383,9 +383,11 @@ function htmlRadio( $subdirs, $files, $dir, $dirimg, $path ) {
 				$indexes[] = $index;
 				$html.= '<li class="dir" data-index="'.$index.'">';
 			}
-			$html.= '<i class="lib-icon fa fa-folder" data-target="#menu-wrdir"></i>
-					<a class="lipath">'.$path.$each->subdir.'</a>
-					<span class="single">'.$each->subdir.'</span>
+			$subdir = $each->subdir;
+			$thumbsrc = rawurlencode( $path.$subdir.'/thumb.'.time().'.jpg' );
+			$html.= '<img class="lazyload iconthumb lib-icon" data-src="'.$thumbsrc.'" data-target="#menu-wrdir">
+					<a class="lipath">'.$subdir.'</a>
+					<span class="single">'.$subdir.'</span>
 				</li>';
 		}
 	}
@@ -416,7 +418,7 @@ function htmlRadio( $subdirs, $files, $dir, $dirimg, $path ) {
 			$name = $searchmode ? preg_replace( "/($string)/i", '<bl>$1</bl>', $liname ) : $liname;
 			$html.= '<li class="file"'.$datacharset.' data-index="'.$index.'">
 						<img class="lazyload iconthumb lib-icon" data-src="'.$thumbsrc.'" data-target="#menu-webradio">
-						<a class="lipath">'.$path.$url.'</a>
+						<a class="lipath">'.$url.'</a>
 						<a class="liname">'.$liname.'</a>
 						<div class="li1">'.$name.'</div>
 						<div class="li2">'.$url.'</div>

From f597b76ec5e597a9a4652ca724d17f264b35eaa2 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 12:31:36 +0700
Subject: [PATCH 10/19] u

---
 srv/http/assets/js/function.js |  9 +++++++--
 srv/http/assets/js/main.js     |  2 +-
 srv/http/assets/js/passive.js  |  2 +-
 srv/http/bash/cmd.sh           | 30 ++++++++++++------------------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/srv/http/assets/js/function.js b/srv/http/assets/js/function.js
index 2cfc732d5..30d076ac5 100644
--- a/srv/http/assets/js/function.js
+++ b/srv/http/assets/js/function.js
@@ -190,7 +190,7 @@ function contextmenuLibrary( $li, $target ) {
 		$li.addClass( 'active' );
 		return
 	}
-	var filemode = [ 'nas', 'sd', 'usb', 'webradio' ].includes( G.mode );
+	var filemode = [ 'nas', 'sd', 'usb', 'dabradio', 'webradio' ].includes( G.mode );
 	$menu.find( '.playnext, .replace' ).toggleClass( 'hide', !G.status.pllength );
 	$menu.find( '.replace' ).next().toggleClass( 'hide', !G.status.pllength );
 	$menu.find( '.refresh-library' ).toggleClass( 'hide', !( 'updating_db' in G.status ) );
@@ -633,13 +633,18 @@ function imageLoad( list ) {
 			if ( G.mode.slice( -5 ) === 'radio' ) {
 				var mode = G.mode;
 				var menumode = 'webradio';
+				var radio = 1;
 			} else {
 				var mode = 'folder';
 				var menumode = 'folder';
+				var radio = 0;
 			}
 			$lazyload.off( 'error' ).on( 'error', function() {
 				var $this = $( this );
-				if ( $this.parent().hasClass( 'dir' ) ) mode = 'folder';
+				if ( radio && $this.parent().hasClass( 'dir' ) ) {
+					mode = 'folder';
+					menumode = 'wrdir';
+				}
 				$this.replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menumode +'"></i>' );
 			} );
 		}
diff --git a/srv/http/assets/js/main.js b/srv/http/assets/js/main.js
index 22b2d249c..4f1c57aee 100644
--- a/srv/http/assets/js/main.js
+++ b/srv/http/assets/js/main.js
@@ -1512,7 +1512,7 @@ $( '#lib-mode-list' ).on( 'click', '.mode-bookmark', function( e ) { // delegate
 		, buttonlabel : !thumbnail ? '' : '<i class="fa fa-bookmark"></i>Default'
 		, buttoncolor : !thumbnail ? '' : orange
 		, button      : !thumbnail ? '' : function() {
-			bash( [ 'bookmarkreset', imagepath, name ] );
+			bash( [ 'bookmarkcoverreset', imagepath, name ] );
 		}
 		, ok          : function() {
 			imageReplace( imagepath +'/coverart', 'bookmark', name ); // no ext
diff --git a/srv/http/assets/js/passive.js b/srv/http/assets/js/passive.js
index 1eda4652e..c8a3c2e1b 100644
--- a/srv/http/assets/js/passive.js
+++ b/srv/http/assets/js/passive.js
@@ -159,7 +159,7 @@ function psBookmark( data ) {
 		if ( data.src ) {
 			var icon = '<img class="bkcoverart" src="'+ data.src +'">';
 		} else {
-			var icon = '<i class="fa fa-bookmark"></i><a class="label">'+ data.name.replace( /|/g, '/' ) +'</a>';
+			var icon = '<i class="fa fa-bookmark"></i><a class="label">'+ data.name +'</a>';
 		}
 		var html = `
 <div class="lib-mode bookmark">
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index b6c1f527f..5fb68e2cc 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -375,8 +375,7 @@ bookmarkadd )
 	
 	echo "\
 $path
-$coverart
-" > "$dirdata/bookmarks/$name"
+$coverart" > "$dirdata/bookmarks/$name"
 	if [[ -e $dirsystem/order ]]; then
 		order=$( jq < $dirsystem/order | jq '. + ["'"$path"'"]' )
 		echo "$order" > $dirsystem/order
@@ -391,6 +390,17 @@ $coverart
 }'
 	pushstream bookmark "$data"
 	;;
+bookmarkcoverreset )
+	imagepath=${args[1]}
+	name=${args[2]}
+	sed -i '2d' "$dirdata/bookmarks/$name"
+	rm -f "$imagepath/coverart".* "$imagepath/thumb".*
+	data='{
+  "url"  : "'$imagepath/reset'"
+, "type" :"bookmark"
+}'
+	pushstream coverart "$data"
+	;;
 bookmarkremove )
 	name=${args[1]//\//|}
 	path=${args[2]}
@@ -418,22 +428,6 @@ bookmarkrename )
 }'
 	pushstream bookmark "$data"
 	;;
-bookmarkreset )
-	imagepath=${args[1]}
-	name=${args[2]}
-	sed -i '2d' "$dirdata/bookmarks/$name"
-	rm -f "$imagepath/coverart".*
-	data='{
-  "url"  : "'$imagepath/reset'"
-, "type" :"bookmark"
-}'
-	pushstream coverart "$data"
-	;;
-bookmarkthumb )
-	mpdpath=${args[1]}
-	coverartfile=$( ls "/mnt/MPD/$mpdpath/coverart".* )
-	echo ${coverartfile: -3} # ext
-	;;
 camillagui )
 	systemctl start camillagui
 	sed -i '/Connection reset without closing handshake/ d' /var/log/camilladsp.log

From 11f7853b8f36a0d7892182969aa91efa41e08793 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 14:12:15 +0700
Subject: [PATCH 11/19] Update cmd.sh

---
 srv/http/bash/cmd.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index 5fb68e2cc..afb6d1c9e 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -57,7 +57,6 @@ gifThumbnail() {
 			[[ $animated ]] && (( ${imgwh[1]/x*} > 200 || ${imgwh[1]/*x} > 200 )) && gifNotify
 			gifsicle -O3 --resize-fit 200x200 "$source" > "$target"
 			gifsicle -O3 --resize-fit 80x80 "$source" > "$( dirname "$target" )/thumb.gif"
-			[[ -e $target ]] && sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
 			dir=$( dirname "$target" )
@@ -80,7 +79,7 @@ gifThumbnail() {
 			gifsicle -O3 --resize-fit 80x80 $source > $filenoext-thumb.gif
 			;;
 	esac
-	pushstreamImage "$target" $type
+	pushstreamImage "$target" $type "$covername"
 }
 jpgThumbnail() {
 	type=$1
@@ -92,7 +91,6 @@ jpgThumbnail() {
 			rm -f "${target:0:-4}".*
 			cp -f "$source" "$target"
 			convert "$target" -thumbnail 80x80\> -unsharp 0x.5 "$( dirname "$target" )/thumb.jpg"
-			sed -i "2 s|.*|${target/\/srv\/http}|" "$dirdata/bookmarks/$covername"
 			;;
 		coverart )
 			dir=$( dirname "$target" )
@@ -113,7 +111,7 @@ jpgThumbnail() {
 			convert $source -thumbnail 80x80\> -unsharp 0x.5 $filenoext-thumb.jpg
 			;;
 	esac
-	pushstreamImage "$target" $type
+	pushstreamImage "$target" $type "$covername"
 }
 mpdoledLogo() {
 	systemctl stop mpd_oled
@@ -138,7 +136,15 @@ pladdPosition() {
 }
 pushstreamImage() {
 	target=$1
+	[[ ! -e $target ]] && exit
+	
 	type=$2
+	covername=$3
+	if [[ $type == bookmark ]]; then
+		bkfile="$dirdata/bookmarks/$covername"
+		echo "$( head -1 "$bkfile" )
+${target/\/srv\/http}" > "$bkfile"
+	fi
 	coverart=${target:0:-4}.$( date +%s ).${target: -3};
 	[[ ${coverart:0:4} == /mnt ]] && coverart=$( php -r "echo rawurlencode( '${coverart//\'/\\\'}' );" )
 	data='{"url":"'$coverart'","type":"'$type'"}'
@@ -371,11 +377,11 @@ bookmarkadd )
 	name=${args[1]//\//|}
 	path=${args[2]}
 	coverart=${args[3]}
-	[[ -e "$dirdata/bookmarks/$name" ]] && echo -1 && exit
+	bkfile="$dirdata/bookmarks/$covername"
+	[[ -e $bkfile ]] && echo -1 && exit
 	
-	echo "\
-$path
-$coverart" > "$dirdata/bookmarks/$name"
+	echo "$path
+$coverart" > "$bkfile"
 	if [[ -e $dirsystem/order ]]; then
 		order=$( jq < $dirsystem/order | jq '. + ["'"$path"'"]' )
 		echo "$order" > $dirsystem/order

From 73281688be9049ee25dde6dc45c4ed77d491b03a Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 14:17:14 +0700
Subject: [PATCH 12/19] Update cmd.sh

---
 srv/http/bash/cmd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index afb6d1c9e..cc7503898 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -377,7 +377,7 @@ bookmarkadd )
 	name=${args[1]//\//|}
 	path=${args[2]}
 	coverart=${args[3]}
-	bkfile="$dirdata/bookmarks/$covername"
+	bkfile="$dirdata/bookmarks/$name"
 	[[ -e $bkfile ]] && echo -1 && exit
 	
 	echo "$path

From e57f312c8f95d8ffd353d6cbe77ae897efdedf20 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 17:42:42 +0700
Subject: [PATCH 13/19] u

---
 install.sh                              |   4 +-
 srv/http/bash/bluetoothcommand.sh       |   8 +-
 srv/http/bash/settings/networks-data.sh |  32 +++----
 srv/http/bash/settings/networks-scan.sh | 114 ++++++++++++------------
 4 files changed, 78 insertions(+), 80 deletions(-)

diff --git a/install.sh b/install.sh
index 4435faa42..eaa961a0c 100644
--- a/install.sh
+++ b/install.sh
@@ -2,8 +2,8 @@
 
 alias=r1
 
-# 20220813
-! grep -q bluez-utils /etc/pacman.conf && sed -i '/#IgnorePkg/ a\IgnorePkg = bluez-utils' /etc/pacman.conf
+# 20220815
+grep -q bluez-utils /etc/pacman.conf && sed -i '/bluez-utils/ d' /etc/pacman.conf
 
 # 20220805
 dirdata=/srv/http/data
diff --git a/srv/http/bash/bluetoothcommand.sh b/srv/http/bash/bluetoothcommand.sh
index 6dd8fd8e3..f758b48be 100644
--- a/srv/http/bash/bluetoothcommand.sh
+++ b/srv/http/bash/bluetoothcommand.sh
@@ -63,8 +63,9 @@ if [[ $udev == connect ]]; then # >>>> bluetooth.rules: 1. pair from sender; 2.
 			grep -q $mac $dirshm/btconnected &> /dev/null && mac= || break
 		fi
 	done
-	 # unpaired sender only - fix: rAudio triggered to connect by unpaired receivers when power on 
-	if bluetoothctl paired-devices | grep -q $mac; then
+	# unpaired sender only - fix: rAudio triggered to connect by unpaired receivers when power on
+	controller=$( bluetoothctl show | head -1 | cut -d' ' -f2 )
+	if [[ -e /var/lib/bluetooth/$controller/$mac ]]; then
 		if [[ -e $dirsystem/camilladsp ]] && bluetoothctl info $mac | grep -q 'UUID: Audio Sink'; then
 			name=$( bluetoothctl info $mac | grep '^\s*Alias:' | sed 's/^\s*Alias: //' )
 			bluetoothctl disconnect $mac
@@ -157,7 +158,8 @@ elif [[ $action == disconnect || $action == remove ]]; then # from rAudio only
 	else
 		bluetoothctl remove $mac &> /dev/null
 		for i in {1..5}; do
-			bluetoothctl paired-devices 2> /dev/null | grep -q $mac && sleep 1 || break
+			controller=$( bluetoothctl show | head -1 | cut -d' ' -f2 )
+			[[ -e /var/lib/bluetooth/$controller/$mac ]] && sleep 1 || break
 		done
 		disconnectRemove Removed
 	fi
diff --git a/srv/http/bash/settings/networks-data.sh b/srv/http/bash/settings/networks-data.sh
index 0338b3cd5..230643e34 100644
--- a/srv/http/bash/settings/networks-data.sh
+++ b/srv/http/bash/settings/networks-data.sh
@@ -4,25 +4,21 @@
 
 # bluetooth
 if systemctl -q is-active bluetooth; then
-	readarray -t lines <<< $( bluetoothctl paired-devices \
-								| cut -d' ' -f2,3- \
-								| awk NF \
-								| sort -k2 -fh )
-	if [[ $lines ]]; then
-		for line in "${lines[@]}"; do
-			mac=${line/ *}
-			[[ $mac == Device ]] && continue
-			
-			info=$( bluetoothctl info $mac )
-			name=$( echo "$info" | grep '^\s*Alias:' | sed 's/^\s*Alias: //' )
-			connected=$( echo "$info" | grep -q 'Connected: yes' && echo true || echo false )
-			type=$( echo "$info" | grep 'UUID: Audio' | sed -E 's/\s*UUID: Audio (.*) .*/\1/' | xargs )
-			[[ ! $type ]] && type=Device
+	controller=$( bluetoothctl show | head -1 | cut -d' ' -f2 )
+	readarray -t macs <<< $( ls -1 /var/lib/bluetooth/$controller | egrep -v 'cache|settings' )
+	if [[ $macs ]]; then
+		for mac in "${macs[@]}"; do
+			readarray -t info <<< $( bluetoothctl info $mac \
+										| egrep 'Name: |Connected: |UUID: Audio' \
+										| sed -E 's/^\s*Name: //
+												  s/^\s*Connected: yes/true/
+												  s/^\s*Connected: no/false/
+												  s/\s*UUID: Audio (.*) .*/\1/' )
 			listbt+=',{
-  "name"      : "'$name'"
-, "mac"       : "'$mac'"
-, "connected" : '$connected'
-, "type"      : "'$type'"
+  "mac"       : "'$mac'"
+, "name"      : "'${info[0]}'"
+, "connected" : '${info[1]}'
+, "type"      : "'${info[2]}'"
 }'
 		done
 		listbt="[ ${listbt:1} ]"
diff --git a/srv/http/bash/settings/networks-scan.sh b/srv/http/bash/settings/networks-scan.sh
index 1ba9b25c7..47425dbff 100644
--- a/srv/http/bash/settings/networks-scan.sh
+++ b/srv/http/bash/settings/networks-scan.sh
@@ -2,70 +2,70 @@
 
 . /srv/http/bash/common.sh
 
-if [[ $1 != wlan ]]; then
-	listBt() {
-		bluetoothctl $1 \
-			| grep -v ' ..-..-..-..-..-..$' \
-			| sed -E 's/Device (..:..:..:..:..:..) (.*)/\2^\1/' \
-			| sort -f
-	}
-
-	bluetoothctl --timeout=10 scan on &> /dev/null
+if [[ $1 == wlan ]]; then
+	wlandev=$( cat $dirshm/wlan )
+	ip link set $wlandev up
 
-	devices=$( listBt devices )
-	[[ ! $devices ]] && exit
+	# pre-scan hidden ssid to force responding to scan
+	readarray -t hiddenprofiles <<< $( grep -rl --exclude-dir=examples ^Hidden=yes /etc/netctl )
+	if [[ $hiddenprofiles ]]; then
+		for file in "${hiddenprofiles[@]}"; do
+			iwlist $wlandev scan essid "$( basename "$file" )" &> /dev/null
+		done
+	fi
 
-	paired=$( listBt paired-devices )
-	[[ $paired ]] && devices=$( diff <( echo "$paired" ) <( echo "$devices" ) | grep '^>' | cut -c 3- )
-	readarray -t devices <<< "$devices"
-	for dev in "${devices[@]}"; do
-		name=${dev/^*}
-		mac=${dev/*^}
-		data+=',{
-  "name" : "'$name'"
-, "mac"  : "'$mac'"
-}'
+	# ESSID:"NAME"
+	# Encryption key:on
+	# Quality=37/70  Signal level=-73 dBm --- Quality=0/100  Signal level=25/100
+	# IE: IEEE 802.11i/WPA2 Version 1
+	# IE: WPA Version 1
+	scan=$( iwlist $wlandev scan \
+				| sed -E 's/^\s*|\s*$//g' \
+				| egrep '^Cell|^ESSID|^Encryption|^IE.*WPA|^Quality' \
+				| sed -E 's/^Cell.*/},{/
+						  s/^ESSID:/,"ssid":/
+						  s/\\x00//g
+						  s/^Encryption key:(.*)/,"encrypt":"\1"/
+						  s/^IE.*WPA.*/,"wpa":true/
+						  s/^Quality.*level.(.*)/,"signal":"\1"/' \
+				| sed '/},{/ {n;s/^,/ /}' )
+	# save profile
+	readarray -t ssids <<< $( grep '"ssid":' <<< "$scan" \
+				| sed -E 's/^.*:"(.*)"/\1/' \
+				| awk NF )
+	for ssid in "${ssids[@]}"; do
+		[[ -e "/etc/netctl/$ssid" ]] && scan=$( sed '/"ssid":"'$ssid'"/ a\,"profile":true' <<< "$scan" )
 	done
-	data2json "$data"
+	# connected ssid
+	connectedssid=$( iwgetid $wlandev -r )
+	scan=$( sed '/"ssid":"'$connectedssid'"/ a\,"connected":true' <<< "$scan" )
+
+	# },{... > [ {...} ]
+	echo "[ ${scan:2} } ]" | jq
 	exit
 fi
 
-wlandev=$( cat $dirshm/wlan )
-ip link set $wlandev up
+bluetoothctl --timeout=10 scan on &> /dev/null
+devices=$( bluetoothctl devices \
+			| grep -v ' ..-..-..-..-..-..$' \
+			| sed -E 's/Device (..:..:..:..:..:..) (.*)/\2^\1/' \
+			| sort -f )
+[[ ! $devices ]] && exit
 
-# pre-scan hidden ssid to force responding to scan
-readarray -t hiddenprofiles <<< $( grep -rl --exclude-dir=examples ^Hidden=yes /etc/netctl )
-if [[ $hiddenprofiles ]]; then
-	for file in "${hiddenprofiles[@]}"; do
-		iwlist $wlandev scan essid "$( basename "$file" )" &> /dev/null
+controller=$( bluetoothctl show | head -1 | cut -d' ' -f2 )
+readarray -t macs <<< $( ls -1 /var/lib/bluetooth/$controller | egrep -v 'cache|settings' )
+if [[ $macs ]]; then
+	for mac in "${macs[@]}"; do
+		devices=$( grep -v $mac <<< "$devices" )
 	done
 fi
-
-# ESSID:"NAME"
-# Encryption key:on
-# Quality=37/70  Signal level=-73 dBm --- Quality=0/100  Signal level=25/100
-# IE: IEEE 802.11i/WPA2 Version 1
-# IE: WPA Version 1
-scan=$( iwlist $wlandev scan \
-			| sed -E 's/^\s*|\s*$//g' \
-			| egrep '^Cell|^ESSID|^Encryption|^IE.*WPA|^Quality' \
-			| sed -E 's/^Cell.*/},{/
-					  s/^ESSID:/,"ssid":/
-					  s/\\x00//g
-					  s/^Encryption key:(.*)/,"encrypt":"\1"/
-					  s/^IE.*WPA.*/,"wpa":true/
-					  s/^Quality.*level.(.*)/,"signal":"\1"/' \
-			| sed '/},{/ {n;s/^,/ /}' )
-# save profile
-readarray -t ssids <<< $( grep '"ssid":' <<< "$scan" \
-			| sed -E 's/^.*:"(.*)"/\1/' \
-			| awk NF )
-for ssid in "${ssids[@]}"; do
-	[[ -e "/etc/netctl/$ssid" ]] && scan=$( sed '/"ssid":"'$ssid'"/ a\,"profile":true' <<< "$scan" )
+readarray -t devices <<< "$devices"
+for dev in "${devices[@]}"; do
+	name=${dev/^*}
+	mac=${dev/*^}
+	data+=',{
+"name" : "'$name'"
+, "mac"  : "'$mac'"
+}'
 done
-# connected ssid
-connectedssid=$( iwgetid $wlandev -r )
-scan=$( sed '/"ssid":"'$connectedssid'"/ a\,"connected":true' <<< "$scan" )
-
-# },{... > [ {...} ]
-echo "[ ${scan:2} } ]" | jq
+data2json "$data"

From eb5cc171d314d3c6e10f7927107c1791ff58e414 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 18:14:22 +0700
Subject: [PATCH 14/19] u

---
 ...1.min.css => simple-keyboard-3.4.139.min.css} |  0
 .../js/plugin/simple-keyboard-3.4.139.min.js     | 16 ++++++++++++++++
 .../js/plugin/simple-keyboard-3.4.81.min.js      | 16 ----------------
 srv/http/index.php                               |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename srv/http/assets/css/{simple-keyboard-3.4.81.min.css => simple-keyboard-3.4.139.min.css} (100%)
 create mode 100644 srv/http/assets/js/plugin/simple-keyboard-3.4.139.min.js
 delete mode 100644 srv/http/assets/js/plugin/simple-keyboard-3.4.81.min.js

diff --git a/srv/http/assets/css/simple-keyboard-3.4.81.min.css b/srv/http/assets/css/simple-keyboard-3.4.139.min.css
similarity index 100%
rename from srv/http/assets/css/simple-keyboard-3.4.81.min.css
rename to srv/http/assets/css/simple-keyboard-3.4.139.min.css
diff --git a/srv/http/assets/js/plugin/simple-keyboard-3.4.139.min.js b/srv/http/assets/js/plugin/simple-keyboard-3.4.139.min.js
new file mode 100644
index 000000000..f1e521762
--- /dev/null
+++ b/srv/http/assets/js/plugin/simple-keyboard-3.4.139.min.js
@@ -0,0 +1,16 @@
+/*!
+ * 
+ *   simple-keyboard v3.4.139 (index.modern.js - Modern Browsers bundle)
+ *   https://github.com/hodgef/simple-keyboard
+ *
+ *   NOTE: This modern browsers bundle (index.modern.js) removes all polyfills
+ *   included in the standard version. Use this if you are supporting
+ *   modern browsers only. Otherwise, use the standard version (index.js).
+ *
+ *   Copyright (c) Francisco Hodge (https://github.com/hodgef) and project contributors.
+ *
+ *   This source code is licensed under the MIT license found in the
+ *   LICENSE file in the root directory of this source tree.
+ *
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.SimpleKeyboard=e():t.SimpleKeyboard=e()}(this,(function(){return function(){"use strict";var t={d:function(e,n){for(var o in n)t.o(n,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:n[o]})},o:function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r:function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};t.r(e),t.d(e,{default:function(){return E}});function n(t){return function(t){if(Array.isArray(t))return i(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||o(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){if(t){if("string"==typeof t)return i(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?i(t,e):void 0}}function i(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function a(t){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},a(t)}function s(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var u=function(){function t(e){var n=e.getOptions,o=e.getCaretPosition,i=e.getCaretPositionEnd,a=e.dispatch;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),r(this,"isStandardButton",(function(t){return t&&!("{"===t[0]&&"}"===t[t.length-1])})),this.getOptions=n,this.getCaretPosition=o,this.getCaretPositionEnd=i,this.dispatch=a,t.bindMethods(t,this)}var e,i,u;return e=t,i=[{key:"getButtonType",value:function(t){return t.includes("{")&&t.includes("}")&&"{//}"!==t?"functionBtn":"standardBtn"}},{key:"getButtonClass",value:function(t){var e=this.getButtonType(t),n=t.replace("{","").replace("}",""),o="";return"standardBtn"!==e&&(o=" hg-button-".concat(n)),"hg-".concat(e).concat(o)}},{key:"getDefaultDiplay",value:function(){return{"{bksp}":"backspace","{backspace}":"backspace","{enter}":"< enter","{shift}":"shift","{shiftleft}":"shift","{shiftright}":"shift","{alt}":"alt","{s}":"shift","{tab}":"tab","{lock}":"caps","{capslock}":"caps","{accept}":"Submit","{space}":" ","{//}":" ","{esc}":"esc","{escape}":"esc","{f1}":"f1","{f2}":"f2","{f3}":"f3","{f4}":"f4","{f5}":"f5","{f6}":"f6","{f7}":"f7","{f8}":"f8","{f9}":"f9","{f10}":"f10","{f11}":"f11","{f12}":"f12","{numpaddivide}":"/","{numlock}":"lock","{arrowup}":"↑","{arrowleft}":"←","{arrowdown}":"↓","{arrowright}":"→","{prtscr}":"print","{scrolllock}":"scroll","{pause}":"pause","{insert}":"ins","{home}":"home","{pageup}":"up","{delete}":"del","{forwarddelete}":"del","{end}":"end","{pagedown}":"down","{numpadmultiply}":"*","{numpadsubtract}":"-","{numpadadd}":"+","{numpadenter}":"enter","{period}":".","{numpaddecimal}":".","{numpad0}":"0","{numpad1}":"1","{numpad2}":"2","{numpad3}":"3","{numpad4}":"4","{numpad5}":"5","{numpad6}":"6","{numpad7}":"7","{numpad8}":"8","{numpad9}":"9"}}},{key:"getButtonDisplayName",value:function(t,e,n){return(e=n?Object.assign({},this.getDefaultDiplay(),e):e||this.getDefaultDiplay())[t]||t}},{key:"getUpdatedInput",value:function(t,e,n){var o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:n,i=arguments.length>4&&void 0!==arguments[4]&&arguments[4],a=this.getOptions(),s=[n,o,i],r=e;return("{bksp}"===t||"{backspace}"===t)&&r.length>0?r=this.removeAt.apply(this,[r].concat(s)):("{delete}"===t||"{forwarddelete}"===t)&&r.length>0?r=this.removeForwardsAt.apply(this,[r].concat(s)):"{space}"===t?r=this.addStringAt.apply(this,[r," "].concat(s)):"{tab}"!==t||"boolean"==typeof a.tabCharOnTab&&!1===a.tabCharOnTab?"{enter}"!==t&&"{numpadenter}"!==t||!a.newLineOnEnter?t.includes("numpad")&&Number.isInteger(Number(t[t.length-2]))?r=this.addStringAt.apply(this,[r,t[t.length-2]].concat(s)):"{numpaddivide}"===t?r=this.addStringAt.apply(this,[r,"/"].concat(s)):"{numpadmultiply}"===t?r=this.addStringAt.apply(this,[r,"*"].concat(s)):"{numpadsubtract}"===t?r=this.addStringAt.apply(this,[r,"-"].concat(s)):"{numpadadd}"===t?r=this.addStringAt.apply(this,[r,"+"].concat(s)):"{numpaddecimal}"===t?r=this.addStringAt.apply(this,[r,"."].concat(s)):"{"===t||"}"===t?r=this.addStringAt.apply(this,[r,t].concat(s)):t.includes("{")||t.includes("}")||(r=this.addStringAt.apply(this,[r,t].concat(s))):r=this.addStringAt.apply(this,[r,"\n"].concat(s)):r=this.addStringAt.apply(this,[r,"\t"].concat(s)),r}},{key:"updateCaretPos",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.updateCaretPosAction(t,e);this.dispatch((function(t){t.setCaretPosition(n)}))}},{key:"updateCaretPosAction",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.getOptions(),o=this.getCaretPosition();return null!=o&&(e?o>0&&(o-=t):o+=t),n.debug&&console.log("Caret at:",o),o}},{key:"addStringAt",value:function(t,e){var n,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:t.length,a=arguments.length>4&&void 0!==arguments[4]&&arguments[4];return o||0===o?(n=[t.slice(0,o),e,t.slice(i)].join(""),this.isMaxLengthReached()||a&&this.updateCaretPos(e.length)):n=t+e,n}},{key:"removeAt",value:function(t){var e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.length,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]&&arguments[3];if(0===n&&0===o)return t;if(n===o){var a=/([\uD800-\uDBFF][\uDC00-\uDFFF])/g;n&&n>=0?t.substring(n-2,n).match(a)?(e=t.substr(0,n-2)+t.substr(n),i&&this.updateCaretPos(2,!0)):(e=t.substr(0,n-1)+t.substr(n),i&&this.updateCaretPos(1,!0)):t.slice(-2).match(a)?(e=t.slice(0,-2),i&&this.updateCaretPos(2,!0)):(e=t.slice(0,-1),i&&this.updateCaretPos(1,!0))}else e=t.slice(0,n)+t.slice(o),i&&this.dispatch((function(t){t.setCaretPosition(n)}));return e}},{key:"removeForwardsAt",value:function(t){var e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.length,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]&&arguments[3];if(null==t||!t.length||null===n)return t;if(n===o){var a=/([\uD800-\uDBFF][\uDC00-\uDFFF])/g,s=t.substring(n,n+2),r=s.match(a);e=r?t.substr(0,n)+t.substr(n+2):t.substr(0,n)+t.substr(n+1)}else e=t.slice(0,n)+t.slice(o),i&&this.dispatch((function(t){t.setCaretPosition(n)}));return e}},{key:"handleMaxLength",value:function(t,e){var n=this.getOptions(),o=n.maxLength,i=t[n.inputName||"default"],s=e.length-1>=o;if(e.length<=i.length)return!1;if(Number.isInteger(o))return n.debug&&console.log("maxLength (num) reached:",s),s?(this.maxLengthReached=!0,!0):(this.maxLengthReached=!1,!1);if("object"===a(o)){var r=e.length-1>=o[n.inputName||"default"];return n.debug&&console.log("maxLength (obj) reached:",r),r?(this.maxLengthReached=!0,!0):(this.maxLengthReached=!1,!1)}}},{key:"isMaxLengthReached",value:function(){return Boolean(this.maxLengthReached)}},{key:"isTouchDevice",value:function(){return"ontouchstart"in window||navigator.maxTouchPoints}},{key:"pointerEventsSupported",value:function(){return!!window.PointerEvent}},{key:"camelCase",value:function(t){return t?t.toLowerCase().trim().split(/[.\-_\s]/g).reduce((function(t,e){return e.length?t+e[0].toUpperCase()+e.slice(1):t})):""}},{key:"chunkArray",value:function(t,e){return n(Array(Math.ceil(t.length/e))).map((function(n,o){return t.slice(e*o,e+e*o)}))}},{key:"escapeRegex",value:function(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}}],u=[{key:"bindMethods",value:function(t,e){var n,i=function(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=o(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var i=0,a=function(){};return{s:a,n:function(){return i>=t.length?{done:!0}:{done:!1,value:t[i++]}},e:function(t){throw t},f:a}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var s,r=!0,u=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return r=t.done,t},e:function(t){u=!0,s=t},f:function(){try{r||null==n.return||n.return()}finally{if(u)throw s}}}}(Object.getOwnPropertyNames(t.prototype));try{for(i.s();!(n=i.n()).done;){var a=n.value;"constructor"===a||"bindMethods"===a||(e[a]=e[a].bind(e))}}catch(t){i.e(t)}finally{i.f()}}}],i&&s(e.prototype,i),u&&s(e,u),Object.defineProperty(e,"prototype",{writable:!1}),t}();r(u,"noop",(function(){}));var l=u;function c(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var d=function(){function t(e){var n=e.dispatch,o=e.getOptions;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.dispatch=n,this.getOptions=o,l.bindMethods(t,this)}var e,n,o;return e=t,(n=[{key:"handleHighlightKeyDown",value:function(t){var e=this.getOptions(),n=this.getSimpleKeyboardLayoutKey(t);this.dispatch((function(o){var i,a,s=o.getButtonElement(n),r=o.getButtonElement("{".concat(n,"}"));if(s)i=s,a=n;else{if(!r)return;i=r,a="{".concat(n,"}")}i&&(i.style.background=e.physicalKeyboardHighlightBgColor||"#dadce4",i.style.color=e.physicalKeyboardHighlightTextColor||"black",e.physicalKeyboardHighlightPress&&(e.physicalKeyboardHighlightPressUsePointerEvents?i.onpointerdown():e.physicalKeyboardHighlightPressUseClick?i.click():o.handleButtonClicked(a,t)))}))}},{key:"handleHighlightKeyUp",value:function(t){var e=this.getOptions(),n=this.getSimpleKeyboardLayoutKey(t);this.dispatch((function(t){var o=t.getButtonElement(n)||t.getButtonElement("{".concat(n,"}"));o&&o.removeAttribute&&(o.removeAttribute("style"),e.physicalKeyboardHighlightPressUsePointerEvents&&o.onpointerup())}))}},{key:"getSimpleKeyboardLayoutKey",value:function(t){var e,n="",o=t.code||t.key||this.keyCodeToKey(null==t?void 0:t.keyCode);return(n=null!=o&&o.includes("Numpad")||null!=o&&o.includes("Shift")||null!=o&&o.includes("Space")||null!=o&&o.includes("Backspace")||null!=o&&o.includes("Control")||null!=o&&o.includes("Alt")||null!=o&&o.includes("Meta")?t.code||"":t.key||this.keyCodeToKey(null==t?void 0:t.keyCode)||"").length>1?null===(e=n)||void 0===e?void 0:e.toLowerCase():n}},{key:"keyCodeToKey",value:function(t){return{8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",91:"Meta",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",106:"NumpadMultiply",107:"NumpadAdd",109:"NumpadSubtract",110:"NumpadDecimal",111:"NumpadDivide",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"}[t]}}])&&c(e.prototype,n),o&&c(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}();function h(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var p=function(){function t(e){var n,o,i,a=e.utilities;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),i=0,(o="pageIndex")in(n=this)?Object.defineProperty(n,o,{value:i,enumerable:!0,configurable:!0,writable:!0}):n[o]=i,this.utilities=a,l.bindMethods(t,this),this.pageSize=this.utilities.getOptions().layoutCandidatesPageSize||5}var e,n,o;return e=t,n=[{key:"destroy",value:function(){this.candidateBoxElement&&(this.candidateBoxElement.remove(),this.pageIndex=0)}},{key:"show",value:function(t){var e=this,n=t.candidateValue,o=t.targetElement,i=t.onSelect;if(n&&n.length){var a=this.utilities.chunkArray(n.split(" "),this.pageSize);this.renderPage({candidateListPages:a,targetElement:o,pageIndex:this.pageIndex,nbPages:a.length,onItemSelected:function(t,n){i(t,n),e.destroy()}})}}},{key:"renderPage",value:function(t){var e,n=this,o=t.candidateListPages,i=t.targetElement,a=t.pageIndex,s=t.nbPages,r=t.onItemSelected;null===(e=this.candidateBoxElement)||void 0===e||e.remove(),this.candidateBoxElement=document.createElement("div"),this.candidateBoxElement.className="hg-candidate-box";var u=document.createElement("ul");u.className="hg-candidate-box-list",o[a].forEach((function(t){var e=document.createElement("li"),n=function(){var t=new MouseEvent("click");return Object.defineProperty(t,"target",{value:e}),t};e.className="hg-candidate-box-list-item",e.textContent=t,e.onclick=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:n();return r(t,e)},u.appendChild(e)}));var l=a>0,c=document.createElement("div");c.classList.add("hg-candidate-box-prev"),l&&c.classList.add("hg-candidate-box-btn-active"),c.onclick=function(){l&&n.renderPage({candidateListPages:o,targetElement:i,pageIndex:a-1,nbPages:s,onItemSelected:r})},this.candidateBoxElement.appendChild(c),this.candidateBoxElement.appendChild(u);var d=a<s-1,h=document.createElement("div");h.classList.add("hg-candidate-box-next"),d&&h.classList.add("hg-candidate-box-btn-active"),h.onclick=function(){d&&n.renderPage({candidateListPages:o,targetElement:i,pageIndex:a+1,nbPages:s,onItemSelected:r})},this.candidateBoxElement.appendChild(h),i.prepend(this.candidateBoxElement)}}],n&&h(e.prototype,n),o&&h(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}(),f=p;function y(t){return function(t){if(Array.isArray(t))return g(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return g(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return g(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function g(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function m(t){return m="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},m(t)}function v(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(t);e&&(o=o.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,o)}return n}function b(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function k(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var w=function(){function t(e,n){var o=this;if(function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),k(this,"defaultName","default"),k(this,"activeInputElement",null),k(this,"handleParams",(function(t,e){var n,o,i;if("string"==typeof t)n=t.split(".").join(""),o=document.querySelector(".".concat(n)),i=e;else if(t instanceof HTMLDivElement){if(!t.className)throw console.warn("Any DOM element passed as parameter must have a class."),new Error("KEYBOARD_DOM_CLASS_ERROR");n=t.className.split(" ")[0],o=t,i=e}else n="simple-keyboard",o=document.querySelector(".".concat(n)),i=t;return{keyboardDOMClass:n,keyboardDOM:o,options:i}})),k(this,"getOptions",(function(){return o.options})),k(this,"getCaretPosition",(function(){return o.caretPosition})),k(this,"getCaretPositionEnd",(function(){return o.caretPositionEnd})),k(this,"registerModule",(function(t,e){o.modules[t]||(o.modules[t]={}),e(o.modules[t])})),k(this,"getKeyboardClassString",(function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];var i=[o.keyboardDOMClass].concat(e).filter((function(t){return!!t}));return i.join(" ")})),"undefined"!=typeof window){var i=this.handleParams(e,n),a=i.keyboardDOMClass,s=i.keyboardDOM,r=i.options,u=void 0===r?{}:r;this.utilities=new l({getOptions:this.getOptions,getCaretPosition:this.getCaretPosition,getCaretPositionEnd:this.getCaretPositionEnd,dispatch:this.dispatch}),this.caretPosition=null,this.caretPositionEnd=null,this.keyboardDOM=s,this.options=function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?v(Object(n),!0).forEach((function(e){k(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):v(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({layoutName:"default",theme:"hg-theme-default",inputName:"default",preventMouseDownDefault:!1,enableLayoutCandidates:!0,excludeFromLayout:{}},u),this.keyboardPluginClasses="",l.bindMethods(t,this);var c=this.options.inputName,h=void 0===c?this.defaultName:c;if(this.input={},this.input[h]="",this.keyboardDOMClass=a,this.buttonElements={},window.SimpleKeyboardInstances||(window.SimpleKeyboardInstances={}),this.currentInstanceName=this.utilities.camelCase(this.keyboardDOMClass),window.SimpleKeyboardInstances[this.currentInstanceName]=this,this.allKeyboardInstances=window.SimpleKeyboardInstances,this.keyboardInstanceNames=Object.keys(window.SimpleKeyboardInstances),this.isFirstKeyboardInstance=this.keyboardInstanceNames[0]===this.currentInstanceName,this.physicalKeyboard=new d({dispatch:this.dispatch,getOptions:this.getOptions}),this.candidateBox=this.options.enableLayoutCandidates?new f({utilities:this.utilities}):null,!this.keyboardDOM)throw console.warn('".'.concat(a,'" was not found in the DOM.')),new Error("KEYBOARD_DOM_ERROR");this.render(),this.modules={},this.loadModules()}}var e,n,o;return e=t,n=[{key:"setCaretPosition",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t;this.caretPosition=t,this.caretPositionEnd=e}},{key:"getInputCandidates",value:function(t){var e=this,n=this.options,o=n.layoutCandidates,i=n.layoutCandidatesCaseSensitiveMatch;if(!o||"object"!==m(o))return{};var a=Object.keys(o).filter((function(n){var o=t.substring(0,e.getCaretPositionEnd()||0)||t,a=new RegExp("".concat(e.utilities.escapeRegex(n),"$"),i?"g":"gi");return!!y(o.matchAll(a)).length}));if(a.length>1){var s=a.sort((function(t,e){return e.length-t.length}))[0];return{candidateKey:s,candidateValue:o[s]}}if(a.length){var r=a[0];return{candidateKey:r,candidateValue:o[r]}}return{}}},{key:"showCandidatesBox",value:function(t,e,n){var o=this;this.candidateBox&&this.candidateBox.show({candidateValue:e,targetElement:n,onSelect:function(e,n){var i=o.options.layoutCandidatesCaseSensitiveMatch,a=e.normalize("NFD"),s=o.getInput(o.options.inputName,!0),r=o.getCaretPositionEnd()||0,u=s.substring(0,r||0)||s,l=new RegExp("".concat(o.utilities.escapeRegex(t),"$"),i?"g":"gi"),c=u.replace(l,a),d=s.replace(u,c),h=c.length-u.length,p=(r||s.length)+h;p<0&&(p=0),o.setInput(d,o.options.inputName,!0),o.setCaretPosition(p),"function"==typeof o.options.onChange&&o.options.onChange(o.getInput(o.options.inputName,!0),n),"function"==typeof o.options.onChangeAll&&o.options.onChangeAll(o.getAllInputs(),n)}})}},{key:"handleButtonClicked",value:function(t,e){var n=this.options,o=n.inputName,i=void 0===o?this.defaultName:o,a=n.debug;if("{//}"!==t){this.input[i]||(this.input[i]="");var s=this.utilities.getUpdatedInput(t,this.input[i],this.caretPosition,this.caretPositionEnd);if(this.utilities.isStandardButton(t)&&this.activeInputElement&&this.input[i]&&this.input[i]===s&&0===this.caretPosition&&this.caretPositionEnd===s.length)return this.setInput("",this.options.inputName,!0),this.setCaretPosition(0),this.activeInputElement.value="",this.activeInputElement.setSelectionRange(0,0),void this.handleButtonClicked(t,e);if("function"==typeof this.options.onKeyPress&&this.options.onKeyPress(t,e),this.input[i]!==s&&(!this.options.inputPattern||this.options.inputPattern&&this.inputPatternIsValid(s))){if(this.options.maxLength&&this.utilities.handleMaxLength(this.input,s))return;var r=this.utilities.getUpdatedInput(t,this.input[i],this.caretPosition,this.caretPositionEnd,!0);if(this.setInput(r,this.options.inputName,!0),a&&console.log("Input changed:",this.getAllInputs()),this.options.debug&&console.log("Caret at: ",this.getCaretPosition(),this.getCaretPositionEnd(),"(".concat(this.keyboardDOMClass,")")),this.options.syncInstanceInputs&&this.syncInstanceInputs(),"function"==typeof this.options.onChange&&this.options.onChange(this.getInput(this.options.inputName,!0),e),"function"==typeof this.options.onChangeAll&&this.options.onChangeAll(this.getAllInputs(),e),null!=e&&e.target&&this.options.enableLayoutCandidates){var u,l=this.getInputCandidates(s),c=l.candidateKey,d=l.candidateValue;c&&d?this.showCandidatesBox(c,d,this.keyboardDOM):null===(u=this.candidateBox)||void 0===u||u.destroy()}}a&&console.log("Key pressed:",t)}}},{key:"getMouseHold",value:function(){return this.isMouseHold}},{key:"setMouseHold",value:function(t){this.options.syncInstanceInputs?this.dispatch((function(e){e.isMouseHold=t})):this.isMouseHold=t}},{key:"handleButtonMouseDown",value:function(t,e){var n=this;e&&(this.options.preventMouseDownDefault&&e.preventDefault(),this.options.stopMouseDownPropagation&&e.stopPropagation(),e.target.classList.add(this.activeButtonClass)),this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),this.holdTimeout&&clearTimeout(this.holdTimeout),this.setMouseHold(!0),this.options.disableButtonHold||(this.holdTimeout=window.setTimeout((function(){(n.getMouseHold()&&(!t.includes("{")&&!t.includes("}")||"{delete}"===t||"{backspace}"===t||"{bksp}"===t||"{space}"===t||"{tab}"===t)||"{arrowright}"===t||"{arrowleft}"===t||"{arrowup}"===t||"{arrowdown}"===t)&&(n.options.debug&&console.log("Button held:",t),n.handleButtonHold(t)),clearTimeout(n.holdTimeout)}),500))}},{key:"handleButtonMouseUp",value:function(t,e){var n=this;e&&(this.options.preventMouseUpDefault&&e.preventDefault&&e.preventDefault(),this.options.stopMouseUpPropagation&&e.stopPropagation&&e.stopPropagation(),!(e.target===this.keyboardDOM||e.target&&this.keyboardDOM.contains(e.target)||this.candidateBox&&this.candidateBox.candidateBoxElement&&(e.target===this.candidateBox.candidateBoxElement||e.target&&this.candidateBox.candidateBoxElement.contains(e.target)))&&this.candidateBox&&this.candidateBox.destroy()),this.recurseButtons((function(t){t.classList.remove(n.activeButtonClass)})),this.setMouseHold(!1),this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),t&&"function"==typeof this.options.onKeyReleased&&this.options.onKeyReleased(t)}},{key:"handleKeyboardContainerMouseDown",value:function(t){this.options.preventMouseDownDefault&&t.preventDefault()}},{key:"handleButtonHold",value:function(t){var e=this;this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),this.holdInteractionTimeout=window.setTimeout((function(){e.getMouseHold()?(e.handleButtonClicked(t),e.handleButtonHold(t)):clearTimeout(e.holdInteractionTimeout)}),100)}},{key:"syncInstanceInputs",value:function(){var t=this;this.dispatch((function(e){e.replaceInput(t.input),e.setCaretPosition(t.caretPosition,t.caretPositionEnd)}))}},{key:"clearInput",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.options.inputName||this.defaultName;this.input[t]="",this.setCaretPosition(0),this.options.syncInstanceInputs&&this.syncInstanceInputs()}},{key:"getInput",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.options.inputName||this.defaultName,e=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(this.options.syncInstanceInputs&&!e&&this.syncInstanceInputs(),this.options.rtl){var n=this.input[t].replace("‫","").replace("‬","");return"‫"+n+"‬"}return this.input[t]}},{key:"getAllInputs",value:function(){var t=this,e={};return Object.keys(this.input).forEach((function(n){e[n]=t.getInput(n,!0)})),e}},{key:"setInput",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.options.inputName||this.defaultName,n=arguments.length>2?arguments[2]:void 0;this.input[e]=t,!n&&this.options.syncInstanceInputs&&this.syncInstanceInputs()}},{key:"replaceInput",value:function(t){this.input=t}},{key:"setOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=this.changedOptions(t);this.options=Object.assign(this.options,t),e.length&&(this.options.debug&&console.log("changedOptions",e),this.onSetOptions(e),this.render())}},{key:"changedOptions",value:function(t){var e=this;return Object.keys(t).filter((function(n){return JSON.stringify(t[n])!==JSON.stringify(e.options[n])}))}},{key:"onSetOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];t.includes("layoutName")&&this.candidateBox&&this.candidateBox.destroy(),(t.includes("layoutCandidatesPageSize")||t.includes("layoutCandidates"))&&this.candidateBox&&(this.candidateBox.destroy(),this.candidateBox=new f({utilities:this.utilities}))}},{key:"resetRows",value:function(){this.keyboardRowsDOM&&this.keyboardRowsDOM.remove(),this.keyboardDOM.className=this.keyboardDOMClass,this.keyboardDOM.setAttribute("data-skInstance",this.currentInstanceName),this.buttonElements={}}},{key:"dispatch",value:function(t){if(!window.SimpleKeyboardInstances)throw console.warn("SimpleKeyboardInstances is not defined. Dispatch cannot be called."),new Error("INSTANCES_VAR_ERROR");return Object.keys(window.SimpleKeyboardInstances).forEach((function(e){t(window.SimpleKeyboardInstances[e],e)}))}},{key:"addButtonTheme",value:function(t,e){var n=this;e&&t&&(t.split(" ").forEach((function(o){e.split(" ").forEach((function(e){n.options.buttonTheme||(n.options.buttonTheme=[]);var i=!1;n.options.buttonTheme.map((function(t){if(null!=t&&t.class.split(" ").includes(e)){i=!0;var n=t.buttons.split(" ");n.includes(o)||(i=!0,n.push(o),t.buttons=n.join(" "))}return t})),i||n.options.buttonTheme.push({class:e,buttons:t})}))})),this.render())}},{key:"removeButtonTheme",value:function(t,e){var n=this;if(!t&&!e)return this.options.buttonTheme=[],void this.render();t&&Array.isArray(this.options.buttonTheme)&&this.options.buttonTheme.length&&(t.split(" ").forEach((function(t){var o,i;null===(o=n.options)||void 0===o||null===(i=o.buttonTheme)||void 0===i||i.map((function(o,i){if(o&&e&&e.includes(o.class)||!e){var a,s,r=null===(a=o)||void 0===a?void 0:a.buttons.split(" ").filter((function(e){return e!==t}));o&&null!=r&&r.length?o.buttons=r.join(" "):(null===(s=n.options.buttonTheme)||void 0===s||s.splice(i,1),o=null)}return o}))})),this.render())}},{key:"getButtonElement",value:function(t){var e,n=this.buttonElements[t];return n&&(e=n.length>1?n:n[0]),e}},{key:"inputPatternIsValid",value:function(t){var e,n=this.options.inputPattern;if((e=n instanceof RegExp?n:n[this.options.inputName||this.defaultName])&&t){var o=e.test(t);return this.options.debug&&console.log('inputPattern ("'.concat(e,'"): ').concat(o?"passed":"did not pass!")),o}return!0}},{key:"setEventListeners",value:function(){!this.isFirstKeyboardInstance&&this.allKeyboardInstances||(this.options.debug&&console.log("Caret handling started (".concat(this.keyboardDOMClass,")")),document.addEventListener("keyup",this.handleKeyUp),document.addEventListener("keydown",this.handleKeyDown),document.addEventListener("mouseup",this.handleMouseUp),document.addEventListener("touchend",this.handleTouchEnd),document.addEventListener("select",this.handleSelect),document.addEventListener("selectionchange",this.handleSelectionChange))}},{key:"handleKeyUp",value:function(t){this.caretEventHandler(t),this.options.physicalKeyboardHighlight&&this.physicalKeyboard.handleHighlightKeyUp(t)}},{key:"handleKeyDown",value:function(t){this.options.physicalKeyboardHighlight&&this.physicalKeyboard.handleHighlightKeyDown(t)}},{key:"handleMouseUp",value:function(t){this.caretEventHandler(t)}},{key:"handleTouchEnd",value:function(t){this.caretEventHandler(t)}},{key:"handleSelect",value:function(t){this.caretEventHandler(t)}},{key:"handleSelectionChange",value:function(t){this.caretEventHandler(t)}},{key:"caretEventHandler",value:function(t){var e,n=this;t.target.tagName&&(e=t.target.tagName.toLowerCase()),this.dispatch((function(o){var i=t.target===o.keyboardDOM||t.target&&o.keyboardDOM.contains(t.target);n.options.syncInstanceInputs&&Array.isArray(t.path)&&(i=t.path.some((function(t){var e;return null==t||null===(e=t.hasAttribute)||void 0===e?void 0:e.call(t,"data-skInstance")}))),("textarea"===e||"input"===e&&["text","search","url","tel","password"].includes(t.target.type))&&!o.options.disableCaretPositioning?(o.setCaretPosition(t.target.selectionStart,t.target.selectionEnd),n.activeInputElement=t.target,o.options.debug&&console.log("Caret at: ",o.getCaretPosition(),o.getCaretPositionEnd(),t&&t.target.tagName.toLowerCase(),"(".concat(o.keyboardDOMClass,")"))):!o.options.disableCaretPositioning&&i||"selectionchange"===(null==t?void 0:t.type)||(o.setCaretPosition(null),n.activeInputElement=null,o.options.debug&&console.log('Caret position reset due to "'.concat(null==t?void 0:t.type,'" event'),t))}))}},{key:"recurseButtons",value:function(t){var e=this;t&&Object.keys(this.buttonElements).forEach((function(n){return e.buttonElements[n].forEach(t)}))}},{key:"destroy",value:function(){this.options.debug&&console.log("Destroying simple-keyboard instance: ".concat(this.currentInstanceName)),document.removeEventListener("keyup",this.handleKeyUp),document.removeEventListener("keydown",this.handleKeyDown),document.removeEventListener("mouseup",this.handleMouseUp),document.removeEventListener("touchend",this.handleTouchEnd),document.removeEventListener("select",this.handleSelect),document.removeEventListener("selectionchange",this.handleSelectionChange),document.onpointerup=null,document.ontouchend=null,document.ontouchcancel=null,document.onmouseup=null,this.recurseButtons((function(t){t&&(t.onpointerdown=null,t.onpointerup=null,t.onpointercancel=null,t.ontouchstart=null,t.ontouchend=null,t.ontouchcancel=null,t.onclick=null,t.onmousedown=null,t.onmouseup=null,t.remove(),t=null)})),this.keyboardDOM.onpointerdown=null,this.keyboardDOM.ontouchstart=null,this.keyboardDOM.onmousedown=null,this.resetRows(),this.candidateBox&&(this.candidateBox.destroy(),this.candidateBox=null),this.activeInputElement=null,this.keyboardDOM.removeAttribute("data-skInstance"),this.keyboardDOM.innerHTML="",window.SimpleKeyboardInstances[this.currentInstanceName]=null,delete window.SimpleKeyboardInstances[this.currentInstanceName],this.initialized=!1}},{key:"getButtonThemeClasses",value:function(t){var e=this.options.buttonTheme,n=[];return Array.isArray(e)&&e.forEach((function(e){if(e&&e.class&&"string"==typeof e.class&&e.buttons&&"string"==typeof e.buttons){var o=e.class.split(" ");e.buttons.split(" ").includes(t)&&(n=[].concat(y(n),y(o)))}else console.warn('Incorrect "buttonTheme". Please check the documentation.',e)})),n}},{key:"setDOMButtonAttributes",value:function(t,e){var n=this.options.buttonAttributes;Array.isArray(n)&&n.forEach((function(n){n.attribute&&"string"==typeof n.attribute&&n.value&&"string"==typeof n.value&&n.buttons&&"string"==typeof n.buttons?n.buttons.split(" ").includes(t)&&e(n.attribute,n.value):console.warn('Incorrect "buttonAttributes". Please check the documentation.',n)}))}},{key:"onTouchDeviceDetected",value:function(){this.processAutoTouchEvents(),this.disableContextualWindow()}},{key:"disableContextualWindow",value:function(){window.oncontextmenu=function(t){if(t.target.classList.contains("hg-button"))return t.preventDefault(),t.stopPropagation(),!1}}},{key:"processAutoTouchEvents",value:function(){this.options.autoUseTouchEvents&&(this.options.useTouchEvents=!0,this.options.debug&&console.log("autoUseTouchEvents: Touch device detected, useTouchEvents enabled."))}},{key:"onInit",value:function(){this.options.debug&&console.log("".concat(this.keyboardDOMClass," Initialized")),this.setEventListeners(),"function"==typeof this.options.onInit&&this.options.onInit(this)}},{key:"beforeFirstRender",value:function(){this.utilities.isTouchDevice()&&this.onTouchDeviceDetected(),"function"==typeof this.options.beforeFirstRender&&this.options.beforeFirstRender(this),this.isFirstKeyboardInstance&&this.utilities.pointerEventsSupported()&&!this.options.useTouchEvents&&!this.options.useMouseEvents&&this.options.debug&&console.log("Using PointerEvents as it is supported by this browser"),this.options.useTouchEvents&&this.options.debug&&console.log("useTouchEvents has been enabled. Only touch events will be used.")}},{key:"beforeRender",value:function(){"function"==typeof this.options.beforeRender&&this.options.beforeRender(this)}},{key:"onRender",value:function(){"function"==typeof this.options.onRender&&this.options.onRender(this)}},{key:"onModulesLoaded",value:function(){"function"==typeof this.options.onModulesLoaded&&this.options.onModulesLoaded(this)}},{key:"loadModules",value:function(){var t=this;Array.isArray(this.options.modules)&&(this.options.modules.forEach((function(e){var n=new e(t);n.init&&n.init(t)})),this.keyboardPluginClasses="modules-loaded",this.render(),this.onModulesLoaded())}},{key:"getModuleProp",value:function(t,e){return!!this.modules[t]&&this.modules[t][e]}},{key:"getModulesList",value:function(){return Object.keys(this.modules)}},{key:"parseRowDOMContainers",value:function(t,e,n,o){var i=this,a=Array.from(t.children),s=0;return a.length&&n.forEach((function(n,r){var u=o[r];if(!(u&&u>n))return!1;var l=n-s,c=u-s,d=document.createElement("div");d.className+="hg-button-container";var h="".concat(i.options.layoutName,"-r").concat(e,"c").concat(r);d.setAttribute("data-skUID",h);var p=a.splice(l,c-l+1);s=c-l,p.forEach((function(t){return d.appendChild(t)})),a.splice(l,0,d),t.innerHTML="",a.forEach((function(e){return t.appendChild(e)})),i.options.debug&&console.log("rowDOMContainer",p,l,c,s+1)})),t}},{key:"render",value:function(){var t=this;this.resetRows(),this.initialized||this.beforeFirstRender(),this.beforeRender();var e="hg-layout-".concat(this.options.layoutName),n=this.options.layout||{default:["` 1 2 3 4 5 6 7 8 9 0 - = {bksp}","{tab} q w e r t y u i o p [ ] \\","{lock} a s d f g h j k l ; ' {enter}","{shift} z x c v b n m , . / {shift}",".com @ {space}"],shift:["~ ! @ # $ % ^ & * ( ) _ + {bksp}","{tab} Q W E R T Y U I O P { } |",'{lock} A S D F G H J K L : " {enter}',"{shift} Z X C V B N M < > ? {shift}",".com @ {space}"]},o=this.options.useTouchEvents||!1,i=o?"hg-touch-events":"",a=this.options.useMouseEvents||!1,s=this.options.disableRowButtonContainers;this.keyboardDOM.className=this.getKeyboardClassString(this.options.theme,e,this.keyboardPluginClasses,i),this.keyboardDOM.setAttribute("data-skInstance",this.currentInstanceName),this.keyboardRowsDOM=document.createElement("div"),this.keyboardRowsDOM.className="hg-rows",n[this.options.layoutName||this.defaultName].forEach((function(e,n){var i=e.split(" ");t.options.excludeFromLayout&&t.options.excludeFromLayout[t.options.layoutName||t.defaultName]&&(i=i.filter((function(e){return t.options.excludeFromLayout&&!t.options.excludeFromLayout[t.options.layoutName||t.defaultName].includes(e)})));var r=document.createElement("div");r.className+="hg-row";var u=[],l=[];i.forEach((function(e,i){var c,d=!s&&"string"==typeof e&&e.length>1&&0===e.indexOf("["),h=!s&&"string"==typeof e&&e.length>1&&e.indexOf("]")===e.length-1;d&&(u.push(i),e=e.replace(/\[/g,"")),h&&(l.push(i),e=e.replace(/\]/g,""));var p=t.utilities.getButtonClass(e),f=t.utilities.getButtonDisplayName(e,t.options.display,t.options.mergeDisplay),g=t.options.useButtonTag?"button":"div",m=document.createElement(g);m.className+="hg-button ".concat(p),(c=m.classList).add.apply(c,y(t.getButtonThemeClasses(e))),t.setDOMButtonAttributes(e,(function(t,e){m.setAttribute(t,e)})),t.activeButtonClass="hg-activeButton",!t.utilities.pointerEventsSupported()||o||a?o?(m.ontouchstart=function(n){t.handleButtonClicked(e,n),t.handleButtonMouseDown(e,n)},m.ontouchend=function(n){t.handleButtonMouseUp(e,n)},m.ontouchcancel=function(n){t.handleButtonMouseUp(e,n)}):(m.onclick=function(n){t.setMouseHold(!1),"function"!=typeof t.options.onKeyReleased&&t.handleButtonClicked(e,n)},m.onmousedown=function(n){"function"!=typeof t.options.onKeyReleased||t.isMouseHold||t.handleButtonClicked(e,n),t.handleButtonMouseDown(e,n)},m.onmouseup=function(n){t.handleButtonMouseUp(e,n)}):(m.onpointerdown=function(n){t.handleButtonClicked(e,n),t.handleButtonMouseDown(e,n)},m.onpointerup=function(n){t.handleButtonMouseUp(e,n)},m.onpointercancel=function(n){t.handleButtonMouseUp(e,n)}),m.setAttribute("data-skBtn",e);var v="".concat(t.options.layoutName,"-r").concat(n,"b").concat(i);m.setAttribute("data-skBtnUID",v);var b=document.createElement("span");b.innerHTML=f,m.appendChild(b),t.buttonElements[e]||(t.buttonElements[e]=[]),t.buttonElements[e].push(m),r.appendChild(m)})),r=t.parseRowDOMContainers(r,n,u,l),t.keyboardRowsDOM.appendChild(r)})),this.keyboardDOM.appendChild(this.keyboardRowsDOM),this.onRender(),this.initialized||(this.initialized=!0,!this.utilities.pointerEventsSupported()||o||a?o?(document.ontouchend=function(e){return t.handleButtonMouseUp(void 0,e)},document.ontouchcancel=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.ontouchstart=function(e){return t.handleKeyboardContainerMouseDown(e)}):o||(document.onmouseup=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.onmousedown=function(e){return t.handleKeyboardContainerMouseDown(e)}):(document.onpointerup=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.onpointerdown=function(e){return t.handleKeyboardContainerMouseDown(e)}),this.onInit())}}],n&&b(e.prototype,n),o&&b(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}(),E=w;return e}()}));
diff --git a/srv/http/assets/js/plugin/simple-keyboard-3.4.81.min.js b/srv/http/assets/js/plugin/simple-keyboard-3.4.81.min.js
deleted file mode 100644
index 2129a8451..000000000
--- a/srv/http/assets/js/plugin/simple-keyboard-3.4.81.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * 
- *   simple-keyboard v3.4.81 (index.modern.js - Modern Browsers bundle)
- *   https://github.com/hodgef/simple-keyboard
- *
- *   NOTE: This modern browsers bundle (index.modern.js) removes all polyfills
- *   included in the standard version. Use this if you are supporting
- *   modern browsers only. Otherwise, use the standard version (index.js).
- *
- *   Copyright (c) Francisco Hodge (https://github.com/hodgef) and project contributors.
- *
- *   This source code is licensed under the MIT license found in the
- *   LICENSE file in the root directory of this source tree.
- *
- */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.SimpleKeyboard=e():t.SimpleKeyboard=e()}(this,(function(){return function(){"use strict";var t={d:function(e,n){for(var o in n)t.o(n,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:n[o]})},o:function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r:function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};t.r(e),t.d(e,{default:function(){return k}});function n(t){return function(t){if(Array.isArray(t))return i(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||o(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){if(t){if("string"==typeof t)return i(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?i(t,e):void 0}}function i(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function a(t){return(a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function s(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var u=function(){function t(e){var n=e.getOptions,o=e.getCaretPosition,i=e.getCaretPositionEnd,a=e.dispatch;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),r(this,"isStandardButton",(function(t){return t&&!("{"===t[0]&&"}"===t[t.length-1])})),this.getOptions=n,this.getCaretPosition=o,this.getCaretPositionEnd=i,this.dispatch=a,t.bindMethods(t,this)}var e,i,u;return e=t,u=[{key:"bindMethods",value:function(t,e){var n,i=function(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=o(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var i=0,a=function(){};return{s:a,n:function(){return i>=t.length?{done:!0}:{done:!1,value:t[i++]}},e:function(t){throw t},f:a}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var s,r=!0,u=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return r=t.done,t},e:function(t){u=!0,s=t},f:function(){try{r||null==n.return||n.return()}finally{if(u)throw s}}}}(Object.getOwnPropertyNames(t.prototype));try{for(i.s();!(n=i.n()).done;){var a=n.value;"constructor"===a||"bindMethods"===a||(e[a]=e[a].bind(e))}}catch(t){i.e(t)}finally{i.f()}}}],(i=[{key:"getButtonType",value:function(t){return t.includes("{")&&t.includes("}")&&"{//}"!==t?"functionBtn":"standardBtn"}},{key:"getButtonClass",value:function(t){var e=this.getButtonType(t),n=t.replace("{","").replace("}",""),o="";return"standardBtn"!==e&&(o=" hg-button-".concat(n)),"hg-".concat(e).concat(o)}},{key:"getDefaultDiplay",value:function(){return{"{bksp}":"backspace","{backspace}":"backspace","{enter}":"< enter","{shift}":"shift","{shiftleft}":"shift","{shiftright}":"shift","{alt}":"alt","{s}":"shift","{tab}":"tab","{lock}":"caps","{capslock}":"caps","{accept}":"Submit","{space}":" ","{//}":" ","{esc}":"esc","{escape}":"esc","{f1}":"f1","{f2}":"f2","{f3}":"f3","{f4}":"f4","{f5}":"f5","{f6}":"f6","{f7}":"f7","{f8}":"f8","{f9}":"f9","{f10}":"f10","{f11}":"f11","{f12}":"f12","{numpaddivide}":"/","{numlock}":"lock","{arrowup}":"↑","{arrowleft}":"←","{arrowdown}":"↓","{arrowright}":"→","{prtscr}":"print","{scrolllock}":"scroll","{pause}":"pause","{insert}":"ins","{home}":"home","{pageup}":"up","{delete}":"del","{forwarddelete}":"del","{end}":"end","{pagedown}":"down","{numpadmultiply}":"*","{numpadsubtract}":"-","{numpadadd}":"+","{numpadenter}":"enter","{period}":".","{numpaddecimal}":".","{numpad0}":"0","{numpad1}":"1","{numpad2}":"2","{numpad3}":"3","{numpad4}":"4","{numpad5}":"5","{numpad6}":"6","{numpad7}":"7","{numpad8}":"8","{numpad9}":"9"}}},{key:"getButtonDisplayName",value:function(t,e,n){return(e=n?Object.assign({},this.getDefaultDiplay(),e):e||this.getDefaultDiplay())[t]||t}},{key:"getUpdatedInput",value:function(t,e,n){var o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:n,i=arguments.length>4&&void 0!==arguments[4]&&arguments[4],a=this.getOptions(),s=[n,o,i],r=e;return("{bksp}"===t||"{backspace}"===t)&&r.length>0?r=this.removeAt.apply(this,[r].concat(s)):("{delete}"===t||"{forwarddelete}"===t)&&r.length>0?r=this.removeForwardsAt.apply(this,[r].concat(s)):"{space}"===t?r=this.addStringAt.apply(this,[r," "].concat(s)):"{tab}"!==t||"boolean"==typeof a.tabCharOnTab&&!1===a.tabCharOnTab?"{enter}"!==t&&"{numpadenter}"!==t||!a.newLineOnEnter?t.includes("numpad")&&Number.isInteger(Number(t[t.length-2]))?r=this.addStringAt.apply(this,[r,t[t.length-2]].concat(s)):"{numpaddivide}"===t?r=this.addStringAt.apply(this,[r,"/"].concat(s)):"{numpadmultiply}"===t?r=this.addStringAt.apply(this,[r,"*"].concat(s)):"{numpadsubtract}"===t?r=this.addStringAt.apply(this,[r,"-"].concat(s)):"{numpadadd}"===t?r=this.addStringAt.apply(this,[r,"+"].concat(s)):"{numpaddecimal}"===t?r=this.addStringAt.apply(this,[r,"."].concat(s)):"{"===t||"}"===t?r=this.addStringAt.apply(this,[r,t].concat(s)):t.includes("{")||t.includes("}")||(r=this.addStringAt.apply(this,[r,t].concat(s))):r=this.addStringAt.apply(this,[r,"\n"].concat(s)):r=this.addStringAt.apply(this,[r,"\t"].concat(s)),r}},{key:"updateCaretPos",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.updateCaretPosAction(t,e);this.dispatch((function(t){t.setCaretPosition(n)}))}},{key:"updateCaretPosAction",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.getOptions(),o=this.getCaretPosition();return null!=o&&(e?o>0&&(o-=t):o+=t),n.debug&&console.log("Caret at:",o),o}},{key:"addStringAt",value:function(t,e){var n,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:t.length,a=arguments.length>4&&void 0!==arguments[4]&&arguments[4];return o||0===o?(n=[t.slice(0,o),e,t.slice(i)].join(""),this.isMaxLengthReached()||a&&this.updateCaretPos(e.length)):n=t+e,n}},{key:"removeAt",value:function(t){var e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.length,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]&&arguments[3];if(0===n&&0===o)return t;if(n===o){var a=/([\uD800-\uDBFF][\uDC00-\uDFFF])/g;n&&n>=0?t.substring(n-2,n).match(a)?(e=t.substr(0,n-2)+t.substr(n),i&&this.updateCaretPos(2,!0)):(e=t.substr(0,n-1)+t.substr(n),i&&this.updateCaretPos(1,!0)):t.slice(-2).match(a)?(e=t.slice(0,-2),i&&this.updateCaretPos(2,!0)):(e=t.slice(0,-1),i&&this.updateCaretPos(1,!0))}else e=t.slice(0,n)+t.slice(o),i&&this.dispatch((function(t){t.setCaretPosition(n)}));return e}},{key:"removeForwardsAt",value:function(t){var e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t.length,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.length,i=arguments.length>3&&void 0!==arguments[3]&&arguments[3];if(null==t||!t.length||null===n)return t;if(n===o){var a=/([\uD800-\uDBFF][\uDC00-\uDFFF])/g,s=t.substring(n,n+2),r=s.match(a);e=r?t.substr(0,n)+t.substr(n+2):t.substr(0,n)+t.substr(n+1)}else e=t.slice(0,n)+t.slice(o),i&&this.dispatch((function(t){t.setCaretPosition(n)}));return e}},{key:"handleMaxLength",value:function(t,e){var n=this.getOptions(),o=n.maxLength,i=t[n.inputName||"default"],s=e.length-1>=o;if(e.length<=i.length)return!1;if(Number.isInteger(o))return n.debug&&console.log("maxLength (num) reached:",s),s?(this.maxLengthReached=!0,!0):(this.maxLengthReached=!1,!1);if("object"===a(o)){var r=e.length-1>=o[n.inputName||"default"];return n.debug&&console.log("maxLength (obj) reached:",r),r?(this.maxLengthReached=!0,!0):(this.maxLengthReached=!1,!1)}}},{key:"isMaxLengthReached",value:function(){return Boolean(this.maxLengthReached)}},{key:"isTouchDevice",value:function(){return"ontouchstart"in window||navigator.maxTouchPoints}},{key:"pointerEventsSupported",value:function(){return!!window.PointerEvent}},{key:"camelCase",value:function(t){return t?t.toLowerCase().trim().split(/[.\-_\s]/g).reduce((function(t,e){return e.length?t+e[0].toUpperCase()+e.slice(1):t})):""}},{key:"chunkArray",value:function(t,e){return n(Array(Math.ceil(t.length/e))).map((function(n,o){return t.slice(e*o,e+e*o)}))}}])&&s(e.prototype,i),u&&s(e,u),Object.defineProperty(e,"prototype",{writable:!1}),t}();r(u,"noop",(function(){}));var l=u;function c(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var d=function(){function t(e){var n=e.dispatch,o=e.getOptions;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.dispatch=n,this.getOptions=o,l.bindMethods(t,this)}var e,n,o;return e=t,(n=[{key:"handleHighlightKeyDown",value:function(t){var e=this.getOptions(),n=this.getSimpleKeyboardLayoutKey(t);this.dispatch((function(o){var i,a,s=o.getButtonElement(n),r=o.getButtonElement("{".concat(n,"}"));if(s)i=s,a=n;else{if(!r)return;i=r,a="{".concat(n,"}")}i&&(i.style.backgroundColor=e.physicalKeyboardHighlightBgColor||"#dadce4",i.style.color=e.physicalKeyboardHighlightTextColor||"black",e.physicalKeyboardHighlightPress&&(e.physicalKeyboardHighlightPressUsePointerEvents?(i.onpointerdown(),i.onpointerup()):e.physicalKeyboardHighlightPressUseClick?i.click():o.handleButtonClicked(a,t)))}))}},{key:"handleHighlightKeyUp",value:function(t){var e=this.getSimpleKeyboardLayoutKey(t);this.dispatch((function(t){var n=t.getButtonElement(e)||t.getButtonElement("{".concat(e,"}"));n&&n.removeAttribute&&n.removeAttribute("style")}))}},{key:"getSimpleKeyboardLayoutKey",value:function(t){var e,n="",o=t.code||t.key||this.keyCodeToKey(null==t?void 0:t.keyCode);return(n=null!=o&&o.includes("Numpad")||null!=o&&o.includes("Shift")||null!=o&&o.includes("Space")||null!=o&&o.includes("Backspace")||null!=o&&o.includes("Control")||null!=o&&o.includes("Alt")||null!=o&&o.includes("Meta")?t.code||"":t.key||this.keyCodeToKey(null==t?void 0:t.keyCode)||"").length>1?null===(e=n)||void 0===e?void 0:e.toLowerCase():n}},{key:"keyCodeToKey",value:function(t){return{8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",91:"Meta",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9",106:"NumpadMultiply",107:"NumpadAdd",109:"NumpadSubtract",110:"NumpadDecimal",111:"NumpadDivide",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"}[t]}}])&&c(e.prototype,n),o&&c(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}();function h(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var p=function(){function t(e){var n,o,i,a=e.utilities;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),i=0,(o="pageIndex")in(n=this)?Object.defineProperty(n,o,{value:i,enumerable:!0,configurable:!0,writable:!0}):n[o]=i,this.utilities=a,l.bindMethods(t,this),this.pageSize=this.utilities.getOptions().layoutCandidatesPageSize||5}var e,n,o;return e=t,(n=[{key:"destroy",value:function(){this.candidateBoxElement&&(this.candidateBoxElement.remove(),this.pageIndex=0)}},{key:"show",value:function(t){var e=this,n=t.candidateValue,o=t.targetElement,i=t.onSelect;if(n&&n.length){var a=this.utilities.chunkArray(n.split(" "),this.pageSize);this.renderPage({candidateListPages:a,targetElement:o,pageIndex:this.pageIndex,nbPages:a.length,onItemSelected:function(t,n){i(t,n),e.destroy()}})}}},{key:"renderPage",value:function(t){var e,n=this,o=t.candidateListPages,i=t.targetElement,a=t.pageIndex,s=t.nbPages,r=t.onItemSelected;null===(e=this.candidateBoxElement)||void 0===e||e.remove(),this.candidateBoxElement=document.createElement("div"),this.candidateBoxElement.className="hg-candidate-box";var u=document.createElement("ul");u.className="hg-candidate-box-list",o[a].forEach((function(t){var e=document.createElement("li"),n=function(){var t=new MouseEvent("click");return Object.defineProperty(t,"target",{value:e}),t};e.className="hg-candidate-box-list-item",e.textContent=t,e.onclick=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:n();return r(t,e)},u.appendChild(e)}));var l=a>0,c=document.createElement("div");c.classList.add("hg-candidate-box-prev"),l&&c.classList.add("hg-candidate-box-btn-active"),c.onclick=function(){l&&n.renderPage({candidateListPages:o,targetElement:i,pageIndex:a-1,nbPages:s,onItemSelected:r})},this.candidateBoxElement.appendChild(c),this.candidateBoxElement.appendChild(u);var d=a<s-1,h=document.createElement("div");h.classList.add("hg-candidate-box-next"),d&&h.classList.add("hg-candidate-box-btn-active"),h.onclick=function(){d&&n.renderPage({candidateListPages:o,targetElement:i,pageIndex:a+1,nbPages:s,onItemSelected:r})},this.candidateBoxElement.appendChild(h),i.prepend(this.candidateBoxElement)}}])&&h(e.prototype,n),o&&h(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}();function f(t){return function(t){if(Array.isArray(t))return y(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(!t)return;if("string"==typeof t)return y(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return y(t,e)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function y(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function g(t){return(g="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function m(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(t);e&&(o=o.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,o)}return n}function v(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function b(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var k=function(){function t(e,n){var o=this;if(function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),b(this,"defaultName","default"),b(this,"activeInputElement",null),b(this,"handleParams",(function(t,e){var n,o,i;if("string"==typeof t)n=t.split(".").join(""),o=document.querySelector(".".concat(n)),i=e;else if(t instanceof HTMLDivElement){if(!t.className)throw console.warn("Any DOM element passed as parameter must have a class."),new Error("KEYBOARD_DOM_CLASS_ERROR");n=t.className.split(" ")[0],o=t,i=e}else n="simple-keyboard",o=document.querySelector(".".concat(n)),i=t;return{keyboardDOMClass:n,keyboardDOM:o,options:i}})),b(this,"getOptions",(function(){return o.options})),b(this,"getCaretPosition",(function(){return o.caretPosition})),b(this,"getCaretPositionEnd",(function(){return o.caretPositionEnd})),b(this,"registerModule",(function(t,e){o.modules[t]||(o.modules[t]={}),e(o.modules[t])})),b(this,"getKeyboardClassString",(function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];var i=[o.keyboardDOMClass].concat(e).filter((function(t){return!!t}));return i.join(" ")})),"undefined"!=typeof window){var i=this.handleParams(e,n),a=i.keyboardDOMClass,s=i.keyboardDOM,r=i.options,u=void 0===r?{}:r;this.utilities=new l({getOptions:this.getOptions,getCaretPosition:this.getCaretPosition,getCaretPositionEnd:this.getCaretPositionEnd,dispatch:this.dispatch}),this.caretPosition=null,this.caretPositionEnd=null,this.keyboardDOM=s,this.options=function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?m(Object(n),!0).forEach((function(e){b(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):m(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({layoutName:"default",theme:"hg-theme-default",inputName:"default",preventMouseDownDefault:!1,enableLayoutCandidates:!0,excludeFromLayout:{}},u),this.keyboardPluginClasses="",l.bindMethods(t,this);var c=this.options.inputName,h=void 0===c?this.defaultName:c;if(this.input={},this.input[h]="",this.keyboardDOMClass=a,this.buttonElements={},window.SimpleKeyboardInstances||(window.SimpleKeyboardInstances={}),this.currentInstanceName=this.utilities.camelCase(this.keyboardDOMClass),window.SimpleKeyboardInstances[this.currentInstanceName]=this,this.allKeyboardInstances=window.SimpleKeyboardInstances,this.keyboardInstanceNames=Object.keys(window.SimpleKeyboardInstances),this.isFirstKeyboardInstance=this.keyboardInstanceNames[0]===this.currentInstanceName,this.physicalKeyboard=new d({dispatch:this.dispatch,getOptions:this.getOptions}),this.candidateBox=this.options.enableLayoutCandidates?new p({utilities:this.utilities}):null,!this.keyboardDOM)throw console.warn('".'.concat(a,'" was not found in the DOM.')),new Error("KEYBOARD_DOM_ERROR");this.render(),this.modules={},this.loadModules()}}var e,n,o;return e=t,(n=[{key:"setCaretPosition",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t;this.caretPosition=t,this.caretPositionEnd=e}},{key:"getInputCandidates",value:function(t){var e=this,n=this.options,o=n.layoutCandidates,i=n.layoutCandidatesCaseSensitiveMatch;if(!o||"object"!==g(o))return{};var a=Object.keys(o).filter((function(n){var o=t.substring(0,e.getCaretPositionEnd()||0)||t,a=new RegExp("".concat(n,"$"),i?"g":"gi");return!!f(o.matchAll(a)).length}));if(a.length>1){var s=a.sort((function(t,e){return e.length-t.length}))[0];return{candidateKey:s,candidateValue:o[s]}}if(a.length){var r=a[0];return{candidateKey:r,candidateValue:o[r]}}return{}}},{key:"showCandidatesBox",value:function(t,e,n){var o=this;this.candidateBox&&this.candidateBox.show({candidateValue:e,targetElement:n,onSelect:function(e,n){var i=o.options.layoutCandidatesCaseSensitiveMatch,a=e.normalize("NFD"),s=o.getInput(o.options.inputName,!0),r=o.getCaretPositionEnd()||0,u=s.substring(0,r||0)||s,l=new RegExp("".concat(t,"$"),i?"g":"gi"),c=u.replace(l,a),d=s.replace(u,c),h=c.length-u.length,p=(r||s.length)+h;p<0&&(p=0),o.setInput(d,o.options.inputName,!0),o.setCaretPosition(p),"function"==typeof o.options.onChange&&o.options.onChange(o.getInput(o.options.inputName,!0),n),"function"==typeof o.options.onChangeAll&&o.options.onChangeAll(o.getAllInputs(),n)}})}},{key:"handleButtonClicked",value:function(t,e){var n=this.options,o=n.inputName,i=void 0===o?this.defaultName:o,a=n.debug;if("{//}"!==t){this.input[i]||(this.input[i]="");var s=this.utilities.getUpdatedInput(t,this.input[i],this.caretPosition,this.caretPositionEnd);if(this.utilities.isStandardButton(t)&&this.activeInputElement&&this.input[i]&&this.input[i]===s&&0===this.caretPosition&&this.caretPositionEnd===s.length)return this.setInput("",this.options.inputName,!0),this.setCaretPosition(0),this.activeInputElement.value="",this.activeInputElement.setSelectionRange(0,0),void this.handleButtonClicked(t,e);if("function"==typeof this.options.onKeyPress&&this.options.onKeyPress(t,e),this.input[i]!==s&&(!this.options.inputPattern||this.options.inputPattern&&this.inputPatternIsValid(s))){if(this.options.maxLength&&this.utilities.handleMaxLength(this.input,s))return;var r=this.utilities.getUpdatedInput(t,this.input[i],this.caretPosition,this.caretPositionEnd,!0);if(this.setInput(r,this.options.inputName,!0),a&&console.log("Input changed:",this.getAllInputs()),this.options.debug&&console.log("Caret at: ",this.getCaretPosition(),this.getCaretPositionEnd(),"(".concat(this.keyboardDOMClass,")")),this.options.syncInstanceInputs&&this.syncInstanceInputs(),"function"==typeof this.options.onChange&&this.options.onChange(this.getInput(this.options.inputName,!0),e),"function"==typeof this.options.onChangeAll&&this.options.onChangeAll(this.getAllInputs(),e),null!=e&&e.target&&this.options.enableLayoutCandidates){var u,l=this.getInputCandidates(s),c=l.candidateKey,d=l.candidateValue;c&&d?this.showCandidatesBox(c,d,this.keyboardDOM):null===(u=this.candidateBox)||void 0===u||u.destroy()}}a&&console.log("Key pressed:",t)}}},{key:"getMouseHold",value:function(){return this.isMouseHold}},{key:"setMouseHold",value:function(t){this.options.syncInstanceInputs?this.dispatch((function(e){e.isMouseHold=t})):this.isMouseHold=t}},{key:"handleButtonMouseDown",value:function(t,e){var n=this;e&&(this.options.preventMouseDownDefault&&e.preventDefault(),this.options.stopMouseDownPropagation&&e.stopPropagation(),e.target.classList.add(this.activeButtonClass)),this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),this.holdTimeout&&clearTimeout(this.holdTimeout),this.setMouseHold(!0),this.options.disableButtonHold||(this.holdTimeout=window.setTimeout((function(){(n.getMouseHold()&&(!t.includes("{")&&!t.includes("}")||"{delete}"===t||"{backspace}"===t||"{bksp}"===t||"{space}"===t||"{tab}"===t)||"{arrowright}"===t||"{arrowleft}"===t||"{arrowup}"===t||"{arrowdown}"===t)&&(n.options.debug&&console.log("Button held:",t),n.handleButtonHold(t)),clearTimeout(n.holdTimeout)}),500))}},{key:"handleButtonMouseUp",value:function(t,e){var n=this;e&&(this.options.preventMouseUpDefault&&e.preventDefault&&e.preventDefault(),this.options.stopMouseUpPropagation&&e.stopPropagation&&e.stopPropagation(),!(e.target===this.keyboardDOM||e.target&&this.keyboardDOM.contains(e.target)||this.candidateBox&&this.candidateBox.candidateBoxElement&&(e.target===this.candidateBox.candidateBoxElement||e.target&&this.candidateBox.candidateBoxElement.contains(e.target)))&&this.candidateBox&&this.candidateBox.destroy()),this.recurseButtons((function(t){t.classList.remove(n.activeButtonClass)})),this.setMouseHold(!1),this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),t&&"function"==typeof this.options.onKeyReleased&&this.options.onKeyReleased(t)}},{key:"handleKeyboardContainerMouseDown",value:function(t){this.options.preventMouseDownDefault&&t.preventDefault()}},{key:"handleButtonHold",value:function(t){var e=this;this.holdInteractionTimeout&&clearTimeout(this.holdInteractionTimeout),this.holdInteractionTimeout=window.setTimeout((function(){e.getMouseHold()?(e.handleButtonClicked(t),e.handleButtonHold(t)):clearTimeout(e.holdInteractionTimeout)}),100)}},{key:"syncInstanceInputs",value:function(){var t=this;this.dispatch((function(e){e.replaceInput(t.input),e.setCaretPosition(t.caretPosition,t.caretPositionEnd)}))}},{key:"clearInput",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.options.inputName||this.defaultName;this.input[t]="",this.setCaretPosition(0),this.options.syncInstanceInputs&&this.syncInstanceInputs()}},{key:"getInput",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.options.inputName||this.defaultName,e=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(this.options.syncInstanceInputs&&!e&&this.syncInstanceInputs(),this.options.rtl){var n=this.input[t].replace("","").replace("‬","");return"‫"+n+"‬"}return this.input[t]}},{key:"getAllInputs",value:function(){var t=this,e={};return Object.keys(this.input).forEach((function(n){e[n]=t.getInput(n,!0)})),e}},{key:"setInput",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.options.inputName||this.defaultName,n=arguments.length>2?arguments[2]:void 0;this.input[e]=t,!n&&this.options.syncInstanceInputs&&this.syncInstanceInputs()}},{key:"replaceInput",value:function(t){this.input=t}},{key:"setOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=this.changedOptions(t);this.options=Object.assign(this.options,t),e.length&&(this.options.debug&&console.log("changedOptions",e),this.onSetOptions(e),this.render())}},{key:"changedOptions",value:function(t){var e=this;return Object.keys(t).filter((function(n){return JSON.stringify(t[n])!==JSON.stringify(e.options[n])}))}},{key:"onSetOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[];t.includes("layoutName")&&this.candidateBox&&this.candidateBox.destroy(),(t.includes("layoutCandidatesPageSize")||t.includes("layoutCandidates"))&&this.candidateBox&&(this.candidateBox.destroy(),this.candidateBox=new p({utilities:this.utilities}))}},{key:"resetRows",value:function(){this.keyboardRowsDOM&&this.keyboardRowsDOM.remove(),this.keyboardDOM.className=this.keyboardDOMClass,this.buttonElements={}}},{key:"dispatch",value:function(t){if(!window.SimpleKeyboardInstances)throw console.warn("SimpleKeyboardInstances is not defined. Dispatch cannot be called."),new Error("INSTANCES_VAR_ERROR");return Object.keys(window.SimpleKeyboardInstances).forEach((function(e){t(window.SimpleKeyboardInstances[e],e)}))}},{key:"addButtonTheme",value:function(t,e){var n=this;e&&t&&(t.split(" ").forEach((function(o){e.split(" ").forEach((function(e){n.options.buttonTheme||(n.options.buttonTheme=[]);var i=!1;n.options.buttonTheme.map((function(t){if(null!=t&&t.class.split(" ").includes(e)){i=!0;var n=t.buttons.split(" ");n.includes(o)||(i=!0,n.push(o),t.buttons=n.join(" "))}return t})),i||n.options.buttonTheme.push({class:e,buttons:t})}))})),this.render())}},{key:"removeButtonTheme",value:function(t,e){var n=this;if(!t&&!e)return this.options.buttonTheme=[],void this.render();t&&Array.isArray(this.options.buttonTheme)&&this.options.buttonTheme.length&&(t.split(" ").forEach((function(t){var o,i;null===(o=n.options)||void 0===o||null===(i=o.buttonTheme)||void 0===i||i.map((function(o,i){if(o&&e&&e.includes(o.class)||!e){var a,s,r=null===(a=o)||void 0===a?void 0:a.buttons.split(" ").filter((function(e){return e!==t}));o&&null!=r&&r.length?o.buttons=r.join(" "):(null===(s=n.options.buttonTheme)||void 0===s||s.splice(i,1),o=null)}return o}))})),this.render())}},{key:"getButtonElement",value:function(t){var e,n=this.buttonElements[t];return n&&(e=n.length>1?n:n[0]),e}},{key:"inputPatternIsValid",value:function(t){var e,n=this.options.inputPattern;if((e=n instanceof RegExp?n:n[this.options.inputName||this.defaultName])&&t){var o=e.test(t);return this.options.debug&&console.log('inputPattern ("'.concat(e,'"): ').concat(o?"passed":"did not pass!")),o}return!0}},{key:"setEventListeners",value:function(){!this.isFirstKeyboardInstance&&this.allKeyboardInstances||(this.options.debug&&console.log("Caret handling started (".concat(this.keyboardDOMClass,")")),document.addEventListener("keyup",this.handleKeyUp),document.addEventListener("keydown",this.handleKeyDown),document.addEventListener("mouseup",this.handleMouseUp),document.addEventListener("touchend",this.handleTouchEnd),document.addEventListener("select",this.handleSelect),document.addEventListener("selectionchange",this.handleSelectionChange))}},{key:"handleKeyUp",value:function(t){this.caretEventHandler(t),this.options.physicalKeyboardHighlight&&this.physicalKeyboard.handleHighlightKeyUp(t)}},{key:"handleKeyDown",value:function(t){this.options.physicalKeyboardHighlight&&this.physicalKeyboard.handleHighlightKeyDown(t)}},{key:"handleMouseUp",value:function(t){this.caretEventHandler(t)}},{key:"handleTouchEnd",value:function(t){this.caretEventHandler(t)}},{key:"handleSelect",value:function(t){this.caretEventHandler(t)}},{key:"handleSelectionChange",value:function(t){this.caretEventHandler(t)}},{key:"caretEventHandler",value:function(t){var e,n=this;t.target.tagName&&(e=t.target.tagName.toLowerCase()),this.dispatch((function(o){var i=t.target===o.keyboardDOM||t.target&&o.keyboardDOM.contains(t.target);("textarea"===e||"input"===e&&["text","search","url","tel","password"].includes(t.target.type))&&!o.options.disableCaretPositioning?(o.setCaretPosition(t.target.selectionStart,t.target.selectionEnd),n.activeInputElement=t.target,o.options.debug&&console.log("Caret at: ",o.getCaretPosition(),o.getCaretPositionEnd(),t&&t.target.tagName.toLowerCase(),"(".concat(o.keyboardDOMClass,")"))):!o.options.disableCaretPositioning&&i||"selectionchange"===(null==t?void 0:t.type)||(o.setCaretPosition(null),n.activeInputElement=null,o.options.debug&&console.log('Caret position reset due to "'.concat(null==t?void 0:t.type,'" event'),t))}))}},{key:"recurseButtons",value:function(t){var e=this;t&&Object.keys(this.buttonElements).forEach((function(n){return e.buttonElements[n].forEach(t)}))}},{key:"destroy",value:function(){this.options.debug&&console.log("Destroying simple-keyboard instance: ".concat(this.currentInstanceName)),document.removeEventListener("keyup",this.handleKeyUp),document.removeEventListener("keydown",this.handleKeyDown),document.removeEventListener("mouseup",this.handleMouseUp),document.removeEventListener("touchend",this.handleTouchEnd),document.removeEventListener("select",this.handleSelect),document.removeEventListener("selectionchange",this.handleSelectionChange),document.onpointerup=null,document.ontouchend=null,document.ontouchcancel=null,document.onmouseup=null,this.recurseButtons((function(t){t&&(t.onpointerdown=null,t.onpointerup=null,t.onpointercancel=null,t.ontouchstart=null,t.ontouchend=null,t.ontouchcancel=null,t.onclick=null,t.onmousedown=null,t.onmouseup=null,t.remove(),t=null)})),this.keyboardDOM.onpointerdown=null,this.keyboardDOM.ontouchstart=null,this.keyboardDOM.onmousedown=null,this.resetRows(),this.candidateBox&&(this.candidateBox.destroy(),this.candidateBox=null),this.activeInputElement=null,this.keyboardDOM.innerHTML="",window.SimpleKeyboardInstances[this.currentInstanceName]=null,delete window.SimpleKeyboardInstances[this.currentInstanceName],this.initialized=!1}},{key:"getButtonThemeClasses",value:function(t){var e=this.options.buttonTheme,n=[];return Array.isArray(e)&&e.forEach((function(e){if(e&&e.class&&"string"==typeof e.class&&e.buttons&&"string"==typeof e.buttons){var o=e.class.split(" ");e.buttons.split(" ").includes(t)&&(n=[].concat(f(n),f(o)))}else console.warn('Incorrect "buttonTheme". Please check the documentation.',e)})),n}},{key:"setDOMButtonAttributes",value:function(t,e){var n=this.options.buttonAttributes;Array.isArray(n)&&n.forEach((function(n){n.attribute&&"string"==typeof n.attribute&&n.value&&"string"==typeof n.value&&n.buttons&&"string"==typeof n.buttons?n.buttons.split(" ").includes(t)&&e(n.attribute,n.value):console.warn('Incorrect "buttonAttributes". Please check the documentation.',n)}))}},{key:"onTouchDeviceDetected",value:function(){this.processAutoTouchEvents(),this.disableContextualWindow()}},{key:"disableContextualWindow",value:function(){window.oncontextmenu=function(t){if(t.target.classList.contains("hg-button"))return t.preventDefault(),t.stopPropagation(),!1}}},{key:"processAutoTouchEvents",value:function(){this.options.autoUseTouchEvents&&(this.options.useTouchEvents=!0,this.options.debug&&console.log("autoUseTouchEvents: Touch device detected, useTouchEvents enabled."))}},{key:"onInit",value:function(){this.options.debug&&console.log("".concat(this.keyboardDOMClass," Initialized")),this.setEventListeners(),"function"==typeof this.options.onInit&&this.options.onInit(this)}},{key:"beforeFirstRender",value:function(){this.utilities.isTouchDevice()&&this.onTouchDeviceDetected(),"function"==typeof this.options.beforeFirstRender&&this.options.beforeFirstRender(this),this.isFirstKeyboardInstance&&this.utilities.pointerEventsSupported()&&!this.options.useTouchEvents&&!this.options.useMouseEvents&&this.options.debug&&console.log("Using PointerEvents as it is supported by this browser"),this.options.useTouchEvents&&this.options.debug&&console.log("useTouchEvents has been enabled. Only touch events will be used.")}},{key:"beforeRender",value:function(){"function"==typeof this.options.beforeRender&&this.options.beforeRender(this)}},{key:"onRender",value:function(){"function"==typeof this.options.onRender&&this.options.onRender(this)}},{key:"onModulesLoaded",value:function(){"function"==typeof this.options.onModulesLoaded&&this.options.onModulesLoaded(this)}},{key:"loadModules",value:function(){var t=this;Array.isArray(this.options.modules)&&(this.options.modules.forEach((function(e){var n=new e(t);n.init&&n.init(t)})),this.keyboardPluginClasses="modules-loaded",this.render(),this.onModulesLoaded())}},{key:"getModuleProp",value:function(t,e){return!!this.modules[t]&&this.modules[t][e]}},{key:"getModulesList",value:function(){return Object.keys(this.modules)}},{key:"parseRowDOMContainers",value:function(t,e,n,o){var i=this,a=Array.from(t.children),s=0;return a.length&&n.forEach((function(n,r){var u=o[r];if(!(u&&u>n))return!1;var l=n-s,c=u-s,d=document.createElement("div");d.className+="hg-button-container";var h="".concat(i.options.layoutName,"-r").concat(e,"c").concat(r);d.setAttribute("data-skUID",h);var p=a.splice(l,c-l+1);s=c-l,p.forEach((function(t){return d.appendChild(t)})),a.splice(l,0,d),t.innerHTML="",a.forEach((function(e){return t.appendChild(e)})),i.options.debug&&console.log("rowDOMContainer",p,l,c,s+1)})),t}},{key:"render",value:function(){var t=this;this.resetRows(),this.initialized||this.beforeFirstRender(),this.beforeRender();var e="hg-layout-".concat(this.options.layoutName),n=this.options.layout||{default:["` 1 2 3 4 5 6 7 8 9 0 - = {bksp}","{tab} q w e r t y u i o p [ ] \\","{lock} a s d f g h j k l ; ' {enter}","{shift} z x c v b n m , . / {shift}",".com @ {space}"],shift:["~ ! @ # $ % ^ & * ( ) _ + {bksp}","{tab} Q W E R T Y U I O P { } |",'{lock} A S D F G H J K L : " {enter}',"{shift} Z X C V B N M < > ? {shift}",".com @ {space}"]},o=this.options.useTouchEvents||!1,i=o?"hg-touch-events":"",a=this.options.useMouseEvents||!1,s=this.options.disableRowButtonContainers;this.keyboardDOM.className=this.getKeyboardClassString(this.options.theme,e,this.keyboardPluginClasses,i),this.keyboardRowsDOM=document.createElement("div"),this.keyboardRowsDOM.className="hg-rows",n[this.options.layoutName||this.defaultName].forEach((function(e,n){var i=e.split(" ");t.options.excludeFromLayout&&t.options.excludeFromLayout[t.options.layoutName||t.defaultName]&&(i=i.filter((function(e){return t.options.excludeFromLayout&&!t.options.excludeFromLayout[t.options.layoutName||t.defaultName].includes(e)})));var r=document.createElement("div");r.className+="hg-row";var u=[],l=[];i.forEach((function(e,i){var c,d=!s&&"string"==typeof e&&e.length>1&&0===e.indexOf("["),h=!s&&"string"==typeof e&&e.length>1&&e.indexOf("]")===e.length-1;d&&(u.push(i),e=e.replace(/\[/g,"")),h&&(l.push(i),e=e.replace(/\]/g,""));var p=t.utilities.getButtonClass(e),y=t.utilities.getButtonDisplayName(e,t.options.display,t.options.mergeDisplay),g=t.options.useButtonTag?"button":"div",m=document.createElement(g);m.className+="hg-button ".concat(p),(c=m.classList).add.apply(c,f(t.getButtonThemeClasses(e))),t.setDOMButtonAttributes(e,(function(t,e){m.setAttribute(t,e)})),t.activeButtonClass="hg-activeButton",!t.utilities.pointerEventsSupported()||o||a?o?(m.ontouchstart=function(n){t.handleButtonClicked(e,n),t.handleButtonMouseDown(e,n)},m.ontouchend=function(n){t.handleButtonMouseUp(e,n)},m.ontouchcancel=function(n){t.handleButtonMouseUp(e,n)}):(m.onclick=function(n){t.setMouseHold(!1),t.handleButtonClicked(e,n)},m.onmousedown=function(n){t.handleButtonMouseDown(e,n)},m.onmouseup=function(n){t.handleButtonMouseUp(e,n)}):(m.onpointerdown=function(n){t.handleButtonClicked(e,n),t.handleButtonMouseDown(e,n)},m.onpointerup=function(n){t.handleButtonMouseUp(e,n)},m.onpointercancel=function(n){t.handleButtonMouseUp(e,n)}),m.setAttribute("data-skBtn",e);var v="".concat(t.options.layoutName,"-r").concat(n,"b").concat(i);m.setAttribute("data-skBtnUID",v);var b=document.createElement("span");b.innerHTML=y,m.appendChild(b),t.buttonElements[e]||(t.buttonElements[e]=[]),t.buttonElements[e].push(m),r.appendChild(m)})),r=t.parseRowDOMContainers(r,n,u,l),t.keyboardRowsDOM.appendChild(r)})),this.keyboardDOM.appendChild(this.keyboardRowsDOM),this.onRender(),this.initialized||(this.initialized=!0,!this.utilities.pointerEventsSupported()||o||a?o?(document.ontouchend=function(e){return t.handleButtonMouseUp(void 0,e)},document.ontouchcancel=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.ontouchstart=function(e){return t.handleKeyboardContainerMouseDown(e)}):o||(document.onmouseup=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.onmousedown=function(e){return t.handleKeyboardContainerMouseDown(e)}):(document.onpointerup=function(e){return t.handleButtonMouseUp(void 0,e)},this.keyboardDOM.onpointerdown=function(e){return t.handleKeyboardContainerMouseDown(e)}),this.onInit())}}])&&v(e.prototype,n),o&&v(e,o),Object.defineProperty(e,"prototype",{writable:!1}),t}();return e}()}));
diff --git a/srv/http/index.php b/srv/http/index.php
index ba6bc8c6f..aa1cd7cb4 100644
--- a/srv/http/index.php
+++ b/srv/http/index.php
@@ -50,10 +50,10 @@
 <script src="/assets/js/plugin/jquery.selectric-1.13.1.min.js"></script>
 <?php }
 	  if ( $localhost ) {?>
-<link rel="stylesheet" href="/assets/css/simple-keyboard-3.4.81.min.css">
+<link rel="stylesheet" href="/assets/css/simple-keyboard-3.4.139.min.css">
 <link rel="stylesheet" href="/assets/css/keyboard.<?=$time?>.css">
 <div id="keyboard" class="hide"><div class="simple-keyboard"></div></div>
-<script src="/assets/js/plugin/simple-keyboard-3.4.81.min.js"></script>
+<script src="/assets/js/plugin/simple-keyboard-3.4.139.min.js"></script>
 <script src="/assets/js/keyboard.<?=$time?>.js"></script>
 	  <?php }?>
 	

From e11a34089ff47ccb5e85ab0f21b6b8468da499a0 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 20:08:12 +0700
Subject: [PATCH 15/19] Update function.js

---
 srv/http/assets/js/function.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srv/http/assets/js/function.js b/srv/http/assets/js/function.js
index 30d076ac5..335ef382f 100644
--- a/srv/http/assets/js/function.js
+++ b/srv/http/assets/js/function.js
@@ -641,11 +641,10 @@ function imageLoad( list ) {
 			}
 			$lazyload.off( 'error' ).on( 'error', function() {
 				var $this = $( this );
-				if ( radio && $this.parent().hasClass( 'dir' ) ) {
-					mode = 'folder';
-					menumode = 'wrdir';
-				}
-				$this.replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menumode +'"></i>' );
+				var dir = $this.parent().hasClass( 'dir' );
+				mode = dir ? 'folder' : G.mode;
+				var menu = radio && dir ? 'wrdir' : menumode;
+				$this.replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menu +'"></i>' );
 			} );
 		}
 	} else {

From b4061bb1c17334deaa1155cb80a7702146ccf857 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 20:38:25 +0700
Subject: [PATCH 16/19] u

---
 srv/http/assets/js/function.js | 18 +++++++-----------
 srv/http/bash/status-push.sh   |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/srv/http/assets/js/function.js b/srv/http/assets/js/function.js
index 335ef382f..8ca63e9da 100644
--- a/srv/http/assets/js/function.js
+++ b/srv/http/assets/js/function.js
@@ -630,20 +630,16 @@ function imageLoad( list ) {
 				$this.attr( 'src', src );
 			} );
 		} else {
-			if ( G.mode.slice( -5 ) === 'radio' ) {
-				var mode = G.mode;
-				var menumode = 'webradio';
-				var radio = 1;
-			} else {
-				var mode = 'folder';
-				var menumode = 'folder';
-				var radio = 0;
-			}
+			var radio = G.mode.slice( -5 ) === 'radio';
 			$lazyload.off( 'error' ).on( 'error', function() {
 				var $this = $( this );
 				var dir = $this.parent().hasClass( 'dir' );
-				mode = dir ? 'folder' : G.mode;
-				var menu = radio && dir ? 'wrdir' : menumode;
+				var mode = dir ? 'folder' : G.mode;
+				if ( radio ) {
+					var menu = dir ? 'wrdir' : 'webradio';
+				} else {
+					var menu = 'folder';
+				}
 				$this.replaceWith( '<i class="fa fa-'+ mode +' lib-icon" data-target="#menu-'+ menu +'"></i>' );
 			} );
 		}
diff --git a/srv/http/bash/status-push.sh b/srv/http/bash/status-push.sh
index 39dd6d755..81a067ce8 100644
--- a/srv/http/bash/status-push.sh
+++ b/srv/http/bash/status-push.sh
@@ -14,14 +14,14 @@ else
 	if [[ -e $dirshm/status ]]; then
 		statusprev=$( cat $dirshm/status )
 		compare='^Artist|^Title|^Album'
-		[[ "$( grep "$compare" <<< "$statusnew" | sort )" != "$( grep "$compare" <<< "$statusprev" | sort )" ]] && trackchanged=1
+		[[ "$( egrep "$compare" <<< "$statusnew" | sort )" != "$( egrep "$compare" <<< "$statusprev" | sort )" ]] && trackchanged=1
 		. <( echo "$statusnew" )
 		if [[ $webradio == true ]]; then
 			[[ ! $trackchanged && $state == play ]] && exit
 			
 		else
 			compare='^state|^elapsed'
-			[[ "$( egrep "$compare" <<< "$statusnew" | sort )" != "$( grep "$compare" <<< "$statusprev" | sort )" ]] && statuschanged=1
+			[[ "$( egrep "$compare" <<< "$statusnew" | sort )" != "$( egrep "$compare" <<< "$statusprev" | sort )" ]] && statuschanged=1
 			[[ ! $trackchanged && ! $statuschanged ]] && exit
 			
 		fi

From 39aa91160b357eda44ec92e32c3934f028b4a2c5 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 21:10:40 +0700
Subject: [PATCH 17/19] u

---
 srv/http/assets/js/context.js | 12 ++++-----
 srv/http/bash/cmd.sh          | 46 ++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/srv/http/assets/js/context.js b/srv/http/assets/js/context.js
index a2fe3a784..10bae2856 100644
--- a/srv/http/assets/js/context.js
+++ b/srv/http/assets/js/context.js
@@ -626,14 +626,14 @@ $( '.contextmenu a, .contextmenu .submenu' ).click( function() {
 		case 'wrdirdelete':
 			var path = G.list.li.find( '.lipath' ).text();
 			info( {
-				  icon    : 'webradio'
-				, title   : 'Web Radio Delete'
+				  icon    : G.mode
+				, title   : 'Delete Folder'
 				, message : 'Folder:'
 							+'<br><wh>'+ path +'</wh>'
 				, oklabel : '<i class="fa fa-minus-circle"></i>Delete'
 				, okcolor : red
 				, ok      : function() {
-					bash( [ 'wrdirdelete', path ], function( std ) {
+					bash( [ 'wrdirdelete', path, G.mode ], function( std ) {
 						if ( std == -1 ) {
 							info( {
 								  icon    : 'webradio'
@@ -650,8 +650,8 @@ $( '.contextmenu a, .contextmenu .submenu' ).click( function() {
 			var name = path.pop();
 			var path = path.join( '/' );
 			info( {
-				  icon        : 'webradio'
-				, title       : 'Web Radio Rename'
+				  icon        : G.mode
+				, title       : 'Rename Folder'
 				, textlabel   : 'Name'
 				, focus       : 0
 				, values      : name
@@ -659,7 +659,7 @@ $( '.contextmenu a, .contextmenu .submenu' ).click( function() {
 				, checkchange : 1
 				, oklabel     : 'Rename'
 				, ok          : function() {
-					bash( [ 'wrdirrename', path, name, infoVal() ] );
+					bash( [ 'wrdirrename', path, name, infoVal(), G.mode ] );
 				}
 			} );
 			return
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index cc7503898..94e56443a 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -1337,6 +1337,30 @@ webradiodelete )
 	[[ -z $( find $dir -name $urlname ) ]] && rm -f "$path/img/$urlname"{,-thumb}.*
 	webradioCount $type
 	;;
+wrdirdelete )
+	path=${args[1]}
+	mode=${args[2]}
+	if [[ $( ls -A "$dirdata/$mode/$path" ) ]]; then
+		echo -1
+	else
+		rm -rf "$dirdata/$mode/$path"
+		pushstream radiolist '{"type":"webradio"}'
+	fi
+	;;
+wrdirnew )
+	dir=${args[1]}
+	sub=${args[2]}
+	[[ $dir ]] && mkdir -p "$dirwebradio/$dir/$path" || mkdir -p "$dirwebradio/$sub"
+	pushstream radiolist '{"type":"webradio"}'
+	;;
+wrdirrename )
+	path=${args[1]}
+	name=${args[2]}
+	newname=${args[3]}
+	mode=${args[4]}
+	mv -f "$dirdata/$mode/$path/$name" "$dirdata/$mode/$path/$newname"
+	pushstream radiolist '{"type":"webradio"}'
+	;;
 webradioedit )
 	dir=${args[1]}
 	name=${args[2]}
@@ -1367,27 +1391,5 @@ $charset" > "$file"
 	fi
 	pushstream radiolist '{"type":"webradio"}'
 	;;
-wrdirdelete )
-	path=${args[1]}
-	if [[ $( ls -A "$dirwebradio/$path" ) ]]; then
-		echo -1
-	else
-		rm -rf "$dirwebradio/$path"
-		pushstream radiolist '{"type":"webradio"}'
-	fi
-	;;
-wrdirnew )
-	dir=${args[1]}
-	sub=${args[2]}
-	[[ $dir ]] && mkdir -p "$dirwebradio/$dir/$path" || mkdir -p "$dirwebradio/$sub"
-	pushstream radiolist '{"type":"webradio"}'
-	;;
-wrdirrename )
-	path=${args[1]}
-	name=${args[2]}
-	newname=${args[3]}
-	mv -f "$dirwebradio/$path/$name" "$dirwebradio/$path/$newname"
-	pushstream radiolist '{"type":"webradio"}'
-	;;
 	
 esac

From d68b845cf15587d276c0028dd55ca0877e2c41ff Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 21:23:47 +0700
Subject: [PATCH 18/19] u

---
 srv/http/assets/js/context.js | 9 ++++++++-
 srv/http/bash/cmd.sh          | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/srv/http/assets/js/context.js b/srv/http/assets/js/context.js
index 10bae2856..bb3e0778c 100644
--- a/srv/http/assets/js/context.js
+++ b/srv/http/assets/js/context.js
@@ -638,7 +638,14 @@ $( '.contextmenu a, .contextmenu .submenu' ).click( function() {
 							info( {
 								  icon    : 'webradio'
 								, title   : 'Web Radio Delete'
-								, message : 'Folder <wh>'+ path +'</wh> not empty.'
+								, message : 'Folder not empty:'
+											+'<br><wh>'+ path +'</wh>'
+											+'<br>Confirm delete?'
+								, oklabel : '<i class="fa fa-minus-circle"></i>Delete'
+								, okcolor : red
+								, ok      : function() {
+									bash( [ 'wrdirdelete', path, G.mode, 'noconfirm' ] );
+								}
 							} );
 						}
 					} );
diff --git a/srv/http/bash/cmd.sh b/srv/http/bash/cmd.sh
index 94e56443a..5af634d6b 100644
--- a/srv/http/bash/cmd.sh
+++ b/srv/http/bash/cmd.sh
@@ -1340,7 +1340,8 @@ webradiodelete )
 wrdirdelete )
 	path=${args[1]}
 	mode=${args[2]}
-	if [[ $( ls -A "$dirdata/$mode/$path" ) ]]; then
+	noconfirm=${args[3]}
+	if [[ ! $noconfirm && $( ls -A "$dirdata/$mode/$path" ) ]]; then
 		echo -1
 	else
 		rm -rf "$dirdata/$mode/$path"

From 1348cbc046f80687dbdb1e8dfdf825cab36710e2 Mon Sep 17 00:00:00 2001
From: rern <rernrern@gmail.com>
Date: Sun, 14 Aug 2022 21:47:03 +0700
Subject: [PATCH 19/19] Update install.sh

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index eaa961a0c..31c12eefb 100644
--- a/install.sh
+++ b/install.sh
@@ -2,8 +2,8 @@
 
 alias=r1
 
-# 20220815
-grep -q bluez-utils /etc/pacman.conf && sed -i '/bluez-utils/ d' /etc/pacman.conf
+# 20220814
+sed -i '/bluez-utils/ d' /etc/pacman.conf
 
 # 20220805
 dirdata=/srv/http/data