web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support forefront flag in alert config

Browse Source
This commit is contained in:
ansuz 2017-09-13 12:32:30 +02:00
parent 8c41e0bdd6
commit 244e3ecba7
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
customize.dist/src/less2/include/alertify.less
View File

@ -3,6 +3,7 @@
@import (once) "./modal-theme.less"; @import (once) "./modal-theme.less";
.alertify_main () { .alertify_main () {
@max-z-index: 2147483647;
@alertify-fore: @colortheme_modal-fg; @alertify-fore: @colortheme_modal-fg;
@alertify-base: @colortheme_modal-bg; @alertify-base: @colortheme_modal-bg;
@ -27,7 +28,7 @@
// These show only once // These show only once
.alertify-logs { .alertify-logs {
z-index:10000; z-index:10000; // alertify logs
@media print { @media print {
visibility: hidden; visibility: hidden;
} }
@ -63,7 +64,10 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 99999; z-index: 99999; // alertify container
&.forefront {
z-index: @max-z-index; // alertify max forefront
}
.message { .message {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -236,7 +240,7 @@
.alertify-logs { .alertify-logs {
position: fixed; position: fixed;
z-index: 99999; z-index: 99999; // alertify logs
&.bottom, &:not(.top) { &.bottom, &:not(.top) {
bottom: 16px; bottom: 16px;

11
www/common/common-interface.js
View File

@ -209,7 +209,15 @@ define([
return tagger; return tagger;
}; };
UI.alert = function (msg, cb, force) { UI.alert = function (msg, cb, opt) {
var force = false;
if (typeof(opt) === 'object') {
force = opt.force || false;
} else if (typeof(opt) === 'boolean') {
force = opt;
opt = {};
}
cb = cb || function () {}; cb = cb || function () {};
var message; var message;
@ -228,6 +236,7 @@ define([
dialog.nav(ok), dialog.nav(ok),
]); ]);
if (opt.forefront) { $(frame).addClass('forefront'); }
var listener; var listener;
var close = Util.once(function () { var close = Util.once(function () {
$(frame).fadeOut(150, function () { $(this).remove(); }); $(frame).fadeOut(150, function () { $(this).remove(); });