Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/passman.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js/app
diff options
context:
space:
mode:
authorfnuesse <felix.nuesse@t-online.de>2019-05-18 23:15:10 +0300
committerfnuesse <felix.nuesse@t-online.de>2019-05-18 23:15:10 +0300
commitcda4c438a2217b52cb5a1e8eff3246227398658f (patch)
treecc1502fe2eb364ea5203c19f9a097baf829986bb /js/app
parent1d0fdfd957e19a55ef232c21e991cd797c1c3d8f (diff)
updated incoming share modal to new style and fixed bugs regarding dialogs
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
Diffstat (limited to 'js/app')
-rw-r--r--js/app/controllers/credential.js5
-rw-r--r--js/app/directives/iconpicker.js1
2 files changed, 4 insertions, 2 deletions
diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 0dc3f4b1..037bfd02 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -127,8 +127,9 @@
if (shareRequests.length > 0) {
$scope.incoming_share_requests = shareRequests;
jQuery('.share_popup').dialog({
- width: 600,
- position: ['center', 90]
+ width: 800,
+ modal: true,
+ dialogClass: 'shareincoming-dialog'
});
}
});
diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js
index dda10fdb..2cc60594 100644
--- a/js/app/directives/iconpicker.js
+++ b/js/app/directives/iconpicker.js
@@ -152,6 +152,7 @@
$('#iconPicker').dialog({
width: 800,
height: 380,
+ modal: true,
dialogClass: 'iconpicker-dialog',
close: function() {
$(this).dialog('destroy');