From 5cbac85ab2d359dd75e5ce30fe5c5d8c0c0366fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 17 Apr 2017 17:25:02 +0300 Subject: [PATCH 001/214] [SSE] Added jszip, jszip-utils. --- apps/spreadsheeteditor/main/app.js | 6 +++++- apps/spreadsheeteditor/main/app_dev.js | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 7ef127121..3f3f6a2ec 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -54,6 +54,8 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', + jszip : '../vendor/jszip/jszip.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/cell/sdk-all-min', api : 'api/documents/api', @@ -106,7 +108,9 @@ require.config({ 'underscore', 'allfonts', 'xregexp', - 'sockjs' + 'sockjs', + 'jszip', + 'jsziputils' ] }, gateway: { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 1cc730a2d..5e2f4d2eb 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -54,6 +54,8 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', + jszip : '../vendor/jszip/jszip.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -119,6 +121,8 @@ require([ 'analytics', 'gateway', 'locale', + 'jszip', + 'jsziputils', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { From a3709838c3cc13828a96841c58e0aaba65e3ce22 Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Mon, 17 Apr 2017 19:41:45 +0300 Subject: [PATCH 002/214] add easysax.js, openxml.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index ed9644d13..8b506b265 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -198,5 +198,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/Format/DrawingContent.js", "../../../../sdkjs/common/clipboard_base.js", "../../../../sdkjs/common/plugins.js", - "../../../../sdkjs/common/text_input.js" + "../../../../sdkjs/common/text_input.js", + "../../../../sdkjs/common/easysax.js", + "../../../../sdkjs/common/openxml.js" ]; \ No newline at end of file From b2b4321a08ab730867326bb56a24ba96796ad68f Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Wed, 19 Apr 2017 13:27:45 +0300 Subject: [PATCH 003/214] add PivotTables.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 8b506b265..2496f5a7f 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -115,6 +115,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js", "../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js", "../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.js", + "../../../../sdkjs/cell/model/PivotTables.js", "../../../../sdkjs/common/apiBase.js", "../../../../sdkjs/cell/api.js", "../../../../sdkjs/common/Private/license.js", From a22f2948c7a120fab8179aadb309c084bbb8e6ff Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Apr 2017 15:19:25 +0300 Subject: [PATCH 004/214] [SSE] Added error LockedCellPivot. --- apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 70127dc20..4518fdb87 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1179,6 +1179,10 @@ define([ config.msg = this.errorAccessDeny; break; + case Asc.c_oAscError.ID.LockedCellPivot: + config.msg = this.errorLockedCellPivot; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -2100,7 +2104,8 @@ define([ errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.', errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', titleServerVersion: 'Editor updated', - errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.' + errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', + errorLockedCellPivot: 'You cannot change data inside a pivot table.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 129eaba30..d0f1c3a9d 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -274,6 +274,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "SSE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "SSE.Controllers.Main.errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", + "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", "SSE.Controllers.Main.errorMoveRange": "Cannot change part of a merged cell", "SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded
the allowed number of characters and it was removed.", From bafbdf6c3f57b32f9d533dedea2c0d6f5d6b7e96 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Jun 2017 12:47:22 +0300 Subject: [PATCH 005/214] [SSE] Disable filters, sort, merge, hyperlinks when in pivot table. --- .../main/app/controller/DocumentHolder.js | 9 ++++++-- .../main/app/controller/Toolbar.js | 3 +++ .../main/app/view/Toolbar.js | 23 ++++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 713ae0c69..6026afb7b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1445,6 +1445,8 @@ define([ documentHolder.pmiInsertCells.menu.items[1].setDisabled(isApplyAutoFilter); documentHolder.pmiDeleteCells.menu.items[1].setDisabled(isApplyAutoFilter); + var inPivot = !!cellinfo.asc_getPivotTableInfo(); + _.each(documentHolder.ssMenu.items, function(item) { item.setDisabled(isCellLocked); }); @@ -1455,9 +1457,12 @@ define([ documentHolder.pmiDeleteEntire.setDisabled(isCellLocked || isTableLocked); documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked); documentHolder.pmiDeleteTable.setDisabled(isCellLocked || isTableLocked); - documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null)); - documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null)); + documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null) || inPivot); + documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null) || inPivot); documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true)); + documentHolder.menuHyperlink.setDisabled(isCellLocked || inPivot); + documentHolder.menuAddHyperlink.setDisabled(isCellLocked || inPivot); + if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event); } else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) { if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return; diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 944350a84..fdefb84c9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2012,6 +2012,9 @@ define([ this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]}); + + need_disable = !!info.asc_getPivotTableInfo(); + toolbar.lockToolbar(SSE.enumLock.editPivot, need_disable, { array: [toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnSetAutofilter, toolbar.btnClearAutofilter, toolbar.btnSortDown, toolbar.btnSortUp, toolbar.btnAutofilter]}); } val = info.asc_getNumFormatInfo(); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 41461ee3e..0aa3852a1 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -61,6 +61,7 @@ define([ editCell: 'cell-editing', editFormula: 'is-formula', editText: 'is-text', + editPivot: 'is-pivot', selImage: 'sel-image', selShape: 'sel-shape', selShapeText: 'sel-shape-txt', @@ -289,21 +290,21 @@ define([ id : 'id-toolbar-btn-sort-down', cls : 'btn-toolbar', iconCls : 'btn-sort-down', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSortUp = new Common.UI.Button({ id : 'id-toolbar-btn-sort-up', cls : 'btn-toolbar', iconCls : 'btn-sort-up', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSetAutofilter = new Common.UI.Button({ id : 'id-toolbar-btn-setautofilter', cls : 'btn-toolbar', iconCls : 'btn-autofilter', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot], enableToggle: true }); @@ -311,7 +312,7 @@ define([ id : 'id-toolbar-btn-clearfilter', cls : 'btn-toolbar', iconCls : 'btn-clear-filter', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot] }); } else { Common.UI.Mixtbar.prototype.initialize.call(this, { @@ -493,7 +494,7 @@ define([ enableToggle: true, allowDepress: true, split : true, - lock : [_set.editCell, _set.selShape, _set.selShapeText, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleMerge], + lock : [_set.editCell, _set.selShape, _set.selShapeText, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleMerge, _set.editPivot], menu : new Common.UI.Menu({ items: [ { @@ -617,7 +618,7 @@ define([ cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-inserthyperlink', caption : me.capInsertHyperlink, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.multiselect, _set.lostConnect, _set.coAuth] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot] }); me.btnInsertChart = new Common.UI.Button({ @@ -684,21 +685,21 @@ define([ id : 'id-toolbar-btn-sort-down', cls : 'btn-toolbar', iconCls : 'btn-sort-down', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSortUp = new Common.UI.Button({ id : 'id-toolbar-btn-sort-up', cls : 'btn-toolbar', iconCls : 'btn-sort-up', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot] }); me.btnSetAutofilter = new Common.UI.Button({ id : 'id-toolbar-btn-setautofilter', cls : 'btn-toolbar', iconCls : 'btn-autofilter', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot], enableToggle: true }); @@ -706,7 +707,7 @@ define([ id : 'id-toolbar-btn-clearfilter', cls : 'btn-toolbar', iconCls : 'btn-clear-filter', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot] }); me.btnTableTemplate = new Common.UI.Button({ @@ -1151,7 +1152,7 @@ define([ id : 'id-toolbar-btn-autofilter', cls : 'btn-toolbar', iconCls : 'btn-autofilter', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot], menu : new Common.UI.Menu({ items : [ me.mnuitemSortAZ = new Common.UI.MenuItem({ From f237a48f0ee4b11a315817e78f4cff1034a9dded Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Jun 2017 17:41:35 +0300 Subject: [PATCH 006/214] Merge branch feature/new-toolbar. --- apps/common/main/lib/controller/Plugins.js | 6 +- apps/common/main/lib/model/Plugin.js | 1 + apps/common/main/lib/view/Plugins.js | 6 +- apps/common/main/resources/less/window.less | 10 + apps/documenteditor/main/app.js | 33 +- .../main/app/controller/Main.js | 50 +- .../main/app/controller/Toolbar.js | 58 +- .../main/app/view/CustomColumnsDialog.js | 178 ++ .../main/app/view/DocumentHolder.js | 7 +- apps/documenteditor/main/app/view/Toolbar.js | 7 +- apps/documenteditor/main/app_dev.js | 33 +- apps/documenteditor/main/index.html | 12 + apps/documenteditor/main/index.html.deploy | 26 +- apps/documenteditor/main/locale/de.json | 4 +- apps/documenteditor/main/locale/en.json | 28 +- apps/documenteditor/main/locale/es.json | 27 +- apps/documenteditor/main/locale/fr.json | 4 +- apps/documenteditor/main/locale/ru.json | 16 + apps/documenteditor/main/locale/zh.json | 1611 +++++++++++++++ apps/documenteditor/mobile/app-dev.js | 33 +- apps/documenteditor/mobile/app.js | 33 +- .../mobile/app/controller/Main.js | 45 +- apps/documenteditor/mobile/index.html | 12 + apps/documenteditor/mobile/index.html.deploy | 24 + apps/documenteditor/mobile/locale/en.json | 16 + apps/documenteditor/mobile/locale/ru.json | 16 + apps/documenteditor/mobile/locale/zh.json | 361 ++++ apps/presentationeditor/main/app.js | 33 +- .../main/app/controller/Main.js | 51 +- apps/presentationeditor/main/app_dev.js | 33 +- apps/presentationeditor/main/index.html | 12 + .../presentationeditor/main/index.html.deploy | 24 +- apps/presentationeditor/main/locale/de.json | 4 +- apps/presentationeditor/main/locale/en.json | 15 +- apps/presentationeditor/main/locale/es.json | 958 ++++----- apps/presentationeditor/main/locale/fr.json | 4 +- apps/presentationeditor/main/locale/zh.json | 1342 +++++++++++++ apps/presentationeditor/mobile/app-dev.js | 33 +- apps/presentationeditor/mobile/app.js | 33 +- .../mobile/app/controller/Main.js | 48 +- .../mobile/app/template/Settings.template | 4 +- apps/presentationeditor/mobile/index.html | 12 + .../mobile/index.html.deploy | 24 + apps/presentationeditor/mobile/locale/en.json | 12 + apps/presentationeditor/mobile/locale/zh.json | 432 ++++ .../main/app/view/FormatSettingsDialog.js | 3 +- .../main/app/view/SetValueDialog.js | 1 + apps/spreadsheeteditor/main/index.html | 12 + apps/spreadsheeteditor/main/index.html.deploy | 24 +- apps/spreadsheeteditor/main/locale/de.json | 1 + apps/spreadsheeteditor/main/locale/es.json | 974 ++++----- apps/spreadsheeteditor/main/locale/fr.json | 21 +- apps/spreadsheeteditor/main/locale/ru.json | 9 + apps/spreadsheeteditor/main/locale/zh.json | 1739 +++++++++++++++++ apps/spreadsheeteditor/mobile/app-dev.js | 33 +- apps/spreadsheeteditor/mobile/app.js | 33 +- .../mobile/app/controller/Main.js | 62 +- .../mobile/app/controller/add/AddChart.js | 7 - apps/spreadsheeteditor/mobile/index.html | 12 + .../mobile/index.html.deploy | 24 + apps/spreadsheeteditor/mobile/locale/en.json | 22 + apps/spreadsheeteditor/mobile/locale/ru.json | 9 + apps/spreadsheeteditor/mobile/locale/zh.json | 464 +++++ 63 files changed, 7777 insertions(+), 1404 deletions(-) create mode 100644 apps/documenteditor/main/app/view/CustomColumnsDialog.js create mode 100644 apps/documenteditor/main/locale/zh.json create mode 100644 apps/documenteditor/mobile/locale/zh.json create mode 100644 apps/presentationeditor/main/locale/zh.json create mode 100644 apps/presentationeditor/mobile/locale/zh.json create mode 100644 apps/spreadsheeteditor/main/locale/zh.json create mode 100644 apps/spreadsheeteditor/mobile/locale/zh.json diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 4bcb79ed4..6bd81688b 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -148,6 +148,7 @@ define([ variation.set_Url(itemVar.get('url')); variation.set_Icons(itemVar.get('icons')); variation.set_Visual(itemVar.get('isVisual')); + variation.set_CustomWindow(itemVar.get('isCustomWindow')); variation.set_Viewer(itemVar.get('isViewer')); variation.set_EditorsSupport(itemVar.get('EditorsSupport')); variation.set_Modal(itemVar.get('isModal')); @@ -248,6 +249,7 @@ define([ this.api.asc_pluginButtonClick(-1); } else { var me = this, + isCustomWindow = variation.get_CustomWindow(), arrBtns = variation.get_Buttons(), newBtns = {}, size = variation.get_Size(); @@ -260,11 +262,13 @@ define([ } me.pluginDlg = new Common.Views.PluginDlg({ + cls: isCustomWindow ? 'plain' : '', + header: !isCustomWindow, title: plugin.get_Name(), width: size[0], // inner width height: size[1], // inner height url: url, - buttons: newBtns, + buttons: isCustomWindow ? undefined : newBtns, toolcallback: _.bind(this.onToolClose, this) }); me.pluginDlg.on('render:after', function(obj){ diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js index 3612817be..0f5ea93dc 100644 --- a/apps/common/main/lib/model/Plugin.js +++ b/apps/common/main/lib/model/Plugin.js @@ -58,6 +58,7 @@ define([ isViewer: false, EditorsSupport: ["word", "cell", "slide"], isVisual: false, + isCustomWindow: false, isModal: false, isInsideMode: false, initDataType: 0, diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 803ab6aaa..3ce4babd8 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -290,21 +290,22 @@ define([ initialize : function(options) { var _options = {}; _.extend(_options, { - cls: 'advanced-settings-dlg', header: true, enableKeyEvents: false }, options); var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; + if (!_options.header) header_footer -= 34; _options.width = (Common.Utils.innerWidth()-_options.width)<0 ? Common.Utils.innerWidth(): _options.width, _options.height += header_footer; _options.height = (Common.Utils.innerHeight()-_options.height)<0 ? Common.Utils.innerHeight(): _options.height; + _options.cls += ' advanced-settings-dlg'; this.template = [ '
', '
', '
', - '<% if (_.size(buttons) > 0) { %>', + '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>', '
', '
', '<% for(var bt in buttons) { %>', @@ -326,6 +327,7 @@ define([ this.boxEl = this.$window.find('.body > .box'); this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34; + if (!this.options.header) this._headerFooterHeight -= 34; this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width')))); var iframe = document.createElement("iframe"); diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 52532f0ac..351069a5c 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -190,6 +190,16 @@ -o-transition: none !important; } + &.plain { + border: none; + box-shadow: none; + border-radius: 0; + + .body, .resize-border { + border-radius: 0 !important; + } + } + .resize-border { position: absolute; width: 5px; diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index 3cb20c44f..471759e72 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -200,37 +200,8 @@ require([ app.start(); }); }, function(err) { - if (err.requireType == 'timeout' && !reqerr) { - var getUrlParams = function() { - var e, - a = /\+/g, // Regex for replacing addition symbol with a space - r = /([^&=]+)=?([^&]*)/g, - d = function (s) { return decodeURIComponent(s.replace(a, " ")); }, - q = window.location.search.substring(1), - urlParams = {}; - - while (e = r.exec(q)) - urlParams[d(e[1])] = d(e[2]); - - return urlParams; - }; - - var encodeUrlParam = function(str) { - return str.replace(/&/g, '&') - .replace(/"/g, '"') - .replace(/'/g, ''') - .replace(//g, '>'); - }; - - var lang = (getUrlParams()["lang"] || 'en').split("-")[0]; - - if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; - else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; - else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; - else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; - else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; - + if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { + reqerr = window.requireTimeourError(); window.alert(reqerr); window.location.reload(); } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index bf86936e0..ffb4fedc3 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -107,6 +107,7 @@ define([ this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false}; this.languages = null; + this.translationTable = []; // Initialize viewport if (!Common.Utils.isBrowserSupported()){ @@ -122,8 +123,23 @@ define([ // Initialize api window["flat_desine"] = true; + + var styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', + 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph'], + translate = { + 'Series': this.txtSeries, + 'Diagram Title': this.txtDiagramTitle, + 'X Axis': this.txtXAxis, + 'Y Axis': this.txtYAxis, + 'Your text here': this.txtArt + }; + styleNames.forEach(function(item){ + translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; + }); + this.api = new Asc.asc_docs_api({ - 'id-view' : 'editor_sdk' + 'id-view' : 'editor_sdk', + 'translate': translate }); if (this.api){ @@ -1046,19 +1062,6 @@ define([ this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); - - if (this.api) { - var translateChart = new Asc.asc_CChartTranslate(); - translateChart.asc_setTitle(this.txtDiagramTitle); - translateChart.asc_setXAxis(this.txtXAxis); - translateChart.asc_setYAxis(this.txtYAxis); - translateChart.asc_setSeries(this.txtSeries); - this.api.asc_setChartTranslate(translateChart); - - var translateArt = new Asc.asc_TextArtTranslate(); - translateArt.asc_setDefaultText(this.txtArt); - this.api.asc_setTextArtTranslate(translateArt); - } }, applyModeEditorElements: function() { @@ -1940,6 +1943,7 @@ define([ isViewer: itemVar.isViewer, EditorsSupport: itemVar.EditorsSupport, isVisual: itemVar.isVisual, + isCustomWindow: itemVar.isCustomWindow, isModal: itemVar.isModal, isInsideMode: itemVar.isInsideMode, initDataType: itemVar.initDataType, @@ -2088,7 +2092,23 @@ define([ errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', titleServerVersion: 'Editor updated', errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', - errorBadImageUrl: 'Image url is incorrect' + errorBadImageUrl: 'Image url is incorrect', + txtStyle_Normal: 'Normal', + txtStyle_No_Spacing: 'No Spacing', + txtStyle_Heading_1: 'Heading 1', + txtStyle_Heading_2: 'Heading 2', + txtStyle_Heading_3: 'Heading 3', + txtStyle_Heading_4: 'Heading 4', + txtStyle_Heading_5: 'Heading 5', + txtStyle_Heading_6: 'Heading 6', + txtStyle_Heading_7: 'Heading 7', + txtStyle_Heading_8: 'Heading 8', + txtStyle_Heading_9: 'Heading 9', + txtStyle_Title: 'Title', + txtStyle_Subtitle: 'Subtitle', + txtStyle_Quote: 'Quote', + txtStyle_Intense_Quote: 'Intense Quote', + txtStyle_List_Paragraph: 'List Paragraph' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5e63c3ad8..b70004915 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -55,7 +55,8 @@ define([ 'documenteditor/main/app/view/PageMarginsDialog', 'documenteditor/main/app/view/PageSizeDialog', 'documenteditor/main/app/view/NoteSettingsDialog', - 'documenteditor/main/app/controller/PageLayout' + 'documenteditor/main/app/controller/PageLayout', + 'documenteditor/main/app/view/CustomColumnsDialog' ], function () { 'use strict'; @@ -1641,23 +1642,40 @@ define([ return; this._state.columns = undefined; - if (this.api && item.checked) { - var props = new Asc.CDocumentColumnsProps(), - cols = item.value, - def_space = 12.5; - props.put_EqualWidth(cols<3); - if (cols<3) { - props.put_Num(cols+1); - props.put_Space(def_space); - } else { - var total = this.api.asc_GetColumnsProps().get_TotalWidth(), - left = (total - def_space*2)/3, - right = total - def_space - left; - props.put_ColByValue(0, (cols == 3) ? left : right, def_space); - props.put_ColByValue(1, (cols == 3) ? right : left, 0); + if (this.api) { + if (item.value == 'advanced') { + var win, props = this.api.asc_GetSectionProps(), + me = this; + win = new DE.Views.CustomColumnsDialog({ + handler: function(dlg, result) { + if (result == 'ok') { + props = dlg.getSettings(); + me.api.asc_SetColumnsProps(props); + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + } + }); + win.show(); + win.setSettings(me.api.asc_GetColumnsProps()); + } else if (item.checked) { + var props = new Asc.CDocumentColumnsProps(), + cols = item.value, + def_space = 12.5; + props.put_EqualWidth(cols<3); + + if (cols<3) { + props.put_Num(cols+1); + props.put_Space(def_space); + } else { + var total = this.api.asc_GetColumnsProps().get_TotalWidth(), + left = (total - def_space*2)/3, + right = total - def_space - left; + props.put_ColByValue(0, (cols == 3) ? left : right, def_space); + props.put_ColByValue(1, (cols == 3) ? right : left, 0); + } + this.api.asc_SetColumnsProps(props); } - this.api.asc_SetColumnsProps(props); } Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -1903,9 +1921,10 @@ define([ Common.NotificationCenter.trigger('edit:complete', me.toolbar); }; - var formats = []; + var formats = [], + mainController = me.getApplication().getController('Main'); _.each(window.styles.get_MergedStyles(), function (style) { - formats.push({value: style, displayValue: style.get_Name()}) + formats.push({value: style, displayValue: mainController.translationTable[style.get_Name()] || style.get_Name()}) }); win = new DE.Views.StyleTitleDialog({ @@ -2621,11 +2640,12 @@ define([ listStyles.menuPicker.store.reset([]); // remove all + var mainController = this.getApplication().getController('Main'); _.each(styles.get_MergedStyles(), function(style){ listStyles.menuPicker.store.add({ imageUrl: style.asc_getImage(), title : style.get_Name(), - tip : style.get_Name(), + tip : mainController.translationTable[style.get_Name()] || style.get_Name(), id : Common.UI.getId() }); }); diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js new file mode 100644 index 000000000..5a9778663 --- /dev/null +++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js @@ -0,0 +1,178 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2017 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * CustomColumnsDialog.js + * + * Created by Julia Radzhabova on 6/23/17 + * Copyright (c) 2017 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/MetricSpinner', + 'common/main/lib/component/CheckBox' +], function () { 'use strict'; + + DE.Views.CustomColumnsDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 300, + header: true, + style: 'min-width: 216px;', + cls: 'modal-dlg' + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, options || {}); + + this.template = [ + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '', + '', + '
' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + + this.spinners = []; + this._noApply = false; + + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + this.spnColumns = new Common.UI.MetricSpinner({ + el: $('#custom-columns-spin-num'), + step: 1, + allowDecimal: false, + width: 100, + defaultUnit : "", + value: '1', + maxValue: 12, + minValue: 1 + }); + + this.spnSpacing = new Common.UI.MetricSpinner({ + el: $('#custom-columns-spin-spacing'), + step: .1, + width: 100, + defaultUnit : "cm", + value: '0 cm', + maxValue: 40.64, + minValue: 0 + }); + this.spinners.push(this.spnSpacing); + + this.chSeparator = new Common.UI.CheckBox({ + el: $('#custom-columns-separator'), + labelText: this.textSeparator + }); + + this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + + this.updateMetricUnit(); + }, + + _handleInput: function(state) { + if (this.options.handler) { + this.options.handler.call(this, this, state); + } + + this.close(); + }, + + onBtnClick: function(event) { + this._handleInput(event.currentTarget.attributes['result'].value); + }, + + onPrimary: function() { + this._handleInput('ok'); + return false; + }, + + setSettings: function (props) { + if (props) { + var equal = props.get_EqualWidth(), + num = (equal) ? props.get_Num() : props.get_ColsCount(), + space = (equal) ? props.get_Space() : (num>1 ? props.get_Col(0).get_Space() : 12.5); + + this.spnColumns.setValue(num, true); + this.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(space), true); + this.chSeparator.setValue(props.get_Sep()); + } + }, + + getSettings: function() { + var props = new Asc.CDocumentColumnsProps(); + props.put_EqualWidth(true); + props.put_Num(this.spnColumns.getNumberValue()); + props.put_Space(Common.Utils.Metric.fnRecalcToMM(this.spnSpacing.getNumberValue())); + props.put_Sep(this.chSeparator.getValue()=='checked'); + return props; + }, + + updateMetricUnit: function() { + if (this.spinners) { + for (var i=0; i/g, '>'); - }; - - var lang = (getUrlParams()["lang"] || 'en').split("-")[0]; - - if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; - else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; - else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; - else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; - else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; - + if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { + reqerr = window.requireTimeourError(); window.alert(reqerr); window.location.reload(); } diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 82fef5ca5..d3906d3d4 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -283,6 +283,18 @@ window.sdk_dev_scrpipts.forEach(function(item){ document.write(' diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index e151fbbf2..6e8dbc7a3 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -9,7 +9,7 @@ - +