From ff1e0e2302b2cfe0db888dabae7ad2a876425d1f Mon Sep 17 00:00:00 2001
From: Florian Schunk <florian.schunk@rwth-aachen.de>
Date: Sat, 22 Dec 2018 12:06:56 +0100
Subject: [PATCH] reset name of new folder and prevent the form from being
submitted twice
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
---
core/js/oc-dialogs.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index bf34ac1e556..bf87c8b6423 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -262,6 +262,8 @@ var OCdialogs = {
OC.registerMenu(newButton,self.$filePicker.find('.menu'),function () {
$input.focus();
self.$filePicker.ocdialog('setEnterCallback', function() {
+ event.stopImmediatePropagation();
+ event.preventDefault();
self.$form.submit();
});
var newName = $input.val();
@@ -275,7 +277,7 @@ var OCdialogs = {
var $input = $form.find('input[type=\'text\']');
var $submit = $form.find('input[type=\'submit\']');
$submit.on('click',function(event) {
- event.stopPropagation();
+ event.stopImmediatePropagation();
event.preventDefault();
$form.submit();
});
@@ -314,10 +316,13 @@ var OCdialogs = {
OC.hideMenus();
self.$filePicker.ocdialog('unsetEnterCallback');
self.$filePicker.click();
+ $input.val(newText);
}
});
$input.keypress(function(event) {
if (event.keyCode == 13 || event.which == 13) {
+ event.stopImmediatePropagation();
+ event.preventDefault();
$form.submit();
}
});
--
GitLab