Change values for color scheme (use names)

This commit is contained in:
Julia Radzhabova 2019-08-21 12:16:32 +03:00
parent 6e93a76a0a
commit 4b5db261b5
3 changed files with 9 additions and 6 deletions

View file

@ -2098,12 +2098,13 @@ define([
caption: '--' caption: '--'
}); });
} }
var name = schema.get_name();
this.mnuColorSchema.addItem({ this.mnuColorSchema.addItem({
template: itemTemplate, template: itemTemplate,
cls: 'color-schemas-menu', cls: 'color-schemas-menu',
colors: schemecolors, colors: schemecolors,
caption: (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(), caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
value: index, value: name,
checkable: true, checkable: true,
toggleGroup: 'menuSchema' toggleGroup: 'menuSchema'
}); });

View file

@ -1319,12 +1319,13 @@ define([
caption: '--' caption: '--'
}); });
} }
var name = schema.get_name();
mnuColorSchema.addItem({ mnuColorSchema.addItem({
template: itemTemplate, template: itemTemplate,
cls: 'color-schemas-menu', cls: 'color-schemas-menu',
colors: schemecolors, colors: schemecolors,
caption: (index < 21) ? (me.schemeNames[index] || schema.get_name()) : schema.get_name(), caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
value: index, value: name,
checkable: true, checkable: true,
toggleGroup: 'menuSchema' toggleGroup: 'menuSchema'
}); });

View file

@ -1952,12 +1952,13 @@ define([
caption : '--' caption : '--'
}); });
} }
var name = schema.get_name();
this.mnuColorSchema.addItem({ this.mnuColorSchema.addItem({
template: itemTemplate, template: itemTemplate,
cls : 'color-schemas-menu', cls : 'color-schemas-menu',
colors : schemecolors, colors : schemecolors,
caption : (index < 21) ? (me.SchemeNames[index] || schema.get_name()) : schema.get_name(), caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
value : index, value: name,
checkable: true, checkable: true,
toggleGroup: 'menuSchema' toggleGroup: 'menuSchema'
}); });