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

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

Browse Source
This commit is contained in:
ansuz
2017-06-12 14:34:01 +02:00
parent db9b9547d9 30bdb9881c
commit c9725af508
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/common/common-codemirror.js
View File

@@ -48,16 +48,12 @@ define([
var setMode = exp.setMode = function (mode, cb) {
exp.highlightMode = mode;
if (mode === 'text') {
editor.setOption('mode', 'text');
if (cb) { cb('text'); }
return;
}
CMeditor.autoLoadMode(editor, mode);
if (mode !== "text") { CMeditor.autoLoadMode(editor, mode); }
editor.setOption('mode', mode);
if (exp.$language) {
var name = exp.$language.find('a[data-value="' + mode + '"]').text() || 'Mode';
exp.$language.setValue(name);
var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined;
name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;
exp.$language.setValue(mode, name);
}
if(cb) { cb(mode); }
};
@@ -88,7 +84,9 @@ define([
editor.setOption('theme', theme);
}
if ($select) {
$select.setValue(theme || 'Theme');
var name = theme || undefined;
name = name ? Messages.themeButton + ' ('+theme+')' : Messages.themeButton;
$select.setValue(theme, name);
}
};
}());
@@ -152,6 +150,7 @@ define([
isSelect: true,
};
var $block = exp.$language = Cryptpad.createDropdown(dropdownConfig);
$block.find('button').attr('title', Messages.languageButtonTitle);
$block.find('a').click(function () {
setMode($(this).attr('data-value'), onModeChanged);
onLocal();
@@ -185,6 +184,7 @@ define([
initialValue: lastTheme
};
var $block = exp.$theme = Cryptpad.createDropdown(dropdownConfig);
$block.find('button').attr('title', Messages.themeButtonTitle);
setTheme(lastTheme, $block);

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

@@ -1197,10 +1197,10 @@ define([
}, 1000);
});
$container.setValue = function (val) {
$container.setValue = function (val, name) {
value = val;
var $val = $innerblock.find('[data-value="'+val+'"]');
var textValue = $val.html() || val;
var textValue = name || $val.html() || val;
$button.find('.buttonTitle').html(textValue);
};
$container.getValue = function () {