Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2017-09-05 18:40:18 +02:00
commit 0bb6698399
3 changed files with 34 additions and 1 deletions

View file

@ -560,6 +560,24 @@ define([
});
};
common.listAllTags = function (cb) {
var all = [];
var proxy = getProxy();
var files = common.find(proxy, ['drive', 'filesData']);
if (typeof(files) !== 'object') { return cb('invalid_drive'); }
Object.keys(files).forEach(function (k) {
var file = files[k];
if (!Array.isArray(file.tags)) { return; }
file.tags.forEach(function (tag) {
if (all.indexOf(tag) === -1) {
all.push(tag);
}
});
});
cb(void 0, all);
};
common.getLSAttribute = function (attr) {
return localStorage[attr];
};

View file

@ -20,7 +20,7 @@
height: 28px;
padding: 2px 0;
}
#cke_1_top .cryptpad-toolbar {
#cke_1_top .cp-toolbar {
padding: 0;
display: block;
}
@ -28,3 +28,16 @@
min-width: 60%;
}
}
.cke_wysiwyg_frame {
min-width: 60%;
}
@media print {
#cke_1_top {
display:none !important;
}
&.cp-app-pad .cp-toolbar-userlist-drawer {
display:none;
}
}

View file

@ -369,6 +369,8 @@ define([
if (!readOnly && !initializing) {
userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
} else if (readOnly) {
userDocStateDom.removeAttribute("contenteditable");
}
var patch = (DD).diff(inner, userDocStateDom);
(DD).apply(inner, patch);