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

This commit is contained in:
ansuz
2017-03-15 18:59:38 +01:00
14 changed files with 58 additions and 14 deletions

View File

@@ -1330,6 +1330,8 @@ define([
}
Messages._initSelector($block);
return $block;
};
var createUserAdminMenu = common.createUserAdminMenu = function (config) {

View File

@@ -432,11 +432,6 @@ define([
$userContainer.append($lag);
}
if (config.displayed.indexOf('language') !== -1) {
// Dropdown language selector
Cryptpad.createLanguageSelector($userContainer);
}
if (config.displayed.indexOf('newpad') !== -1) {
var pads_options = [];
Config.availablePadTypes.forEach(function (p) {
@@ -460,6 +455,7 @@ define([
};
var $newPadBlock = Cryptpad.createDropdown(dropdownConfig);
$newPadBlock.find('button').attr('title', Messages.newButtonTitle);
$newPadBlock.find('button').attr('id', 'newdoc');
$newPadBlock.appendTo($userContainer);
}