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

[PE] Draw preview for image bullets

Browse source
This commit is contained in:
Julia Radzhabova 2022-04-11 23:08:36 +03:00
parent dd95cc20eb
commit ff3081bb91
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,7 +197,9 @@ define([
[ [
'<% _.each(items, function(item) { %>', '<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">', '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
'<%= item.displayValue %><% if (item.value === 0) { %><span style="font-family:<%=item.font%>;"><%=item.symbol%></span><% } %>', '<%= item.displayValue %>',
'<% if (item.value === 0) { %><span style="font-family:<%=item.font%>;"><%=item.symbol%></span>',
'<% } else if (item.value === 2) { %><span id="id-dlg-list-bullet-image-preview" style="width:12px; height: 12px; margin-left: 5px; display: inline-block; vertical-align: middle;"></span><% } %>',
'</a></li>', '</a></li>',
'<% }); %>' '<% }); %>'
]; ];
@ -236,9 +238,12 @@ define([
if (record) { if (record) {
if (record.get('value')===_BulletTypes.symbol) if (record.get('value')===_BulletTypes.symbol)
formcontrol[0].innerHTML = record.get('displayValue') + '<span style="font-family:' + (record.get('font') || 'Arial') + '">' + record.get('symbol') + '</span>'; formcontrol[0].innerHTML = record.get('displayValue') + '<span style="font-family:' + (record.get('font') || 'Arial') + '">' + record.get('symbol') + '</span>';
else if (record.get('value')===_BulletTypes.image) else if (record.get('value')===_BulletTypes.image) {
formcontrol[0].innerHTML = me.txtImage; formcontrol[0].innerHTML = record.get('displayValue') + '<span id="id-dlg-list-bullet-combo-preview" style="width:12px; height: 12px; margin-left: 5px; display: inline-block; vertical-align: middle;"></span>';
else if (record.get('value')===_BulletTypes.newImage) var bullet = new Asc.asc_CBullet();
bullet.asc_fillBulletImage(me.imageProps.id);
bullet.drawSquareImage('id-dlg-list-bullet-combo-preview');
} else if (record.get('value')===_BulletTypes.newImage)
formcontrol[0].innerHTML = me.txtImage; formcontrol[0].innerHTML = me.txtImage;
else else
formcontrol[0].innerHTML = record.get('displayValue'); formcontrol[0].innerHTML = record.get('displayValue');
@ -306,6 +311,7 @@ define([
} }
this.btnOk.setDisabled(record.value === _BulletTypes.newImage); this.btnOk.setDisabled(record.value === _BulletTypes.newImage);
}, this)); }, this));
this.cmbBulletFormat.on('show:after', _.bind(this.onBulletFormatOpen, this));
this.spnSize = new Common.UI.MetricSpinner({ this.spnSize = new Common.UI.MetricSpinner({
el : $window.find('#id-dlg-list-size'), el : $window.find('#id-dlg-list-size'),
@ -391,14 +397,14 @@ define([
var me = this; var me = this;
var onApiImageLoaded = function(bullet) { var onApiImageLoaded = function(bullet) {
me.imageProps = {id: bullet.asc_getImageId()}; me.imageProps = {id: bullet.asc_getImageId(), redraw: true};
if (me._changedProps) if (me._changedProps)
me._changedProps.asc_fillBulletImage(me.imageProps.id); me._changedProps.asc_fillBulletImage(me.imageProps.id);
// add or update record for image to btnBulletFormat and select it // add or update record for image to btnBulletFormat and select it
var store = me.cmbBulletFormat.store; var store = me.cmbBulletFormat.store;
if (!store.findWhere({value: _BulletTypes.image})) { if (!store.findWhere({value: _BulletTypes.image})) {
var idx = store.indexOf(store.findWhere({value: _BulletTypes.newSymbol})); var idx = store.indexOf(store.findWhere({value: _BulletTypes.newSymbol}));
store.add({ displayValue: me.txtImage, value: _BulletTypes.image }, {at: idx}); store.add({ displayValue: me.txtImage + ':', value: _BulletTypes.image }, {at: idx});
} }
me.cmbBulletFormat.setData(store.models); me.cmbBulletFormat.setData(store.models);
me.cmbBulletFormat.selectRecord(me.cmbBulletFormat.store.findWhere({value: _BulletTypes.image})); me.cmbBulletFormat.selectRecord(me.cmbBulletFormat.store.findWhere({value: _BulletTypes.image}));
@ -419,6 +425,17 @@ define([
}); });
}, },
onBulletFormatOpen: function(combo) {
var store = combo.store,
rec = store.findWhere({value: _BulletTypes.image});
if (rec && this.imageProps.redraw) {
var bullet = new Asc.asc_CBullet();
bullet.asc_fillBulletImage(this.imageProps.id);
bullet.drawSquareImage('id-dlg-list-bullet-image-preview');
this.imageProps.redraw = false;
}
},
updateThemeColors: function() { updateThemeColors: function() {
this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
}, },
@ -549,9 +566,9 @@ define([
this._changedProps = bullet; this._changedProps = bullet;
type = 0; type = 0;
} else if (this.originalType == AscFormat.BULLET_TYPE_BULLET_BLIP) { } else if (this.originalType == AscFormat.BULLET_TYPE_BULLET_BLIP) {
this.imageProps = {id: bullet.asc_getImageId()}; this.imageProps = {id: bullet.asc_getImageId(), redraw: true};
if (!this.cmbBulletFormat.store.findWhere({value: _BulletTypes.image})) if (!this.cmbBulletFormat.store.findWhere({value: _BulletTypes.image}))
this.cmbBulletFormat.store.add({ displayValue: this.txtImage, value: _BulletTypes.image}, {at: this.cmbBulletFormat.store.length-2}); this.cmbBulletFormat.store.add({ displayValue: this.txtImage + ':', value: _BulletTypes.image}, {at: this.cmbBulletFormat.store.length-2});
this.cmbBulletFormat.setData(this.cmbBulletFormat.store.models); this.cmbBulletFormat.setData(this.cmbBulletFormat.store.models);
this.cmbBulletFormat.selectRecord(this.cmbBulletFormat.store.findWhere({value: _BulletTypes.image})); this.cmbBulletFormat.selectRecord(this.cmbBulletFormat.store.findWhere({value: _BulletTypes.image}));
this._changedProps = bullet; this._changedProps = bullet;