Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
fe028a5d0c
|
@ -2,6 +2,7 @@ node_modules/
|
|||
www/bower_components/
|
||||
www/common/pdfjs/
|
||||
www/common/tippy/
|
||||
www/common/textFit.min.js
|
||||
www/common/highlight/
|
||||
www/common/jquery-ui/
|
||||
www/common/onlyoffice/sdkjs
|
||||
|
|
|
@ -25,8 +25,6 @@ define([
|
|||
};
|
||||
|
||||
return function () {
|
||||
var showingMore = false;
|
||||
|
||||
var icons = [
|
||||
[ 'pad', Msg.type.pad],
|
||||
[ 'code', Msg.type.code],
|
||||
|
@ -39,7 +37,7 @@ define([
|
|||
].filter(function (x) {
|
||||
return isAvailableType(x[0]);
|
||||
})
|
||||
.map(function (x, i) {
|
||||
.map(function (x) {
|
||||
var s = 'div.bs-callout.cp-callout-' + x[0];
|
||||
var isEnabled = checkRegisteredType(x[0]);
|
||||
//if (i > 2) { s += '.cp-more.cp-hidden'; }
|
||||
|
|
Loading…
Reference in New Issue