pywebexec 1.7.10__py3-none-any.whl → 1.7.12__py3-none-any.whl

pywebexec/static/css/style.css

@@ -36,17 +36,6 @@ th {
 .outcol {
     width: 100%;
 }
-select { /* Safari bug */
-    -webkit-appearance: none;
-    -webkit-border-radius: none;
-    appearance: none;
-    outline: none;
-    font-size: 15px;
-    border: #aaa solid 1px;
-    border-radius: 5px;
-    padding: 0px 5px 5px 0px;
-    min-width: 150px;
-}
 .output {
     background: #111;
     padding: 10px;
@@ -74,13 +63,14 @@ button {
     -webkit-border-radius: none;
     appearance: none;
     border-radius: 15px;
-    padding-right: 13px;
+    padding: 0px 13px;
     border: 1px #555 solid;
     height: 22px;
     font-size: 13px;
     outline: none;
-    text-indent: 10px;
     background-color: #eee;
+    color: #000;
+    font-weight: normal;
 }
 form {
     padding-bottom: 15px;
@@ -138,7 +128,7 @@ form {
 .copy_clip_ok, .copy_clip_ok:hover {
     background-image: url("/static/images/copy_ok.svg");
 }
-#params, #commandName {
+#params, #command {
     -webkit-appearance: none;
     -webkit-border-radius: none;
     appearance: none;
@@ -152,7 +142,7 @@ form {
     margin: 0; /* Remove margin */
 }
 
-#commandName {
+#command {
     width: auto; /* Allow dynamic width */
     background-size: 16px 16px;
     border-radius: 15px 0px 0px 15px;
@@ -211,15 +201,18 @@ form {
     margin-top: 2px;
     overflow-y: auto;
     z-index: 1000;
+    max-height: 200px;
 }
 
 .command-item {
-    padding: 3px 5px 3px 5px;
+    padding: 1px 5px 1px 5px;
+    margin-top: 1px;
     cursor: pointer;
+    outline: none; /* Remove default focus border */
 }
 
-.command-item:hover, .command-item.highlighted {
-    background-color: #eee;
+.command-item:hover, .command-item.highlighted, .command-item:focus {
+    background-color: #a7d0ff;
 }
 
 .currentcommand {
@@ -300,17 +293,9 @@ span {
 }
 .font-increase {
     background-image: url("/static/images/font-increase.svg");
-    /*background-size: contain;*/
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 14px 14px;
 }
 .font-decrease {
     background-image: url("/static/images/font-decrease.svg");
-    /*background-size: contain;*/
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 14px 14px;
 }
 .font-size-button {
     background-color: #444;
@@ -321,6 +306,9 @@ span {
     font-size: 14px;
     width: 20px;
     height: 20px;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 14px 14px;
 }
 .font-size-button:hover {
     background-color: #666;

pywebexec/static/js/commands.js

@@ -1,47 +1,46 @@
 // commands.js
-let commandInput = document.getElementById('commandName');
+let commandInput = document.getElementById('command');
 let paramsInput = document.getElementById('params');
-let commandListSelect = document.getElementById('commandList');
+let commandListDiv = document.getElementById('commandList');
 let showCommandListButton = document.getElementById('showCommandListButton');
 let isHandlingKeydown = false;
 let firstVisibleItem = 0;
 
 function unfilterCommands() {
-    const options = commandListSelect.options;
-    for (let i = 0; i < options.length; i++) {
-        options[i].style.display = 'block';
+    const items = commandListDiv.children;
+    for (let i = 0; i < items.length; i++) {
+        items[i].style.display = 'block';
     }
-    commandListSelect.size = Math.min(20, commandListSelect.options.length);
+    commandListDiv.style.display = 'block';
 }
 
 function filterCommands() {
     const value = commandInput.value.slice(0, commandInput.selectionStart);
-    const options = commandListSelect.options;
+    const items = commandListDiv.children;
     let nbVisibleItems = 0;
     firstVisibleItem = -1;
-    for (let i = 0; i < options.length; i++) {
-        if (options[i].text.startsWith(value)) {
-            options[i].style.display = 'block';
+    for (let i = 0; i < items.length; i++) {
+        if (items[i].textContent.startsWith(value)) {
+            items[i].style.display = 'block';
             nbVisibleItems += 1;
             if (firstVisibleItem === -1) {
                 firstVisibleItem = i;
             }
         } else {
-            options[i].style.display = 'none';
+            items[i].style.display = 'none';
         }
     }
     if (nbVisibleItems > 1) {
-        commandListSelect.size = Math.min(20, nbVisibleItems);
-        commandListSelect.style.display = 'block';
+        commandListDiv.style.display = 'block';
     } else {
-        commandListSelect.style.display = 'none';
+        commandListDiv.style.display = 'none';
     }
 }
 
 function setCommandListPosition() {
     const rect = commandInput.getBoundingClientRect();
-    commandListSelect.style.left = `${rect.left}px`;
-    commandListSelect.style.top = `${rect.bottom}px`;
+    commandListDiv.style.left = `${rect.left}px`;
+    commandListDiv.style.top = `${rect.bottom}px`;
 }
 
 function adjustInputWidth(input) {
@@ -49,7 +48,6 @@ function adjustInputWidth(input) {
     input.style.width = `${input.scrollWidth}px`;
 }
 
-
 paramsInput.addEventListener('input', () => adjustInputWidth(paramsInput));
 commandInput.addEventListener('input', () => {
     adjustInputWidth(commandInput);
@@ -73,12 +71,12 @@ commandInput.addEventListener('input', (event) => {
         commandInput.setSelectionRange(newValue.length, newValue.length);
     }
     const value = commandInput.value;
-    const options = commandListSelect.options;
+    const options = commandListDiv.children;
     if (value) {
-        const match = Array.from(options).find(option => option.text.startsWith(value));
+        const match = Array.from(options).find(option => option.textContent.startsWith(value));
         if (match) {
-            commandInput.value = match.text;
-            commandInput.setSelectionRange(value.length, match.text.length);
+            commandInput.value = match.textContent;
+            commandInput.setSelectionRange(value.length, match.textContent.length);
         } else {
             commandInput.value = value.slice(0, -1);
         }
@@ -88,17 +86,15 @@ commandInput.addEventListener('input', (event) => {
 });
 
 commandInput.addEventListener('keydown', (event) => {
-    if (event.key === ' ' || event.key === 'ArrowRight') {
+    if (event.key === ' ' || event.key === 'ArrowRight' || event.key === 'Tab') {
         event.preventDefault();
         paramsInput.focus();
         paramsInput.setSelectionRange(0, paramsInput.value.length);
+        commandListDiv.style.display = 'none'
     } else if (event.key === 'ArrowDown') {
-        if (commandListSelect.options.length > 1) {
-            commandListSelect.style.display = 'block';
-            commandListSelect.selectedIndex = firstVisibleItem;
-            commandListSelect.focus();
-            commandListSelect.options[firstVisibleItem].scrollIntoView();
-            commandListSelect.options[firstVisibleItem].focus();
+        if (commandListDiv.children.length > 1) {
+            commandListDiv.style.display = 'block';
+            commandListDiv.children[firstVisibleItem].focus();
         }
         event.preventDefault();
     }
@@ -121,47 +117,65 @@ paramsInput.addEventListener('keydown', (event) => {
     }
 });
 
-commandListSelect.addEventListener('keydown', (event) => {
-    if (event.key === 'Enter') {
-        event.preventDefault(); // Prevent form submission
-        const selectedOption = commandListSelect.options[commandListSelect.selectedIndex];
-        commandInput.value = selectedOption.text;
-        commandListSelect.style.display = 'none';
-        adjustInputWidth(commandInput);
-        paramsInput.focus();
-        return;
-    }
-    if (event.key === 'ArrowUp' && commandListSelect.selectedIndex == 0) {
+commandListDiv.addEventListener('keydown', (event) => {
+    const items = Array.from(commandListDiv.children);
+    const currentIndex = items.indexOf(document.activeElement);
+
+    if (event.key === 'Escape') {
         commandInput.focus();
-        commandListSelect.style.display = 'none'
+        commandListDiv.style.display = 'none';
+    }else if (event.key === 'ArrowDown') {
+        event.preventDefault();
+        const nextIndex = (currentIndex + 1) % items.length;
+        items[nextIndex].focus();
+    } else if (event.key === 'ArrowUp') {
+        event.preventDefault();
+        if (currentIndex === 0 || items[currentIndex-1].style.display == 'none') {
+            commandInput.focus();
+            commandListDiv.style.display = 'none';
+        } else {
+            const prevIndex = (currentIndex - 1 + items.length) % items.length;
+            items[prevIndex].focus();
+        }
+    } else if (event.key === 'Enter' || event.key === 'Tab' || event.key === ' ') {
+        event.preventDefault(); // Prevent form submission
+        const selectedOption = document.activeElement;
+        if (selectedOption.classList.contains('command-item')) {
+            commandInput.value = selectedOption.textContent;
+            commandListDiv.style.display = 'none';
+            adjustInputWidth(commandInput);
+            paramsInput.focus();
+        }
     }
 });
 
-commandListSelect.addEventListener('click', (event) => {
+commandListDiv.addEventListener('click', (event) => {
     event.preventDefault(); // Prevent form submission
-    const selectedOption = commandListSelect.options[commandListSelect.selectedIndex];
-    commandInput.value = selectedOption.text;
-    commandListSelect.style.display = 'none';
-    adjustInputWidth(commandInput);
-    paramsInput.focus();
+    const selectedOption = event.target;
+    if (selectedOption.classList.contains('command-item')) {
+        commandInput.value = selectedOption.textContent;
+        commandListDiv.style.display = 'none';
+        adjustInputWidth(commandInput);
+        paramsInput.focus();
+    }
 });
 
 
 commandInput.addEventListener('click', () => {
     setCommandListPosition();
-    if (commandListSelect.style.display == 'none')
-        commandListSelect.style.display = 'block';
+    if (commandListDiv.style.display == 'none')
+        commandListDiv.style.display = 'block';
     else
-        commandListSelect.style.display = 'none';
+        commandListDiv.style.display = 'none';
     filterCommands();
 });
 
 commandInput.addEventListener('blur', (event) => {
-    if (event.relatedTarget === showCommandListButton || event.relatedTarget === commandListSelect) {
+    if (event.relatedTarget === showCommandListButton || event.relatedTarget === commandListDiv || event.relatedTarget.classList.includes('command-item')) {
         event.preventDefault();
         return;
     }
-    commandListSelect.style.display = 'none';
+    commandListDiv.style.display = 'none';
     adjustInputWidth(commandInput);
 });
 
@@ -169,20 +183,16 @@ showCommandListButton.addEventListener('click', (event) => {
     event.preventDefault();
     setCommandListPosition();
     unfilterCommands();
-    if (commandListSelect.style.display == 'none')
-        commandListSelect.style.display = 'block';
-    else
-        commandListSelect.style.display = 'none';
 });
 
 window.addEventListener('click', (event) => {
-    if (!commandInput.contains(event.target) && !commandListSelect.contains(event.target) && !showCommandListButton.contains(event.target)) {
-        commandListSelect.style.display = 'none';
+    if (!commandInput.contains(event.target) && !commandListDiv.contains(event.target) && !showCommandListButton.contains(event.target)) {
+        commandListDiv.style.display = 'none';
     }
 });
 
 window.addEventListener('keydown', (event) => {
-    if ([commandInput, paramsInput, commandListSelect].includes(document.activeElement)) return;
+    if ([commandInput, paramsInput, commandListDiv].includes(document.activeElement)) return;
     if (event.code === `Key${event.key.toUpperCase()}`) {
         commandInput.focus();
         commandInput.dispatchEvent(new KeyboardEvent('keydown', event));
@@ -207,22 +217,22 @@ async function fetchExecutables() {
             throw new Error('Failed to fetch command status');
         }
         const executables = await response.json();
-        commandListSelect.innerHTML = '';
+        commandListDiv.innerHTML = '';
         executables.forEach(executable => {
-            const option = document.createElement('option');
-            option.className = 'command-item';
-            option.text = executable;
-            commandListSelect.appendChild(option);
+            const div = document.createElement('div');
+            div.className = 'command-item';
+            div.textContent = executable;
+            div.tabIndex = 0; // Make the div focusable
+            commandListDiv.appendChild(div);
         });
     } catch (error) {
         alert("Failed to fetch executables");
     }
-    commandListSelect.size = Math.min(20, commandListSelect.options.length);
-    if (commandListSelect.options.length == 1) {
-        commandInput.value = commandListSelect.options[0].text;
+    if (commandListDiv.children.length == 1) {
+        commandInput.value = commandListDiv.children[0].textContent;
         showCommandListButton.style.display = 'none';
     }
-    if (commandListSelect.options.length == 0)
+    if (commandListDiv.children.length == 0)
         document.getElementById('launchForm').style.display = 'none';
 
 }

pywebexec/static/js/script.js

@@ -126,8 +126,8 @@ const urlToken = getTokenParam();
 
 document.getElementById('launchForm').addEventListener('submit', async (event) => {
     event.preventDefault();
-    const commandName = document.getElementById('commandName').value;
-    const params = document.getElementById('params').value.split(' ');
+    const commandName = commandInput.value;
+    const params = paramsInput.value.split(' ');
     fitAddon.fit();
     terminal.clear();
     try {

pywebexec/templates/index.html

@@ -13,13 +13,13 @@
     </div>
     <h2><span class="status-icon title-icon"></span>{{ title }}</h2>
     <form id="launchForm" class="form-inline">
-        <label for="commandName">Command</label>
+        <label for="command">Command</label>
         <div class="input-group">
-            <input type="text" id="commandName" name="commandName" size=5 autocomplete="off" style="width: 100px;" autofocus>
+            <input type="text" id="command" name="command" size=5 autocomplete="off" style="width: 100px;" autofocus>
             <div id="showCommandListButton" class="show-command-list-button">
                 <span class="arrow">&#9660;</span>
             </div>
-            <select id="commandList" class="command-list" size="20"></select>
+            <div id="commandList" class="command-list"></div>
             <input type="text" id="params" name="params" oninput="this.style.width = ((this.value.length + 1) * 8) + 'px';">
         </div>
         <button type="submit">Run</button>

pywebexec/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.10'
-__version_tuple__ = version_tuple = (1, 7, 10)
+__version__ = version = '1.7.12'
+__version_tuple__ = version_tuple = (1, 7, 12)

{pywebexec-1.7.10.dist-info → pywebexec-1.7.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pywebexec
-Version: 1.7.10
+Version: 1.7.12
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-1.7.10.dist-info → pywebexec-1.7.12.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pywebexec/__init__.py,sha256=4spIsVaF8RJt8S58AG_wWoORRNkws9Iwqprj27C3ljM,99
 pywebexec/pywebexec.py,sha256=MmpHK2SscvIPj1gmV9AcJXYfeaL-at5BDgLhKIxzZBc,33604
-pywebexec/version.py,sha256=BcMHo4x9krobfBaTHQOg-i0s8jUuLIhj-_tcl9epPPg,413
+pywebexec/version.py,sha256=dSwjHj4iLBCyQl7aZEEt5q3jGDuArBY7LwcMyXcjaUg,413
 pywebexec/static/css/Consolas NF.ttf,sha256=DJEOzF0eqZ-kxu3Gs_VE8X0NJqiobBzmxWDGpdgGRxI,1313900
-pywebexec/static/css/style.css,sha256=3s7QgbCh4wb7kfZ7Pjo-B6o3lDIBogZ-3j6AfaPdpzU,8209
+pywebexec/static/css/style.css,sha256=6Q89tdXTzuGaMJJ26gp-YD2L0eIsFb7C83IYOoMJb8g,7915
 pywebexec/static/css/xterm.css,sha256=uo5phWaUiJgcz0DAzv46uoByLLbJLeetYosL1xf68rY,5559
 pywebexec/static/images/aborted.svg,sha256=2nuvSwGBIZGWtlM1DrBO3qiSq1reDbcZDAj9rJXBnjY,380
 pywebexec/static/images/copy.svg,sha256=d9OwtGh5GzzZHzYcDrLfNxZYLth1Q64x7bRyYxu4Px0,622
@@ -20,9 +20,9 @@ pywebexec/static/images/popup.svg,sha256=0Bl9A_v5cBsMPn6FnOlVWlAQKgd2zqiWQbhjcL9
 pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65EiuwtvK4A,607
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
-pywebexec/static/js/commands.js,sha256=h2fkd9qpypLBxvhEEbay23nwuqUwcKJA0vHugcyL8pU,7961
+pywebexec/static/js/commands.js,sha256=1g771zk-EV1H7vKGWZSrTK_avWF6pBgdIy860hodxiw,8332
 pywebexec/static/js/popup.js,sha256=_2GzUizJ-sdZFWG7SZwbYJTPbu4EvVq7D5Q_UE8nepA,9452
-pywebexec/static/js/script.js,sha256=VUrypyN39pawdT-uEQqvgve0nQuGZrQ5Q5L3WDOk9Vk,18530
+pywebexec/static/js/script.js,sha256=bmaR9TJhZMEK_Niz0TCp8CJdnLKh4ayaxLvqgjxdoRs,18482
 pywebexec/static/js/xterm/LICENSE,sha256=EU1P4eXTull-_T9I80VuwnJXubB-zLzUl3xpEYj2T1M,1083
 pywebexec/static/js/xterm/addon-canvas.js,sha256=ez6QTVvsmLVNJmdJlM-ZQ5bErwlxAQ_9DUmDIptl2TM,94607
 pywebexec/static/js/xterm/addon-canvas.js.map,sha256=ECBA4B-BqUpdFeRzlsEWLSQnudnhLP-yPQJ8_hKquMo,379537
@@ -33,11 +33,11 @@ pywebexec/static/js/xterm/addon-unicode11.js.map,sha256=paDj5KKtTIUGedQn2x7CaUTD
 pywebexec/static/js/xterm/xterm.js,sha256=H5kaw7Syg-v5bmCuI6AKUnZd06Lkb6b92p8aqwMvdJU,289441
 pywebexec/static/js/xterm/xterm.js.map,sha256=Y7O2Pb-fIS7Z8AC1D5s04_aiW_Jf1f4mCfN0U_OI6Zw,1118392
 pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pywebexec/templates/index.html,sha256=CcLN3v_42lnj4juiTntDTiGHJ8-zQnmB9oqpSK_0kks,2981
+pywebexec/templates/index.html,sha256=KSdQYBdzWKP6v0ETZsMO_729aosGBAzJxAss8T5jCto,2953
 pywebexec/templates/popup.html,sha256=f5m4u8WKpkevL2mQamGqo4_y-rSuLOXGuNsezuUbniY,1508
-pywebexec-1.7.10.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-1.7.10.dist-info/METADATA,sha256=C22AhjECWjwwIzMYNlksxKgkEiMHunck34lwNK0adXM,8149
-pywebexec-1.7.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pywebexec-1.7.10.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-1.7.10.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-1.7.10.dist-info/RECORD,,
+pywebexec-1.7.12.dist-info/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-1.7.12.dist-info/METADATA,sha256=9LbZYl-e-jOLwTE48iI17WHMvnd1ukT7zMcL2Z8QLSE,8149
+pywebexec-1.7.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pywebexec-1.7.12.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-1.7.12.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-1.7.12.dist-info/RECORD,,