diff --git a/apps/api/documents/index.html b/apps/api/documents/index.html deleted file mode 100644 index 82fbc7009..000000000 --- a/apps/api/documents/index.html +++ /dev/null @@ -1,346 +0,0 @@ - - - - ONLYOFFICE Documents - - - - - - - - - - - - -
-
-
- - - - - diff --git a/apps/api/documents/index.html.desktop b/apps/api/documents/index.html.desktop index 28857deae..d95b31995 100644 --- a/apps/api/documents/index.html.desktop +++ b/apps/api/documents/index.html.desktop @@ -58,6 +58,7 @@ editorConfig: cfg, events: { onInternalMessage: onInternalMessage, + onRequestClose: e => {return 0;} } }); diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index fd5ae4b4c..4da882dec 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -70,6 +70,11 @@ define([ } return false; + }, + requestClose: function () { + if ( config.isDesktopApp && !!app ) { + app.execCommand('editor:request', JSON.stringify({action:'close', url: config.customization.goback.url})); + } } }; }; diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 0953bc8da..b8d34a50a 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -63,7 +63,7 @@ define([ var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption}; me.$toolbarPanelPlugins = me.panelPlugins.getPanel(); - toolbar.addTab(tab, me.$toolbarPanelPlugins, 4); // TODO: clear plugins list in left panel + toolbar.addTab(tab, me.$toolbarPanelPlugins, 10); // TODO: clear plugins list in left panel } } }, diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js index c252cc06d..aa3441540 100644 --- a/apps/common/main/lib/view/About.js +++ b/apps/common/main/lib/view/About.js @@ -61,7 +61,7 @@ define([ this.template = _.template([ '', '', - '', + '', '', '', '', @@ -77,7 +77,7 @@ define([ '', '', '', '', @@ -247,7 +247,6 @@ define([ txtLicensor: 'LICENSOR', txtLicensee: 'LICENSEE', txtAddress: 'address: ', - txtAscAddress: 'Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021', txtMail: 'email: ', txtTel: 'tel.: ', txtEdition: 'Integration Edition ' diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 902906dca..e8111d1cc 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -204,11 +204,12 @@ define([ if ( me.logo ) me.logo.children(0).on('click', function (e) { - var _url = !!me.branding && !!me.branding.logo && !!me.branding.logo.url ? - me.branding.logo.url : 'http://www.onlyoffice.com'; - - var newDocumentPage = window.open(_url); - newDocumentPage && newDocumentPage.focus(); + var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ? + me.branding.logo.url : 'https://www.onlyoffice.com'; + if (_url) { + var newDocumentPage = window.open(_url); + newDocumentPage && newDocumentPage.focus(); + } }); onResetUsers(storeUsers); @@ -412,6 +413,7 @@ define([ if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) { this.logo.html(''); this.logo.css({'background-image': 'none', width: 'auto'}); + (this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link'); } return $html; @@ -522,6 +524,7 @@ define([ if (element) { element.html(''); element.css({'background-image': 'none', width: 'auto'}); + (value.logo.url || value.logo.url===undefined) && element.addClass('link'); } } } diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index c9fa28635..4973dae04 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -109,7 +109,8 @@ define([ if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true}); this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this)); - this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]); + var langname = Common.util.LanguageInfo.getLocalLanguageName(this.options.current); + this.cmbLanguage.setValue(langname[0], langname[1]); this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord()); }, @@ -133,7 +134,7 @@ define([ plang = icon.attr('lang'); if (plang) icon.removeClass(plang); - icon.addClass(rec.value).attr('lang',rec.value); + rec && icon.addClass(rec.value).attr('lang',rec.value); }, onPrimary: function() { diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index c0ec153b8..b1b2d6ed9 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -2,13 +2,16 @@ .asc-about-office { background-repeat: no-repeat; margin-bottom: 5px; - content: data-uri('@{common-image-path}/about/logo.png'); - @media - only screen and (-webkit-min-device-pixel-ratio: 2), - only screen and (min-resolution: 2dppx), - only screen and (min-resolution: 192dpi) { - content: data-uri('@{common-image-path}/about/logo@2x.png'); + &:before { + content: data-uri('@{common-image-path}/about/logo.png'); + + @media + only screen and (-webkit-min-device-pixel-ratio: 2), + only screen and (min-resolution: 2dppx), + only screen and (min-resolution: 192dpi) { + content: data-uri('@{common-image-path}/about/logo@2x.png'); + } } } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 0c5e69d4f..d30ba6bc9 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -144,7 +144,7 @@ .background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px); } - img { + &.link img { cursor: pointer; } } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index aa863cb93..e5f8ba57c 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1068,7 +1068,7 @@ define([ var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; - elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc); + elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, onEditorPermissions: function(params) { @@ -1932,8 +1932,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } }); @@ -2094,7 +2096,8 @@ define([ var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = this.appOptions.isEdit; if (plugins) { - var arr = [], arrUI = []; + var arr = [], arrUI = [], + lang = this.appOptions.lang.split(/[\-\_]/)[0]; plugins.pluginsData.forEach(function(item){ if (_.find(arr, function(arritem) { return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); @@ -2111,8 +2114,12 @@ define([ visible && arrUI.push(item.baseUrl + itemVar.url); } else { var model = new Common.Models.PluginVariation(itemVar); + var description = itemVar.description; + if (typeof itemVar.descriptionLocale == 'object') + description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || ''; model.set({ + description: description, index: variationsArr.length, url: itemVar.url, icons: itemVar.icons, @@ -2123,9 +2130,13 @@ define([ } }); - if (variationsArr.length>0 && !item.isUICustomizer) + if (variationsArr.length>0 && !item.isUICustomizer) { + var name = item.name; + if (typeof item.nameLocale == 'object') + name = item.nameLocale[lang] || item.nameLocale['en'] || name || ''; + arr.push(new Common.Models.Plugin({ - name : item.name, + name : name, guid: item.guid, baseUrl : item.baseUrl, variations: variationsArr, @@ -2134,6 +2145,7 @@ define([ groupName: (item.group) ? item.group.name : '', groupRank: (item.group) ? item.group.rank : 0 })); + } }); if ( uiCustomize!==false ) // from ui customizer in editor config or desktop event diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6a226d369..7ff5d36d5 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1141,6 +1141,7 @@ define([ onFontNameSelect: function(combo, record) { if (this.api) { if (record.isNewFont) { + !this.getApplication().getController('Main').isModalShowed && Common.UI.warning({ width: 500, closable: false, diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 438cf3cee..586e90ff2 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -614,6 +614,7 @@ define([ var coord = specialPasteShowOptions.asc_getCellCoord(), pasteContainer = me.cmpEl.find('#special-paste-container'), pasteItems = specialPasteShowOptions.asc_getOptions(); + if (!pasteItems) return; // Prepare menu container if (pasteContainer.length < 1) { @@ -772,13 +773,15 @@ define([ } if (props && props.get_Checked()===false && props.get_Variants() !== null && props.get_Variants() !== undefined) { me.addWordVariants(); - if (me.textMenu.isVisible()) { + if (me.textMenu && me.textMenu.isVisible()) { me.textMenu.alignPosition(); } } }; this.addWordVariants = function(isParagraph) { + if (!me.textMenu) return; + if (_.isUndefined(isParagraph)) { isParagraph = me.textMenu.isVisible(); } diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 4a8c3d828..bbc20d247 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -376,8 +376,10 @@ define([ onTransparencyChangeComplete: function(field, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = newValue; - this.api.setEndPointHistory(); - this._transparencyApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._transparencyApplyFunc(); + } this._sendUndoPoint = true; }, @@ -515,8 +517,10 @@ define([ onGradientChangeComplete: function(slider, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = true; - this.api.setEndPointHistory(); - this._gradientApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._gradientApplyFunc(); + } this._sendUndoPoint = true; }, diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index a457032aa..0378d8567 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -242,8 +242,10 @@ define([ onTransparencyChangeComplete: function(field, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = newValue; - this.api.setEndPointHistory(); - this._transparencyApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._transparencyApplyFunc(); + } this._sendUndoPoint = true; }, @@ -381,8 +383,10 @@ define([ onGradientChangeComplete: function(slider, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = true; - this.api.setEndPointHistory(); - this._gradientApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._gradientApplyFunc(); + } this._sendUndoPoint = true; }, diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index 2ba32dec8..d5ef8a425 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresa:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENCE", "Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE", "Common.Views.About.txtMail": "email:", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index b19eebeb4..428f332b3 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "Adresse:", - "Common.Views.About.txtAscAddress": "Lubanas St. 125a-25, Riga, Lettland, EU, LV-1021", "Common.Views.About.txtLicensee": "LIZENZNEHMER", "Common.Views.About.txtLicensor": "LIZENZGEBER", "Common.Views.About.txtMail": "E-Mail-Adresse: ", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 55e911385..1057bfdac 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email: ", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index fea6c1f88..7d319452f 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "dirección: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021", "Common.Views.About.txtLicensee": "LICENCIATARIO ", "Common.Views.About.txtLicensor": "LICENCIANTE", "Common.Views.About.txtMail": "email: ", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 3c7b2bf4c..4bd3e11d8 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresse: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021", "Common.Views.About.txtLicensee": "CESSIONNAIRE", "Common.Views.About.txtLicensor": "CONCÉDANT", "Common.Views.About.txtMail": "émail: ", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index b3a9fea0a..2f42e7f99 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "indirizzo: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021", "Common.Views.About.txtLicensee": "LICENZIATARIO", "Common.Views.About.txtLicensor": "CONCEDENTE", "Common.Views.About.txtMail": "email: ", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 917f44e6b..17b27086e 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -99,7 +99,6 @@ "Common.Utils.Metric.txtCm": "センチ", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "アドレス：", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "ライセンシー", "Common.Views.About.txtLicensor": "ライセンサー\t", "Common.Views.About.txtMail": "メール", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index 2a188425e..b0fadf74a 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "주소 :", - "Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email :", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index 932147c3c..70c462ec5 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email: ", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index fc34c10f6..535071ddd 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENTIEHOUDER", "Common.Views.About.txtLicensor": "LICENTIEVERLENER", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index 293a751bf..cfc81a78b 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENCJOBIORCA", "Common.Views.About.txtLicensor": "LICENCJODAWCA", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index 5736fcd7e..00913c107 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "Pt", "Common.Views.About.txtAddress": "endereço:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENÇA", "Common.Views.About.txtLicensor": "LICENCIANTE", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 403ad9f14..adc677276 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "пт", "Common.Views.About.txtAddress": "адрес: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ", "Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР", "Common.Views.About.txtMail": "email: ", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index 339778760..5ce6235a9 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresa:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021", "Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE", "Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE", "Common.Views.About.txtMail": "e-mail: ", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 6964a8ac3..d28573bbb 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -96,7 +96,6 @@ "Common.UI.Window.textWarning": "Opozorilo", "Common.UI.Window.yesButtonText": "Da", "Common.Views.About.txtAddress": "naslov:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENCE", "Common.Views.About.txtLicensor": "DAJALEC LICENCE", "Common.Views.About.txtMail": "e-naslov:", diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index 1239175b4..7b549f46e 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021", "Common.Views.About.txtLicensee": "LİSANS SAHİBİ", "Common.Views.About.txtLicensor": "LİSANS VEREN", "Common.Views.About.txtMail": "eposta:", diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index ad7a9b809..dfe43de93 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "Пт", "Common.Views.About.txtAddress": "адреса:", - "Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021", "Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ", "Common.Views.About.txtLicensor": "Ліцензіар", "Common.Views.About.txtMail": "пошта:", diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index b4ca361ef..660159a1b 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "địa chỉ:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP", "Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP", "Common.Views.About.txtMail": "email:", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index ecc0155db..c49869d7f 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -101,7 +101,6 @@ "Common.Utils.Metric.txtCm": "厘米", "Common.Utils.Metric.txtPt": "像素", "Common.Views.About.txtAddress": "地址：", - "Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021", "Common.Views.About.txtLicensee": "被许可人", "Common.Views.About.txtLicensor": "许可", "Common.Views.About.txtMail": "电子邮件：", diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 218a43a36..0fc02ac04 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -426,7 +426,7 @@

Ascensio System SIA

-

Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021

+

20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050

support@onlyoffice.com

+371 660-16425

www.onlyoffice.com

diff --git a/apps/presentationeditor/main/app.reporter.js b/apps/presentationeditor/main/app.reporter.js index 2039fc2e3..9e1b81d9a 100644 --- a/apps/presentationeditor/main/app.reporter.js +++ b/apps/presentationeditor/main/app.reporter.js @@ -107,7 +107,7 @@ require([ docInfo.put_VKey(data.vkey); docInfo.put_Options(data.options); docInfo.put_Token(data.token); - docInfo.put_Permissions( data.permissions); + docInfo.put_Permissions(data.permissions || {}); window.document.title = 'Presenter View' + (data.title ? (' - ' + data.title) : ''); } diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index bf447c4cf..b0ac25ed6 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -841,7 +841,7 @@ define([ var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; - elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc); + elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, onEditorPermissions: function(params) { @@ -1776,8 +1776,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } }); @@ -1841,7 +1843,8 @@ define([ var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = this.appOptions.isEdit; if (plugins) { - var arr = [], arrUI = []; + var arr = [], arrUI = [], + lang = this.appOptions.lang.split(/[\-\_]/)[0]; plugins.pluginsData.forEach(function(item){ if (_.find(arr, function(arritem) { return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); @@ -1858,8 +1861,12 @@ define([ visible && arrUI.push(item.baseUrl + itemVar.url); } else { var model = new Common.Models.PluginVariation(itemVar); + var description = itemVar.description; + if (typeof itemVar.descriptionLocale == 'object') + description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || ''; model.set({ + description: description, index: variationsArr.length, url: itemVar.url, icons: itemVar.icons, @@ -1869,9 +1876,13 @@ define([ variationsArr.push(model); } }); - if (variationsArr.length>0 && !item.isUICustomizer) + if (variationsArr.length>0 && !item.isUICustomizer) { + var name = item.name; + if (typeof item.nameLocale == 'object') + name = item.nameLocale[lang] || item.nameLocale['en'] || name || ''; + arr.push(new Common.Models.Plugin({ - name : item.name, + name : name, guid: item.guid, baseUrl : item.baseUrl, variations: variationsArr, @@ -1880,6 +1891,7 @@ define([ groupName: (item.group) ? item.group.name : '', groupRank: (item.group) ? item.group.rank : 0 })); + } }); if (uiCustomize!==false) // from ui customizer in editor config or desktop event diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index d0e994dfd..9f72e073b 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -258,7 +258,6 @@ define([ toolbar.btnPrint.on('click', _.bind(this.onPrint, this)); toolbar.btnPrint.on('disabled', _.bind(this.onBtnChangeState, this, 'print:disabled')); toolbar.btnSave.on('click', _.bind(this.onSave, this)); - toolbar.btnSave.on('disabled', _.bind(this.onBtnChangeState, this, 'save:disabled')); toolbar.btnUndo.on('click', _.bind(this.onUndo, this)); toolbar.btnUndo.on('disabled', _.bind(this.onBtnChangeState, this, 'undo:disabled')); toolbar.btnRedo.on('click', _.bind(this.onRedo, this)); @@ -1085,6 +1084,7 @@ define([ onFontNameSelect: function(combo, record) { if (this.api) { if (record.isNewFont) { + !this.getApplication().getController('Main').isModalShowed && Common.UI.warning({ width: 500, closable: false, @@ -2017,6 +2017,7 @@ define([ if ( $panel ) me.toolbar.addTab(tab, $panel, 3); + me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); if ( config.isDesktopApp ) { // hide 'print' and 'save' buttons group and next separator me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index b8b8aba62..34c6dac5a 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -724,13 +724,15 @@ define([ } if (props && props.get_Checked()===false && props.get_Variants() !== null && props.get_Variants() !== undefined) { me.addWordVariants(); - if (me.textMenu.isVisible()) { + if (me.textMenu && me.textMenu.isVisible()) { me.textMenu.alignPosition(); } } }; this.addWordVariants = function(isParagraph) { + if (!me.textMenu) return; + if (_.isUndefined(isParagraph)) { isParagraph = me.textMenu.isVisible(); } @@ -1506,6 +1508,7 @@ define([ var coord = specialPasteShowOptions.asc_getCellCoord(), pasteContainer = me.cmpEl.find('#special-paste-container'), pasteItems = specialPasteShowOptions.asc_getOptions(); + if (!pasteItems) return; // Prepare menu container if (pasteContainer.length < 1) { diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 9d1e60cb9..b8d00c8fe 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -361,8 +361,10 @@ define([ onTransparencyChangeComplete: function(field, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = newValue; - this.api.setEndPointHistory(); - this._transparencyApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._transparencyApplyFunc(); + } this._sendUndoPoint = true; }, @@ -496,8 +498,10 @@ define([ onGradientChangeComplete: function(slider, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = true; - this.api.setEndPointHistory(); - this._gradientApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._gradientApplyFunc(); + } this._sendUndoPoint = true; }, diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 91a6b76dc..e4b639db5 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -572,8 +572,10 @@ define([ onGradientChangeComplete: function(slider, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = true; - this.api.setEndPointHistory(); - this._gradientApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._gradientApplyFunc(); + } this._sendUndoPoint = true; }, diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 64e9dfaf3..157c33695 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -363,8 +363,10 @@ define([ onTransparencyChangeComplete: function(field, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = newValue; - this.api.setEndPointHistory(); - this._transparencyApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._transparencyApplyFunc(); + } this._sendUndoPoint = true; }, @@ -502,8 +504,10 @@ define([ onGradientChangeComplete: function(slider, newValue, oldValue){ clearInterval(this.updateslider); this._sliderChanged = true; - this.api.setEndPointHistory(); - this._gradientApplyFunc(); + if (!this._sendUndoPoint) { // start point was added + this.api.setEndPointHistory(); + this._gradientApplyFunc(); + } this._sendUndoPoint = true; }, diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js index c113aff08..8b562eeee 100644 --- a/apps/presentationeditor/main/app_dev.reporter.js +++ b/apps/presentationeditor/main/app_dev.reporter.js @@ -108,7 +108,7 @@ require([ docInfo.put_VKey(data.vkey); docInfo.put_Options(data.options); docInfo.put_Token(data.token); - docInfo.put_Permissions( data.permissions); + docInfo.put_Permissions(data.permissions || {}); window.document.title = 'Presenter View' + (data.title ? (' - ' + data.title) : ''); } diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index fce1a0062..733687be8 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresa:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021", "Common.Views.About.txtLicensee": "DRŽITEL LICENCE", "Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE", "Common.Views.About.txtMail": "email:", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index 18d5ed354..fe309cedc 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "Adresse: ", - "Common.Views.About.txtAscAddress": "Lubanas St. 125a-25, Riga, Lettland, EU, LV-1021", "Common.Views.About.txtLicensee": "LIZENZNEHMER", "Common.Views.About.txtLicensor": "LIZENZGEBER", "Common.Views.About.txtMail": "E-Mail-Adresse: ", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index dcb168231..f2ea2fe01 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email: ", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 959516f90..48239f0d9 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "dirección: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021", "Common.Views.About.txtLicensee": "LICENCIATARIO ", "Common.Views.About.txtLicensor": "LICENCIANTE", "Common.Views.About.txtMail": "email: ", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 3e02770ec..ad560f61c 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresse: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021", "Common.Views.About.txtLicensee": "CESSIONNAIRE", "Common.Views.About.txtLicensor": "CONCÉDANT", "Common.Views.About.txtMail": "émail: ", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index b5f55cee2..b7678830c 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "indirizzo: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021", "Common.Views.About.txtLicensee": "LICENZIATARIO", "Common.Views.About.txtLicensor": "CONCEDENTE", "Common.Views.About.txtMail": "email: ", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index e4f2bc921..f3bfe79de 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -41,7 +41,6 @@ "Common.Utils.Metric.txtCm": "センチ", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "アドレス：", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "ライセンス", "Common.Views.About.txtLicensor": "ライセンサー", "Common.Views.About.txtMail": "メール：", diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index 3ae82df9b..9e6e2aaa7 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "주소 :", - "Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email :", diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index 6ccf9d94f..7e1eb99bd 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENSEE", "Common.Views.About.txtLicensor": "LICENSOR", "Common.Views.About.txtMail": "email: ", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index fb1804d0a..837ddccc5 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENTIEHOUDER", "Common.Views.About.txtLicensor": "LICENTIEVERLENER", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index d20794544..a376f794a 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENCJOBIORCA", "Common.Views.About.txtLicensor": "LICENCJODAWCA", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index c151ef2a2..62fc60cd7 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "Pt", "Common.Views.About.txtAddress": "endereço:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENÇA", "Common.Views.About.txtLicensor": "LICENCIANTE", "Common.Views.About.txtMail": "e-mail:", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index a118c1431..e533abfd9 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "пт", "Common.Views.About.txtAddress": "адрес: ", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ", "Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР", "Common.Views.About.txtMail": "email: ", diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 070e77234..4c7370330 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adresa:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021", "Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE", "Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE", "Common.Views.About.txtMail": "e-mail: ", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index 0a82297f3..a8e57af30 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -38,7 +38,6 @@ "Common.UI.Window.textWarning": "Opozorilo", "Common.UI.Window.yesButtonText": "Da", "Common.Views.About.txtAddress": "naslov:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021", "Common.Views.About.txtLicensee": "LICENCE", "Common.Views.About.txtLicensor": "DAJALEC LICENCE", "Common.Views.About.txtMail": "e-naslov:", diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index b954ad4c8..a49a113bc 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "adres:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021", "Common.Views.About.txtLicensee": "LİSANS SAHİBİ", "Common.Views.About.txtLicensor": "LİSANS VEREN", "Common.Views.About.txtMail": "Eposta:", diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index 62c2a2e16..947ca1671 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "Пт", "Common.Views.About.txtAddress": "адреса:", - "Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021", "Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ", "Common.Views.About.txtLicensor": "Ліцензіар", "Common.Views.About.txtMail": "пошта:", diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index 88b92520a..d4cd2a0f6 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "địa chỉ:", - "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021", "Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP", "Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP", "Common.Views.About.txtMail": "email:", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index a4815fc03..988529b8e 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -43,7 +43,6 @@ "Common.Utils.Metric.txtCm": "厘米", "Common.Utils.Metric.txtPt": "像素", "Common.Views.About.txtAddress": "地址：", - "Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021", "Common.Views.About.txtLicensee": "被许可人", "Common.Views.About.txtLicensor": "许可", "Common.Views.About.txtMail": "电子邮件：", diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index 147a0ea46..901a7fdf1 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -228,7 +228,7 @@

Ascensio System SIA

-

Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021

+

20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050

support@onlyoffice.com

+371 660-16425

www.onlyoffice.com

diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 97863f743..99b81167f 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1848,6 +1848,8 @@ define([ }, onFormulaCompleteMenu: function(funcarr) { + if (!this.documentHolder.funcMenu) return; + if (funcarr) { var me = this, documentHolderView = me.documentHolder, @@ -1958,6 +1960,7 @@ define([ coord = specialPasteShowOptions.asc_getCellCoord(), pasteContainer = documentHolderView.cmpEl.find('#special-paste-container'), pasteItems = specialPasteShowOptions.asc_getOptions(); + if (!pasteItems) return; // Prepare menu container if (pasteContainer.length < 1) { diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 9f190a9aa..fc6fa3302 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -353,6 +353,10 @@ define([ value = resolved = true; (value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); + value = Common.localStorage.getBool("sse-settings-r1c1"); + Common.Utils.InternalSettings.set("sse-settings-r1c1", value); + this.api.asc_setR1C1Mode(value); + if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) { value = Common.localStorage.getBool("sse-settings-coauthmode", true); Common.Utils.InternalSettings.set("sse-settings-coauthmode", value); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 230661f1d..6970308aa 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -331,6 +331,10 @@ define([ } if (value) this.api.asc_setLocalization(value); + value = Common.localStorage.getBool("sse-settings-r1c1"); + Common.Utils.InternalSettings.set("sse-settings-r1c1", value); + this.api.asc_setR1C1Mode(value); + if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); @@ -865,7 +869,7 @@ define([ var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; - elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc); + elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, onEditorPermissions: function(params) { @@ -1598,8 +1602,10 @@ define([ me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value)); me.loadMask && me.loadMask.show(); } - } else + } else { Common.Gateway.requestClose(); + Common.Controllers.Desktop.requestClose(); + } me._state.openDlg = null; } }); @@ -2027,7 +2033,8 @@ define([ var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = this.appOptions.isEdit; if (plugins) { - var arr = [], arrUI = []; + var arr = [], arrUI = [], + lang = this.appOptions.lang.split(/[\-\_]/)[0]; plugins.pluginsData.forEach(function(item){ if (_.find(arr, function(arritem) { return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); @@ -2044,8 +2051,12 @@ define([ visible && arrUI.push(item.baseUrl + itemVar.url); } else { var model = new Common.Models.PluginVariation(itemVar); + var description = itemVar.description; + if (typeof itemVar.descriptionLocale == 'object') + description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || ''; model.set({ + description: description, index: variationsArr.length, url: itemVar.url, icons: itemVar.icons, @@ -2055,9 +2066,13 @@ define([ variationsArr.push(model); } }); - if (variationsArr.length>0 && !item.isUICustomizer) + if (variationsArr.length>0 && !item.isUICustomizer) { + var name = item.name; + if (typeof item.nameLocale == 'object') + name = item.nameLocale[lang] || item.nameLocale['en'] || name || ''; + arr.push(new Common.Models.Plugin({ - name : item.name, + name : name, guid: item.guid, baseUrl : item.baseUrl, variations: variationsArr, @@ -2066,6 +2081,7 @@ define([ groupName: (item.group) ? item.group.name : '', groupRank: (item.group) ? item.group.rank : 0 })); + } }); if (uiCustomize!==false) // from ui customizer in editor config or desktop event diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 42faf095d..769fc7eb2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1310,6 +1310,7 @@ define([ onFontNameSelect: function(combo, record) { if (this.api) { if (record.isNewFont) { + !this.getApplication().getController('Main').isModalShowed && Common.UI.warning({ width: 500, closable: false, @@ -3100,7 +3101,7 @@ define([ tab = {action: 'pivot', caption: me.textPivot}; $panel = me.getApplication().getController('PivotTable').createToolbarPanel(); if ($panel) { - me.toolbar.addTab(tab, $panel, 4); + me.toolbar.addTab(tab, $panel, 3); me.toolbar.setVisible('pivot', true); } } @@ -3108,7 +3109,7 @@ define([ var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel(); if ( $panel ) - me.toolbar.addTab(tab, $panel, 5); + me.toolbar.addTab(tab, $panel, 4); if ( config.isDesktopApp ) { // hide 'print' and 'save' buttons group and next separator @@ -3125,7 +3126,7 @@ define([ tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) - me.toolbar.addTab(tab, $panel, 6); + me.toolbar.addTab(tab, $panel, 5); } } } diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index dc43fba82..788740324 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -983,6 +983,8 @@ define([ var win = new SSE.Views.CellRangeDialog({ handler: handlerDlg + }).on('close', function() { + me.api.asc_onCloseChartFrame(); }); win.show(); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 0805d486c..af8809b02 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -513,6 +513,10 @@ define([ '
', '', '','', + '', + '', + '', + '','', '', '', '