pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 06:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] Fix Bug 42323

Browse Source
This commit is contained in:
Julia Radzhabova
2019-08-09 09:55:44 +03:00
parent 7dafac9d33
commit 730620bf94
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
View File

@ -464,7 +464,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
data.push({value: item});
});
this.cmbText.setData(data);
this.cmbText.setValue(data[0].value);
(data.length>0) && this.cmbText.setValue(data[0].value);
},
insertFromUrl: function() {

14
build/documenteditor.json
View File

@ -145,6 +145,12 @@
"cwd": "../apps/documenteditor/main/locale/",
"src": "*",
"dest": "../deploy/web-apps/apps/documenteditor/main/locale/"
},
{
"expand": true,
"cwd": "../apps/documenteditor/main/resources/watermark",
"src": "*",
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/watermark"
}
],
"help": [
@ -389,10 +395,10 @@
"copy": {
"localization": [
{
"expand": true,
"cwd": "../apps/documenteditor/embed/locale/",
"src": "*",
"dest": "../deploy/web-apps/apps/documenteditor/embed/locale/"
"expand": true,
"cwd": "../apps/documenteditor/embed/locale/",
"src": "*",
"dest": "../deploy/web-apps/apps/documenteditor/embed/locale/"
}
],
"index-page": {