Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Change list settings

Browse source
This commit is contained in:
Julia Radzhabova 2020-06-25 13:41:37 +03:00
parent bf057320ea
commit 8013708f03
2 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
apps/common/main/lib/view/ListSettingsDialog.js
View file

@ -170,10 +170,10 @@ define([
this.cmbNumFormat.on('selected', _.bind(function (combo, record) { this.cmbNumFormat.on('selected', _.bind(function (combo, record) {
if (this._changedProps) { if (this._changedProps) {
if (record.value == -1) { if (record.value == -1) {
// this._changedProps.put_ListType(-1); this._changedProps.asc_putSymbol(undefined);
} else { } else {
// this._changedProps.put_ListType(1); this._changedProps.asc_putSymbol(undefined);
// this._changedProps.put_ListSubType(record.value); this._changedProps.asc_putAutoNumType(record.value);
} }
} }
}, this)); }, this));
@ -204,13 +204,13 @@ define([
itemsTemplate: _.template(itemsTemplate.join('')), itemsTemplate: _.template(itemsTemplate.join('')),
data : [ data : [
{ displayValue: this.txtNone, value: -1 }, { displayValue: this.txtNone, value: -1 },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "·", font: 'Symbol' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "•", font: 'Arial' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "o", font: 'Courier New' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "o", font: 'Courier New' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "§", font: 'Wingdings' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "§", font: 'Wingdings' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "v", font: 'Wingdings' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "v", font: 'Wingdings' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "Ø", font: 'Wingdings' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "Ø", font: 'Wingdings' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "ü", font: 'Wingdings' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "ü", font: 'Wingdings' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "¨", font: 'Symbol' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "w", font: 'Wingdings' },
{ displayValue: this.txtSymbol + ': ', value: 0, symbol: "–", font: 'Arial' }, { displayValue: this.txtSymbol + ': ', value: 0, symbol: "–", font: 'Arial' },
{ displayValue: this.txtNewBullet, value: 1 } { displayValue: this.txtNewBullet, value: 1 }
], ],
@ -232,21 +232,20 @@ define([
props = me.bulletProps, props = me.bulletProps,
handler = function(dlg, result, settings) { handler = function(dlg, result, settings) {
if (result == 'ok') { if (result == 'ok') {
var store = combo.store;
if (!store.findWhere({value: 0, symbol: settings.symbol, font: settings.font}))
store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: settings.symbol, font: settings.font }, {at: store.length-1});
combo.setData(store.models);
combo.selectRecord(combo.store.findWhere({value: 0, symbol: settings.symbol, font: settings.font}));
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_putBulletFont(props.font); me._changedProps.asc_putFont(props.font);
me._changedProps.asc_putBulletSymbol(props.symbol); me._changedProps.asc_putSymbol(props.symbol);
} }
} }
var store = combo.store;
if (!store.findWhere({value: 0, symbol: props.symbol, font: props.font}))
store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: props.symbol, font: props.font }, {at: store.length-1});
combo.setData(store.models);
combo.selectRecord(combo.store.findWhere({value: 0, symbol: props.symbol, font: props.font}));
}, },
win = new Common.Views.SymbolTableDialog({ win = new Common.Views.SymbolTableDialog({
api: me.options.api, api: me.options.api,
@ -259,18 +258,16 @@ define([
}); });
win.show(); win.show();
win.on('symbol:dblclick', handler); win.on('symbol:dblclick', handler);
} if (record.value == -1) { } else if (record.value == -1) {
// this._changedProps.put_ListType(-1); this._changedProps.asc_putSymbol(undefined);
} else { } else {
// this._changedProps.put_ListType(0);
// this._changedProps.put_ListSubType(record.value);
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_putBulletFont(this.bulletProps.font); this._changedProps.asc_putFont(this.bulletProps.font);
this._changedProps.asc_putBulletSymbol(this.bulletProps.symbol); this._changedProps.asc_putSymbol(this.bulletProps.symbol);
} }
} }
} }
@ -287,7 +284,7 @@ define([
allowDecimal: false allowDecimal: false
}).on('change', function(field, newValue, oldValue, eOpts){ }).on('change', function(field, newValue, oldValue, eOpts){
if (me._changedProps) { if (me._changedProps) {
me._changedProps.asc_putBulletSize(field.getNumberValue()); me._changedProps.asc_putSize(field.getNumberValue());
} }
}); });
@ -310,7 +307,7 @@ define([
allowDecimal: false allowDecimal: false
}).on('change', function(field, newValue, oldValue, eOpts){ }).on('change', function(field, newValue, oldValue, eOpts){
if (me._changedProps) { if (me._changedProps) {
me._changedProps.put_NumStartAt(field.getNumberValue()); me._changedProps.asc_putNumStartAt(field.getNumberValue());
} }
}); });
@ -333,7 +330,7 @@ define([
onColorsSelect: function(btn, color) { onColorsSelect: function(btn, color) {
if (this._changedProps) { if (this._changedProps) {
this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color)); this._changedProps.asc_putColor(Common.Utils.ThemeColor.getRgbColor(color));
} }
}, },
@ -342,23 +339,22 @@ define([
if (this._changedProps) { if (this._changedProps) {
if (type==0) {//markers if (type==0) {//markers
if (this.cmbBulletFormat.getValue()==-1) { if (this.cmbBulletFormat.getValue()==-1) {
// this._changedProps.asc_putType(-1); this._changedProps.asc_putSymbol(undefined);
} else { } else {
this._changedProps.asc_putBulletFont(this.bulletProps.font); this._changedProps.asc_putFont(this.bulletProps.font);
this._changedProps.asc_putBulletSymbol(this.bulletProps.symbol); this._changedProps.asc_putSymbol(this.bulletProps.symbol);
} }
// this._changedProps.asc_putType(0);
// this._changedProps.asc_putSubType(0);
} else { } else {
var value = this.cmbNumFormat.getValue(); var value = this.cmbNumFormat.getValue();
if (value==-1) { if (value==-1) {
// this._changedProps.asc_putType(-1); this._changedProps.asc_putSymbol(undefined);
} else { } else {
// this._changedProps.asc_putType(1); this._changedProps.asc_putSymbol(undefined);
// this._changedProps.asc_putSubType(value); this._changedProps.asc_putAutoNumType(value);
} }
} }
} }
this.type = type;
}, },
ShowHideElem: function(value) { ShowHideElem: function(value) {
@ -369,7 +365,8 @@ define([
_handleInput: function(state) { _handleInput: function(state) {
if (this.options.handler) { if (this.options.handler) {
this.options.handler.call(this, state, this._changedProps); var listtype = (this.type==0) ? this.cmbBulletFormat.getValue() : this.cmbNumFormat.getValue();
this.options.handler.call(this, state, (listtype==-1) ? null : this._changedProps);
} }
this.close(); this.close();
}, },
@ -388,8 +385,11 @@ define([
(this.type == 0) ? this.btnBullet.toggle(true) : this.btnNumbering.toggle(true); (this.type == 0) ? this.btnBullet.toggle(true) : this.btnNumbering.toggle(true);
this.ShowHideElem(this.type); this.ShowHideElem(this.type);
this.spnSize.setValue(props.asc_getBulletSize() || '', true); var bullet = props.asc_getBullet();
var color = props.asc_getBulletColor(); if (bullet) {
this.spnSize.setValue(bullet.asc_getSize() || '', true);
var color = bullet.asc_getColor();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()}; color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()};
@ -412,25 +412,29 @@ define([
} else } else
this.colors.select(color,true); this.colors.select(color,true);
if (this.type==0) { var symbol = bullet.asc_getSymbol();
this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()}; if (symbol===undefined) { // numbered
if (!this.cmbBulletFormat.store.findWhere({value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font}))
this.cmbBulletFormat.store.add({ displayValue: this.txtSymbol + ': ', value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font }, {at: this.cmbBulletFormat.store.length-1});
this.cmbBulletFormat.setData(this.cmbBulletFormat.store.models);
this.cmbBulletFormat.selectRecord(this.cmbBulletFormat.store.findWhere({value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font}));
this.cmbNumFormat.setValue(1);
} else {
this.cmbNumFormat.setValue(this.subtype, ''); this.cmbNumFormat.setValue(this.subtype, '');
var rec = this.cmbBulletFormat.store.at(1); var rec = this.cmbBulletFormat.store.at(1);
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')};
var value = props.get_NumStartAt(); var value = bullet.asc_getNumStartAt();
this.spnStart.setValue(value || '', true); this.spnStart.setValue(value || '', true);
this.spnStart.setDisabled(value===null); this.spnStart.setDisabled(value===null);
} else {
this.bulletProps = {symbol: symbol, font: bullet.asc_getFont()};
if (!this.cmbBulletFormat.store.findWhere({value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font}))
this.cmbBulletFormat.store.add({ displayValue: this.txtSymbol + ': ', value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font }, {at: this.cmbBulletFormat.store.length-1});
this.cmbBulletFormat.setData(this.cmbBulletFormat.store.models);
this.cmbBulletFormat.selectRecord(this.cmbBulletFormat.store.findWhere({value: 0, symbol: this.bulletProps.symbol, font: this.bulletProps.font}));
this.cmbNumFormat.setValue(1);
}
this._changedProps = bullet;
} }
} }
this._changedProps = new Asc.asc_CParagraphProperty(); if (!this._changedProps)
this._changedProps = new Asc.asc_CBullet();
}, },
txtTitle: 'List Settings', txtTitle: 'List Settings',

7
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -783,7 +783,12 @@ define([
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
me.api.asc_setGraphicObjectProps(value); if (value==-1)
me.api.asc_setListType(-1);
else {
props.asc_putBullet(value);
me.api.asc_setGraphicObjectProps(props);
}
} }
} }
Common.NotificationCenter.trigger('edit:complete', me.documentHolder); Common.NotificationCenter.trigger('edit:complete', me.documentHolder);