[PE][SSE] Fix creating bulleted list

This commit is contained in:
Julia Radzhabova 2020-07-27 10:38:54 +03:00
parent bda352f4bc
commit a1c5daff2d

View file

@ -225,49 +225,48 @@ define([
this.cmbBulletFormat.selectRecord(rec); this.cmbBulletFormat.selectRecord(rec);
this.bulletProps = {symbol: rec.get('symbol'), font: rec.get('font')}; this.bulletProps = {symbol: rec.get('symbol'), font: rec.get('font')};
this.cmbBulletFormat.on('selected', _.bind(function (combo, record) { this.cmbBulletFormat.on('selected', _.bind(function (combo, record) {
if (this._changedProps) { if (record.value === 1) {
if (record.value === 1) { var me = this,
var me = this, props = me.bulletProps,
props = me.bulletProps, handler = function(dlg, result, settings) {
handler = function(dlg, result, settings) { if (result == 'ok') {
if (result == 'ok') { props.changed = true;
props.changed = true; props.code = settings.code;
props.code = settings.code; props.font = settings.font;
props.font = settings.font; props.symbol = settings.symbol;
props.symbol = settings.symbol; if (me._changedProps) {
if (me._changedProps) { me._changedProps.asc_putFont(props.font);
me._changedProps.asc_putFont(props.font); me._changedProps.asc_putSymbol(props.symbol);
me._changedProps.asc_putSymbol(props.symbol);
}
} }
var store = combo.store; }
if (!store.findWhere({value: 0, symbol: props.symbol, font: props.font})) var store = combo.store;
store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: props.symbol, font: props.font }, {at: store.length-1}); if (!store.findWhere({value: 0, symbol: props.symbol, font: props.font}))
combo.setData(store.models); store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: props.symbol, font: props.font }, {at: store.length-1});
combo.selectRecord(combo.store.findWhere({value: 0, symbol: props.symbol, font: props.font})); combo.setData(store.models);
}, combo.selectRecord(combo.store.findWhere({value: 0, symbol: props.symbol, font: props.font}));
win = new Common.Views.SymbolTableDialog({ },
api: me.options.api, win = new Common.Views.SymbolTableDialog({
lang: me.options.interfaceLang, api: me.options.api,
modal: true, lang: me.options.interfaceLang,
type: 0, modal: true,
font: props.font, type: 0,
symbol: props.symbol, font: props.font,
handler: handler symbol: props.symbol,
}); handler: handler
win.show(); });
win.on('symbol:dblclick', handler); win.show();
} else if (record.value == -1) { win.on('symbol:dblclick', handler);
} else if (record.value == -1) {
if (this._changedProps)
this._changedProps.asc_putListType(0, record.value); this._changedProps.asc_putListType(0, record.value);
} else { } else {
this.bulletProps.changed = true; this.bulletProps.changed = true;
this.bulletProps.code = record.code; this.bulletProps.code = record.code;
this.bulletProps.font = record.font; this.bulletProps.font = record.font;
this.bulletProps.symbol = record.symbol; this.bulletProps.symbol = record.symbol;
if (this._changedProps) { if (this._changedProps) {
this._changedProps.asc_putFont(this.bulletProps.font); this._changedProps.asc_putFont(this.bulletProps.font);
this._changedProps.asc_putSymbol(this.bulletProps.symbol); this._changedProps.asc_putSymbol(this.bulletProps.symbol);
}
} }
} }
}, this)); }, this));