From ad418984950e5ac01bb5bfcf541f0f091f99e534 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 14 Mar 2021 12:27:18 +0100
Subject: [PATCH] MVC / UI: minor cleanups for
 https://github.com/opnsense/core/pull/4797

---
 src/opnsense/www/js/opnsense_ui.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
index 519ffed28..3d7e16891 100644
--- a/src/opnsense/www/js/opnsense_ui.js
+++ b/src/opnsense/www/js/opnsense_ui.js
@@ -342,16 +342,11 @@ function addMultiSelectClearUI() {
         $(this).click(function(e) {
             e.preventDefault();
             var currentFocus = document.activeElement;
-            const id = $(this).attr("id").replace(/_*copy-options_*/, '');
-            let element = $('select[id="' + id + '"]');
-            let copycontent = element.val().join('\n');
-            let target = document.createElement("textarea");
-            target.style.opacity = "0";
-            target.id = "hiddenCopy_";
-            element.after(target)
-            target.textContent = copycontent;
-            target.select();
-            target.focus();
+            let src_id = $(this).attr("id").replace(/_*copy-options_*/, '');
+            let element = $('select[id="' + src_id + '"]');
+            let target = $("<textarea style='opacity:0;'/>").val(element.val().join('\n')) ;
+            element.after(target);
+            target.select().focus();
             document.execCommand("copy");
             target.remove();
             if (currentFocus && typeof currentFocus.focus === "function") {
@@ -362,14 +357,15 @@ function addMultiSelectClearUI() {
     $('[id*="paste-options"]').each(function() {
         $(this).click(function(e) {
             e.preventDefault();
-            const id = $(this).attr("id").replace(/_*paste-options_*/, '');
+            let id = $(this).attr("id").replace(/_*paste-options_*/, '');
+            let target = $('select[id="' + id + '"]');
             var cpb = navigator.clipboard.readText();
-            //need to use $.when because of IE. can switch to plain ES6 after IE support drop
-            $.when(cpb).then(function(cbtext) { 
+            $.when(cpb).then(function(cbtext) {
                 let values = $.trim(cbtext).replace(/\n|\r/g, ",").split(",");
                 $.each(values, function( index, value ) {
-                     $('select[id="' + id + '"]').tokenize2().trigger('tokenize:tokens:add', [value, value, true]);
+                     target.tokenize2().trigger('tokenize:tokens:add', [value, value, true]);
                 });
+                target.change(); // signal subscribers about changed data
             });
         });
     });