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

Fix undefined element in select dropdown menus

Browse Source
This commit is contained in:
yflory 2017-06-12 14:23:06 +02:00
parent 298e34a9de
commit 30bdb9881c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ define([
if (exp.$language) { if (exp.$language) {
var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined; var name = exp.$language.find('a[data-value="' + mode + '"]').text() || undefined;
name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton; name = name ? Messages.languageButton + ' ('+name+')' : Messages.languageButton;
exp.$language.setValue(name); exp.$language.setValue(mode, name);
} }
if(cb) { cb(mode); } if(cb) { cb(mode); }
}; };
@ -86,7 +86,7 @@ define([
if ($select) { if ($select) {
var name = theme || undefined; var name = theme || undefined;
name = name ? Messages.themeButton + ' ('+theme+')' : Messages.themeButton; name = name ? Messages.themeButton + ' ('+theme+')' : Messages.themeButton;
$select.setValue(name); $select.setValue(theme, name);
} }
}; };
}()); }());

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

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