From 5a39e55c21c9994f8eb2b0a94cc0f5d8fbffa6fe Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Apr 2018 13:38:26 +0300 Subject: [PATCH 1/5] [SSE] Hide options for export to pdf format (rev. https://github.com/ONLYOFFICE/web-apps-pro/commit/1aed6a07f5598b2a021637ec3d47b0ee91cf62f8) --- apps/spreadsheeteditor/main/app/controller/LeftMenu.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Main.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index b7d2a778c..9325c24b8 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -262,9 +262,9 @@ define([ } }, this) }); - } else if (format == Asc.c_oAscFileType.PDF) { - menu.hide(); - Common.NotificationCenter.trigger('download:settings', this.leftMenu); + // } else if (format == Asc.c_oAscFileType.PDF) { + // menu.hide(); + // Common.NotificationCenter.trigger('download:settings', this.leftMenu); } else { this.api.asc_DownloadAs(format); menu.hide(); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 324789bbe..1da261a88 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -412,9 +412,9 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.XLSX; - if (_format == Asc.c_oAscFileType.PDF) - Common.NotificationCenter.trigger('download:settings', this, true); - else + // if (_format == Asc.c_oAscFileType.PDF) + // Common.NotificationCenter.trigger('download:settings', this, true); + // else this.api.asc_DownloadAs(_format, true); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 1abe81872..0656df7ea 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -107,9 +107,9 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.PDF; - if (_format == Asc.c_oAscFileType.PDF) - Common.NotificationCenter.trigger('download:settings', this.toolbar); - else + // if (_format == Asc.c_oAscFileType.PDF) + // Common.NotificationCenter.trigger('download:settings', this.toolbar); + // else _main.api.asc_DownloadAs(_format); }, 'go:editor': function() { From 27539251848f3d9c8ea1ee902f2854056c56bb29 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Apr 2018 14:04:11 +0300 Subject: [PATCH 2/5] [DE] Hide creating bookmarks and internal hyperlinks (rev. https://github.com/ONLYOFFICE/web-apps-pro/commit/b402ac5b89425548170c6f5cec9251e9d159b786) --- .../documenteditor/main/app/template/Toolbar.template | 2 +- .../main/app/view/HyperlinkSettingsDialog.js | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index 7c1ed23c5..b682e9368 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -161,7 +161,7 @@
- +
diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js index 739f09689..2d11821a1 100644 --- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js @@ -66,8 +66,8 @@ define([ }, options || {}); this.template = [ - '
', - '
', + '
', + '', @@ -279,9 +279,10 @@ define([ if (props) { var me = this; - var bookmark = props.get_Bookmark(), - type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink; + // var bookmark = props.get_Bookmark(), + // type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink; + var type = c_oHyperlinkType.WebLink; (type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true); me.ShowHideElem(type); @@ -334,7 +335,7 @@ define([ url = url.replace(new RegExp("%20",'g')," "); props.put_Value(url); - props.put_Bookmark(null); + // props.put_Bookmark(null); display = url; } else { var rec = this.internalList.getSelectedRec(); From 1b636658ace022bbc230229cd10d9fde9caced59 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Apr 2018 14:09:31 +0300 Subject: [PATCH 3/5] [DE] Fix fit to margin (rev. https://github.com/ONLYOFFICE/web-apps-pro/commit/b6ec334a7dc6edeb58246fc00ea53519091a0651) --- apps/documenteditor/main/app/view/ImageSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index a2aad4982..392be905e 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -318,7 +318,7 @@ define([ if (this.api) { var section = this.api.asc_GetSectionProps(), ratio = (this._state.Height>0) ? this._state.Width/this._state.Height : 1, - pagew = this.api.asc_GetCurrentColumnWidth(), + pagew = (this.api.asc_GetCurrentColumnWidth) ? this.api.asc_GetCurrentColumnWidth() : (section.get_W() - section.get_LeftMargin() - section.get_RightMargin()), pageh = section.get_H() - section.get_TopMargin() - section.get_BottomMargin(), pageratio = pagew/pageh, w, h; From 469c841daba1eda0be8cd219bb575712548f79ba Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Apr 2018 15:47:09 +0300 Subject: [PATCH 4/5] Revert "[SSE] Hide options for export to pdf format (rev. https://github.com/ONLYOFFICE/web-apps-pro/commit/1aed6a07f5598b2a021637ec3d47b0ee91cf62f8)" This reverts commit 5a39e55c21c9994f8eb2b0a94cc0f5d8fbffa6fe. --- apps/spreadsheeteditor/main/app/controller/LeftMenu.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Main.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 9325c24b8..b7d2a778c 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -262,9 +262,9 @@ define([ } }, this) }); - // } else if (format == Asc.c_oAscFileType.PDF) { - // menu.hide(); - // Common.NotificationCenter.trigger('download:settings', this.leftMenu); + } else if (format == Asc.c_oAscFileType.PDF) { + menu.hide(); + Common.NotificationCenter.trigger('download:settings', this.leftMenu); } else { this.api.asc_DownloadAs(format); menu.hide(); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 1da261a88..324789bbe 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -412,9 +412,9 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.XLSX; - // if (_format == Asc.c_oAscFileType.PDF) - // Common.NotificationCenter.trigger('download:settings', this, true); - // else + if (_format == Asc.c_oAscFileType.PDF) + Common.NotificationCenter.trigger('download:settings', this, true); + else this.api.asc_DownloadAs(_format, true); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 0656df7ea..1abe81872 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -107,9 +107,9 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.PDF; - // if (_format == Asc.c_oAscFileType.PDF) - // Common.NotificationCenter.trigger('download:settings', this.toolbar); - // else + if (_format == Asc.c_oAscFileType.PDF) + Common.NotificationCenter.trigger('download:settings', this.toolbar); + else _main.api.asc_DownloadAs(_format); }, 'go:editor': function() { From 960bef0a302d486994b7ecabb836cf954a017243 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Apr 2018 15:47:41 +0300 Subject: [PATCH 5/5] Revert "[DE] Hide creating bookmarks and internal hyperlinks (rev. https://github.com/ONLYOFFICE/web-apps-pro/commit/b402ac5b89425548170c6f5cec9251e9d159b786)" This reverts commit 27539251848f3d9c8ea1ee902f2854056c56bb29. --- .../documenteditor/main/app/template/Toolbar.template | 2 +- .../main/app/view/HyperlinkSettingsDialog.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index b682e9368..7c1ed23c5 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -161,7 +161,7 @@
- +
diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js index 2d11821a1..739f09689 100644 --- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js @@ -66,8 +66,8 @@ define([ }, options || {}); this.template = [ - '
', - '