diff options
author | B. Stack <bgstack15@gmail.com> | 2023-01-03 16:51:53 +0000 |
---|---|---|
committer | B. Stack <bgstack15@gmail.com> | 2023-01-03 16:51:53 +0000 |
commit | 2bb1ee42a48c312151558b1bbcc31e86c26d924a (patch) | |
tree | e4dd327a4a9afa5021f608dd2373bfd268ba6734 | |
parent | Merge branch 'login-improvements' into 'stackrpms' (diff) | |
parent | make update-infcloud-cache use env MANIFEST (diff) | |
download | radicaleinfcloud-2bb1ee42a48c312151558b1bbcc31e86c26d924a.tar.gz radicaleinfcloud-2bb1ee42a48c312151558b1bbcc31e86c26d924a.tar.bz2 radicaleinfcloud-2bb1ee42a48c312151558b1bbcc31e86c26d924a.zip |
Merge branch 'add-ctrl-enter' into 'stackrpms'
Add ctrl enter
See merge request bgstack15/RadicaleInfCloud!3
-rw-r--r-- | radicale_infcloud/web/main.js | 7 | ||||
-rwxr-xr-x | update-infcloud-cache | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/radicale_infcloud/web/main.js b/radicale_infcloud/web/main.js index 84b42dd..bd8a584 100644 --- a/radicale_infcloud/web/main.js +++ b/radicale_infcloud/web/main.js @@ -1600,9 +1600,16 @@ window.onload=globalMain; window.onkeydown=function(event) { switch(event.which) { + case 10: + /* case 10 is for Mac or possibly Chrome compatibility. https://stackoverflow.com/a/9343095 */ + if(globalActiveApp=='CalDavZAP' && $('#event_details_template').is(':visible') && $('#saveButton').is(':visible') && event.ctrlKey) + $('#saveButton').trigger('click'); + break; case 13: if(!isUserLogged) $('#Login').find('[data-type="system_login"]').trigger('click'); + if(globalActiveApp=='CalDavZAP' && $('#event_details_template').is(':visible') && $('#saveButton').is(':visible') && event.ctrlKey) + $('#saveButton').trigger('click'); break; case 27: if(globalActiveApp=='CalDavZAP' && $('#CAEvent').is(':visible') && $('#EventDisabler').is(':hidden')) diff --git a/update-infcloud-cache b/update-infcloud-cache index 071ec77..162b8d1 100755 --- a/update-infcloud-cache +++ b/update-infcloud-cache @@ -4,7 +4,7 @@ # Use this script every time you modify any file to force browsers to reload it (empty HTML5 cache). USE_BIN=none -MANIFEST=/etc/infcloud/cache.manifest +test -z "${MANIFEST}" && MANIFEST=/etc/infcloud/cache.manifest test -e $( command -v ed 2>/dev/null ) && USE_BIN=ed test -e $( command -v sed 2>/dev/null ) && USE_BIN=sed command -v "${USE_BIN}" &> /dev/null || { echo "Error: 'ed' not installed. Aborting." > /dev/stderr; exit 1; } |