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

Merge branch 'fix-chrome-style-bug' into soon

Browse Source
This commit is contained in:
yflory 2016-10-10 17:07:50 +02:00
commit 91b4446c0b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/cryptpad-common.js
View File

@ -760,6 +760,7 @@ define([
} }
}); });
$("#cryptpad-readonly-open").click(function() { $("#cryptpad-readonly-open").click(function() {
common.findOKButton().click();
window.open(url); window.open(url);
}); });
@ -798,7 +799,11 @@ define([
*/ */
var styleAlerts = common.styleAlerts = function (href) { var styleAlerts = common.styleAlerts = function (href) {
var $link = $('link[href="/customize/alertify.css"]'); var $link = $('link[href="/customize/alertify.css"]');
if ($link.length) { return; } if ($link.length) {
$link.attr('href', '');
$link.attr('href', '/customize/alertify.css');
return;
}
href = href || '/customize/alertify.css'; href = href || '/customize/alertify.css';
$('head').append($('<link>', { $('head').append($('<link>', {
@ -838,6 +843,7 @@ define([
}; };
common.alert = function (msg, cb) { common.alert = function (msg, cb) {
common.styleAlerts();
cb = cb || function () {}; cb = cb || function () {};
var keyHandler = listenForKeys(function (e) { // yes var keyHandler = listenForKeys(function (e) { // yes
findOKButton().click(); findOKButton().click();
@ -849,6 +855,7 @@ define([
}; };
common.prompt = function (msg, def, cb, opt) { common.prompt = function (msg, def, cb, opt) {
common.styleAlerts();
opt = opt || {}; opt = opt || {};
cb = cb || function () {}; cb = cb || function () {};
@ -872,6 +879,7 @@ define([
}; };
common.confirm = function (msg, cb, opt) { common.confirm = function (msg, cb, opt) {
common.styleAlerts();
opt = opt || {}; opt = opt || {};
cb = cb || function () {}; cb = cb || function () {};
var keyHandler = listenForKeys(function (e) { var keyHandler = listenForKeys(function (e) {