The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

moved code for selecting active dropdown option

Browse Source
This commit is contained in:
Zuzanna 2026-03-17 15:53:38 +01:00
parent 3649a4765f
commit 8ed9bb936e
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/common-ui-elements.js
View File

@ -1642,14 +1642,7 @@ define([
if ($(e.target).attr('href') === '#') {
e.preventDefault();
}
if (config.isSelect && config.attributes["data-app"] !== 'diagram') { return; }
if ($el.length !== 1) { return; }
if (config.attributes["data-app"] === 'diagram') {
$('.cp-dropdown-content').find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
$el.addClass('cp-dropdown-element-active');
$el.closest('li').focus();
}
if (config.isSelect) { return; }
e.stopPropagation();
if (typeof(config.action) === "function") {
var close = config.action(e);
@ -1836,7 +1829,7 @@ define([
}
$innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
setTimeout(() => {
if (config.isSelect && value || config.attributes && config.attributes["data-app"] === 'diagram' && value) {
if (config.isSelect && value) {
// We use JSON.stringify here to escape quotes
if (typeof(value) === "object") { value = JSON.stringify(value); }
var $val = $innerblock.find('[data-value='+JSON.stringify(value)+']');

14
www/diagram/inner.js
View File

@ -254,32 +254,38 @@ define([
attributes: {
'data-value': mode,
'aria-label': Messages._getKey('diagram_modesOptionLabel', [mode]),
'data-app': 'diagram'
},
content: mode,
action: function () {
var $self = $('a[data-value="' + mode + '"]');
parameters.set('ui', mode);
drawioFrame.src = ApiConfig.httpSafeOrigin + '/components/drawio/src/main/webapp/index.html?'
+ parameters;
privateData = framework._.cpNfInner.metadataMgr.getPrivateData();
setTheme(privateData.channel, mode);
$('.cp-dropdown-content').find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
$self.addClass('cp-dropdown-element-active');
$self.closest('li').focus();
},
});
});
var initialMode = parameters.get('ui') || checkDefaultTheme();
var $drawer = UIElements.createDropdown({
text: Messages.diagram_modes,
options: types,
common: framework._.sfCommon,
isSelect: true,
iconCls: 'color-palette',
initialValue: parameters.get('ui') || checkDefaultTheme(),
initialValue: initialMode
});
framework._.toolbar.$theme = $drawer.find('ul.cp-dropdown-content');
framework._.toolbar.$bottomL.append($drawer);
$drawer.addClass('cp-toolbar-appmenu');
$drawer.on('click', function () {
$('a[data-value="' + initialMode + '"]').addClass('cp-dropdown-element-active');
});
};
mkModeButton(framework);
};
$('#cp-app-diagram-editor').hide();