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

compile less clientside. remove compiled css

Browse Source
This commit is contained in:
ansuz
2017-06-27 14:25:02 +02:00
parent 67a096a8a4
commit e9bfaa9a60
38 changed files with 167 additions and 5948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
www/common/toolbar2.js
View File

@@ -48,7 +48,8 @@ define([
return 'cryptpad-uid-' + String(Math.random()).substring(2);
};
var styleToolbar = function ($container, href, version) {
var styleToolbar = function ($container, href, version, force) {
if (!force) { return; }
href = href || '/customize/toolbar.css' + (version?('?' + version): '');
$.ajax({
@@ -108,9 +109,9 @@ define([
$container.prepend($toolbar);
if (ApiConfig && ApiConfig.requireConf && ApiConfig.requireConf.urlArgs) {
styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs);
styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs, config.legacyStyle);
} else {
styleToolbar($container);
styleToolbar($container, void 0, void 0, config.legacyStyle);
}
$container.on('drop dragover', function (e) {
e.preventDefault();
@@ -668,6 +669,11 @@ define([
};
Cryptpad.isOverPinLimit(function (e, isOver, data) {
if (e) { return console.error(e); }
if (isOver) { return todo(void 0, true); }
if (!data) { return console.error("Problem creating limit"); }
var limit = data.limit;
var usage = data.usage;
if (typeof(limit) !== 'number' || typeof(usage) !== 'number') {