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

[DE] Change watermark button

Browse source
This commit is contained in:
Julia Radzhabova 2019-06-18 12:35:01 +03:00
parent 23c85be00e
commit 1fcc5190e5
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1906,9 +1906,10 @@ define([
onWatermarkSelect: function(menu, item) { onWatermarkSelect: function(menu, item) {
if (this.api) { if (this.api) {
if (item.value == 'add') { if (item.value == 'remove')
this.api.asc_WatermarkRemove();
else {
var me = this; var me = this;
if (_.isUndefined(me.fontstore)) { if (_.isUndefined(me.fontstore)) {
me.fontstore = new Common.Collections.Fonts(); me.fontstore = new Common.Collections.Fonts();
var fonts = me.toolbar.cmbFontName.store.toJSON(); var fonts = me.toolbar.cmbFontName.store.toJSON();
@ -1932,9 +1933,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} }
})).show(); })).show();
} else if (item.value == 'remove') }
this.api.asc_WatermarkRemove();
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Edit ' + item.value); Common.component.Analytics.trackEvent('ToolBar', 'Edit ' + item.value);
} }

13
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1024,13 +1024,9 @@ define([
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
{ {
caption: this.textAddWatermark, caption: this.textEditWatermark,
value: 'add' value: 'edit'
}, },
// {
// caption: this.textEditWatermark,
// value: 'add'
// },
{ {
caption: this.textRemWatermark, caption: this.textRemWatermark,
value: 'remove' value: 'remove'
@ -2461,10 +2457,9 @@ define([
txtMarginAlign: 'Align to Margin', txtMarginAlign: 'Align to Margin',
txtObjectsAlign: 'Align Selected Objects', txtObjectsAlign: 'Align Selected Objects',
capBtnWatermark: 'Watermark', capBtnWatermark: 'Watermark',
textAddWatermark: 'Add Watermark', textEditWatermark: 'Settings',
textEditWatermark: 'Edit Watermark',
textRemWatermark: 'Remove Watermark', textRemWatermark: 'Remove Watermark',
tipWatermark: 'Insert watermark' tipWatermark: 'Edit watermark'
} }
})(), DE.Views.Toolbar || {})); })(), DE.Views.Toolbar || {}));
}); });

1
apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
View file

@ -336,7 +336,6 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
}) })
}); });
this.btnTextColor.render($('#watermark-textcolor')); this.btnTextColor.render($('#watermark-textcolor'));
// this.btnTextColor.on('click', _.bind(this.onTextColor, this));
this.mnuTextColorPicker = initNewColor(this.btnTextColor, "#watermark-menu-textcolor"); this.mnuTextColorPicker = initNewColor(this.btnTextColor, "#watermark-menu-textcolor");
$('#watermark-auto-color').on('click', _.bind(this.onAutoColor, this)); $('#watermark-auto-color').on('click', _.bind(this.onAutoColor, this));
this.textControls.push(this.btnTextColor); this.textControls.push(this.btnTextColor);