infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

remove padding in prop modal 

- caused a vertical scrollbar
- now constructed like the share modal (customModals inside tabs)
pull/1/head
David Benqué 2019-12-03 10:11:52 +00:00
parent ee1371c8ba
commit 26c681c3cb
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/common/common-ui-elements.js
View File

@ -737,12 +737,22 @@ define([
UIElements.getProperties = function (common, data, cb) {
var c1;
var c2;
var button = [{
className: 'primary',
name: Messages.okButton,
onClick: function () {},
keys: [13]
}];
NThen(function (waitFor) {
getPadProperties(common, data, waitFor(function (e, c) {
c1 = c[0];
c1 = UI.dialog.customModal(c[0], {
buttons: button
});
}));
getRightsProperties(common, data, waitFor(function (e, c) {
c2 = c[0];
c2 = UI.dialog.customModal(c[0], {
buttons: button
});
}));
}).nThen(function () {
var tabs = UI.dialog.tabs([{
@ -1767,7 +1777,7 @@ define([
if (e) { return void console.error(e); }
UIElements.getProperties(common, data, function (e, $prop) {
if (e) { return void console.error(e); }
UI.alert($prop[0], undefined, true);
UI.openCustomModal($prop[0]);
});
});
});

11
www/common/drive-ui.js
View File

@ -4187,16 +4187,7 @@ define([
}
getProperties(el, function (e, $prop) {
if (e) { return void logError(e); }
var modal = UI.dialog.customModal($prop[0], {
buttons: [{
className: 'secondary',
name: Messages.okButton,
onClick: function () {},
keys: [13]
}],
onClose: config.onClose,
});
UI.openCustomModal(modal);
UI.openCustomModal($prop[0]);
});
}
else if ($this.hasClass("cp-app-drive-context-hashtag")) {