From c76a24beeb36ff7a6b54507f67d240da419355b2 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 8 Aug 2017 18:00:55 +0300 Subject: [PATCH 01/76] unified toolbar's components identifiers --- .../main/app/controller/Toolbar.js | 1 + apps/documenteditor/main/app/view/Toolbar.js | 26 +++++++++---------- .../main/app/controller/Toolbar.js | 1 + .../main/app/view/Toolbar.js | 16 ++++++++---- .../main/app/controller/Toolbar.js | 1 + .../main/app/view/Toolbar.js | 14 +++++----- 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index b231f107a..7c5daef0f 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2832,6 +2832,7 @@ define([ /x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); var button = new Common.UI.Button({ + id: 'tlbtn-addcomment-' + index, cls: _cls, iconCls: 'btn-menu-comments', caption: me.toolbar.capBtnComment diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index d5ee350d0..597f51dd5 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -455,7 +455,7 @@ define([ this.mnuMultilevelPicker = clone(this.mnuMarkersPicker); this.btnInsertTable = new Common.UI.Button({ - id: 'tlb-btn-instable', + id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-inserttable', caption: me.capBtnInsTable, @@ -469,7 +469,7 @@ define([ this.paragraphControls.push(this.btnInsertTable); this.btnInsertImage = new Common.UI.Button({ - id: 'tlb-btn-insimage', + id: 'tlbtn-insertimage', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-insertimage', caption: me.capBtnInsImage, @@ -483,7 +483,7 @@ define([ this.paragraphControls.push(this.btnInsertImage); this.btnInsertChart = new Common.UI.Button({ - id: 'tlb-btn-inschart', + id: 'tlbtn-insertchart', cls: 'btn-toolbar x-huge icon-top', caption: me.capBtnInsChart, iconCls: 'btn-insertchart', @@ -497,7 +497,7 @@ define([ this.paragraphControls.push(this.btnInsertChart); this.btnInsertText = new Common.UI.Button({ - id: 'tlb-btn-inserttext', + id: 'tlbtn-inserttext', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-text', caption: me.capBtnInsTextbox, @@ -505,7 +505,7 @@ define([ }); this.paragraphControls.push(this.btnInsertText); this.btnInsertTextArt = new Common.UI.Button({ - id: 'tlb-btn-instextart', + id: 'tlbtn-inserttextart', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-textart', caption: me.capBtnInsTextart, @@ -519,7 +519,7 @@ define([ this.paragraphControls.push(this.btnInsertTextArt); this.btnInsertHyperlink = new Common.UI.Button({ - id: 'tlb-btn-inshyperlink', + id: 'tlbtn-insertlink', cls: 'btn-toolbar x-huge icon-top', caption: me.capBtnInsLink, iconCls: 'btn-inserthyperlink' @@ -550,7 +550,7 @@ define([ this.toolbarControls.push(this.btnEditHeader); this.btnInsertShape = new Common.UI.Button({ - id: 'tlb-btn-insshape', + id: 'tlbtn-insertshape', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-insertshape', caption: me.capBtnInsShape, @@ -560,7 +560,7 @@ define([ this.paragraphControls.push(this.btnInsertShape); this.btnInsertEquation = new Common.UI.Button({ - id: 'tlb-btn-insequation', + id: 'tlbtn-insertequation', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-insertequation', caption: me.capBtnInsEquation, @@ -570,7 +570,7 @@ define([ this.paragraphControls.push(this.btnInsertEquation); this.btnDropCap = new Common.UI.Button({ - id: 'tlb-btn-dropcap', + id: 'tlbtn-dropcap', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-dropcap', caption: me.capBtnInsDropcap, @@ -607,7 +607,7 @@ define([ this.paragraphControls.push(this.btnDropCap); this.btnColumns = new Common.UI.Button({ - id: 'tlb-btn-columns', + id: 'tlbtn-columns', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-columns', caption: me.capBtnColumns, @@ -657,7 +657,7 @@ define([ this.paragraphControls.push(this.btnColumns); this.btnPageOrient = new Common.UI.Button({ - id: 'tlb-btn-pageorient', + id: 'tlbtn-pageorient', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pageorient', caption: me.capBtnPageOrient, @@ -693,7 +693,7 @@ define([ '<% } %>'); this.btnPageMargins = new Common.UI.Button({ - id: 'tlb-btn-pagemargins', + id: 'tlbtn-pagemargins', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagemargins', caption: me.capBtnMargins, @@ -752,7 +752,7 @@ define([ '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %>'); this.btnPageSize = new Common.UI.Button({ - id: 'tlb-btn-pagesize', + id: 'tlbtn-pagesize', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagesize', caption: me.capBtnPageSize, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 7b20a65b3..c865a98ae 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2074,6 +2074,7 @@ define([ /x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); var button = new Common.UI.Button({ + id: 'tlbtn-addcomment-' + index, cls: _cls, iconCls: 'btn-menu-comments', lock: [_set.lostConnect, _set.noSlides], diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index bf6840e5c..ee5182f03 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -537,7 +537,7 @@ define([ me.paragraphControls.push(me.btnLineSpace); me.btnInsertTable = new Common.UI.Button({ - id : 'id-toolbar-btn-inserttable', + id : 'tlbtn-inserttable', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-inserttable', caption : me.capInsertTable, @@ -552,7 +552,7 @@ define([ me.slideOnlyControls.push(me.btnInsertTable); me.btnInsertChart = new Common.UI.Button({ - id : 'id-toolbar-btn-insertchart', + id : 'tlbtn-insertchart', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertchart', caption : me.capInsertChart, @@ -567,7 +567,7 @@ define([ me.slideOnlyControls.push(me.btnInsertChart); me.btnInsertEquation = new Common.UI.Button({ - id : 'id-toolbar-btn-insertequation', + id : 'tlbtn-insertequation', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertequation', caption : me.capInsertEquation, @@ -578,7 +578,7 @@ define([ me.slideOnlyControls.push(this.btnInsertEquation); me.btnInsertHyperlink = new Common.UI.Button({ - id : 'id-toolbar-btn-inserthyperlink', + id : 'tlbtn-insertlink', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-inserthyperlink', caption : me.capInsertHyperlink, @@ -587,7 +587,7 @@ define([ me.paragraphControls.push(me.btnInsertHyperlink); me.btnInsertTextArt = new Common.UI.Button({ - id: 'tlb-btn-instextart', + id: 'tlbtn-inserttextart', cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-textart', caption: me.capInsertTextArt, @@ -1006,7 +1006,10 @@ define([ function _injectBtns(opts) { var array = new buttonsArray; var $slots = $host.find(opts.slot); + var id = opts.btnconfig.id; $slots.each(function(index, el) { + if ( !!id ) opts.btnconfig.id = id + index; + var button = new Common.UI.Button(opts.btnconfig); button.render( $slots.eq(index) ); @@ -1020,6 +1023,7 @@ define([ me.btnsInsertImage = _injectBtns({ slot: '.slot-insertimg', btnconfig: { + id : 'tlbtn-insertimage-', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertimage', caption : me.capInsertImage, @@ -1031,6 +1035,7 @@ define([ me.btnsInsertText = _injectBtns({ slot: '.slot-instext', btnconfig: { + id : 'tlbtn-inserttext-', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-text', caption : me.capInsertText, @@ -1042,6 +1047,7 @@ define([ me.btnsInsertShape = _injectBtns({ slot: '.slot-insertshape', btnconfig: { + id : 'tlbtn-insertshape-', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertshape', caption : me.capInsertShape, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index a15d90013..571b4a81f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2920,6 +2920,7 @@ define([ /x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); var button = new Common.UI.Button({ + id: 'tlbtn-addcomment-' + index, cls: _cls, iconCls: 'btn-menu-comments', lock: [_set.lostConnect, _set.commentLock], diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index e47f84fff..5ca02fea3 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -601,7 +601,7 @@ define([ }); me.btnInsertImage = new Common.UI.Button({ - id : 'id-toolbar-btn-insertimage', + id : 'tlbtn-insertimage', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertimage', caption : me.capInsertImage, @@ -615,7 +615,7 @@ define([ }); me.btnInsertHyperlink = new Common.UI.Button({ - id : 'id-toolbar-btn-inserthyperlink', + id : 'tlbtn-insertlink', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-inserthyperlink', caption : me.capInsertHyperlink, @@ -623,7 +623,7 @@ define([ }); me.btnInsertChart = new Common.UI.Button({ - id : 'id-toolbar-btn-insertchart', + id : 'tlbtn-insertchart', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertchart', lock : [_set.editCell, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], @@ -637,7 +637,7 @@ define([ }); me.btnInsertShape = new Common.UI.Button({ - id : 'id-toolbar-btn-insertshape', + id : 'tlbtn-insertshape', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertshape', enableToggle: true, @@ -647,7 +647,7 @@ define([ }); me.btnInsertText = new Common.UI.Button({ - id : 'tlb-btn-inserttext', + id : 'tlbtn-inserttext', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-text', caption : me.capInsertText, @@ -656,7 +656,7 @@ define([ }); me.btnInsertTextArt = new Common.UI.Button({ - id : 'tlb-btn-instextart', + id : 'tlbtn-inserttextart', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-textart', caption : me.capInsertTextart, @@ -670,7 +670,7 @@ define([ }); me.btnInsertEquation = new Common.UI.Button({ - id : 'id-toolbar-btn-insertequation', + id : 'tlbtn-insertequation', cls : 'btn-toolbar x-huge icon-top', iconCls : 'btn-insertequation', caption : me.capInsertEquation, From 0ededd308292028cf1d63bd606ef7840f2f524e8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Aug 2017 12:40:14 +0300 Subject: [PATCH 02/76] Fix Bug 35496. --- .../main/resources/less/rightmenu.less | 2 +- .../main/resources/less/rightmenu.less | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 250aca36f..2983c04f0 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -171,7 +171,7 @@ background-position: -250px 0; } -.btn-toolbar .icon.btn-borders-small { +.btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px); } diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index 46aa6b287..c2955f812 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -105,20 +105,22 @@ background-size: cover; } -.btn-toolbar .icon.btn-borders-small { +.btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small { .background-ximage('@{app-image-path}/right-panels/SmallBorders.png', '@{app-image-path}/right-panels/SmallBorders@2x.png', 84px); } -.options-btn-icon(btn-position-all, 0, 21px); -.options-btn-icon(btn-position-inner, 1, 21px); -.options-btn-icon(btn-position-bottom, 2, 21px); -.options-btn-icon(btn-position-inner-hor, 3, 21px); -.options-btn-icon(btn-position-top, 4, 21px); -.options-btn-icon(btn-position-none, 5, 21px); -.options-btn-icon(btn-position-outer, 6, 21px); -.options-btn-icon(btn-position-left, 7, 21px); -.options-btn-icon(btn-position-inner-vert, 8, 21px); -.options-btn-icon(btn-position-right, 9, 21px); +.button-normal-icon(btn-position-all, 0, 21px); +.button-normal-icon(btn-position-inner, 1, 21px); +.button-normal-icon(btn-position-bottom, 2, 21px); +.button-normal-icon(btn-position-inner-hor, 3, 21px); +.button-normal-icon(btn-position-top, 4, 21px); +.button-normal-icon(btn-position-none, 5, 21px); +.button-normal-icon(btn-position-outer, 6, 21px); +.button-normal-icon(btn-position-left, 7, 21px); +.button-normal-icon(btn-position-inner-vert, 8, 21px); +.button-normal-icon(btn-position-right, 9, 21px); + +.button-otherstates-icon(btn-borders-small, 21px); .btn-edit-table, .btn-change-shape { From e3e32fed9103f1cce96ec79d277fee2b70b0c4db Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Aug 2017 13:40:46 +0300 Subject: [PATCH 03/76] [DE] Fix Bug 35557. --- apps/documenteditor/main/app/controller/Main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 5212e6863..f7f1496e1 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -552,7 +552,7 @@ define([ toolbarView = toolbarController.getView(); if (this.appOptions.isEdit && toolbarView && (toolbarView.btnInsertShape.pressed || toolbarView.btnInsertText.pressed) && - ( !_.isObject(arguments[1]) || arguments[1].id !== 'tlb-btn-insshape')) { // TODO: Event from api is needed to clear btnInsertShape state + ( !_.isObject(arguments[1]) || arguments[1].id !== 'tlbtn-insertshape')) { // TODO: Event from api is needed to clear btnInsertShape state if (this.api) this.api.StartAddShape('', false); From 1e5227271a823b167437400ec2d27d1252e6bec8 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Wed, 9 Aug 2017 13:50:50 +0300 Subject: [PATCH 04/76] fix cell dev scripts --- apps/spreadsheeteditor/sdk_dev_scripts.js | 187 +++++++++++----------- 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 2496f5a7f..e53e7e8f5 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -1,23 +1,33 @@ var sdk_dev_scrpipts = [ - "../../../../sdkjs/common/AllFonts.js", - "../../../../sdkjs/common/browser.js", + "../../../../sdkjs/common/applyDocumentChanges.js", + "../../../../sdkjs/common/AllFonts.js", + + "../../../../sdkjs/common/browser.js", "../../../../sdkjs/common/commonDefines.js", - "../../../../sdkjs/common/downloaderfiles.js", "../../../../sdkjs/common/docscoapicommon.js", - "../../../../sdkjs/common/docscoapi.js", + "../../../../sdkjs/common/docscoapi.js", "../../../../sdkjs/common/apiCommon.js", "../../../../sdkjs/common/SerializeCommonWordExcel.js", - "../../../../sdkjs/common/editorscommon.js", + "../../../../sdkjs/common/editorscommon.js", "../../../../sdkjs/common/HistoryCommon.js", "../../../../sdkjs/common/TableId.js", - "../../../../sdkjs/common/TableIdChanges.js", + "../../../../sdkjs/common/TableIdChanges.js", + "../../../../sdkjs/common/AdvancedOptions.js", + "../../../../sdkjs/cell/apiDefines.js", + "../../../../sdkjs/cell/utils/utils.js", + "../../../../sdkjs/cell/view/HandlerList.js", + "../../../../sdkjs/cell/model/CollaborativeEditing.js", + "../../../../sdkjs/common/apiBase.js", + "../../../../sdkjs/common/Private/license.js", + "../../../../sdkjs/word/apiCommon.js", + "../../../../sdkjs/cell/api.js", + "../../../../sdkjs/common/downloaderfiles.js", "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", - "../../../../sdkjs/common/AdvancedOptions.js", "../../../../sdkjs/common/FontsFreeType/font_engine.js", - "../../../../sdkjs/common/FontsFreeType/FontFile.js", + "../../../../sdkjs/common/FontsFreeType/FontFile.js", "../../../../sdkjs/common/FontsFreeType/font_map.js", - "../../../../sdkjs/common/FontsFreeType/FontManager.js", + "../../../../sdkjs/common/FontsFreeType/FontManager.js", "../../../../sdkjs/word/Editor/FontClassification.js", "../../../../sdkjs/common/Drawings/Metafile.js", "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js", @@ -31,8 +41,8 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/ColorArray.js", "../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/States.js", - "../../../../sdkjs/common/Drawings/DrawingsChanges.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", + "../../../../sdkjs/common/Drawings/DrawingsChanges.js", "../../../../sdkjs/common/Drawings/Format/Geometry.js", "../../../../sdkjs/common/Drawings/Format/Format.js", "../../../../sdkjs/common/Drawings/Format/GraphicObjectBase.js", @@ -51,9 +61,9 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Charts/3DTransformation.js", "../../../../sdkjs/common/Charts/ChartsDrawer.js", "../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js", - "../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js", - "../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js", - "../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js", + "../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js", + "../../../../sdkjs/common/Drawings/TrackObjects/PolyLine.js", "../../../../sdkjs/common/Drawings/TrackObjects/ResizeTracks.js", "../../../../sdkjs/common/Drawings/TrackObjects/RotateTracks.js", "../../../../sdkjs/common/Drawings/TrackObjects/Spline.js", @@ -70,70 +80,79 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Scrolls/iscroll.js", "../../../../sdkjs/common/Scrolls/mobileTouchManagerBase.js", "../../../../sdkjs/common/wordcopypaste.js", - "../../../../sdkjs/cell/apiDefines.js", + "../../../../sdkjs/common/easysax.js", + "../../../../sdkjs/common/openxml.js", "../../../../sdkjs/cell/document/empty-workbook.js", - "../../../../sdkjs/cell/utils/utils.js", "../../../../sdkjs/cell/model/UndoRedo.js", "../../../../sdkjs/cell/model/clipboard.js", - "../../../../sdkjs/cell/model/autofilters.js", + "../../../../sdkjs/cell/model/autofilters.js", "../../../../sdkjs/cell/graphics/DrawingContext.js", - "../../../../sdkjs/cell/graphics/pdfprinter.js", - "../../../../sdkjs/cell/model/CollaborativeEditing.js", - "../../../../sdkjs/cell/model/ConditionalFormatting.js", - "../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js", - "../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js", - "../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js", + "../../../../sdkjs/cell/graphics/pdfprinter.js", + "../../../../sdkjs/cell/model/ConditionalFormatting.js", + "../../../../sdkjs/cell/model/FormulaObjects/parserFormula.js", + "../../../../sdkjs/cell/model/FormulaObjects/_xlfnFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/dateandtimeFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/engineeringFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/cubeFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/databaseFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/textanddataFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/statisticalFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/financialFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/mathematicFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/lookupandreferenceFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/informationFunctions.js", + "../../../../sdkjs/cell/model/FormulaObjects/logicalFunctions.js", "../../../../sdkjs/cell/model/CellComment.js", "../../../../sdkjs/cell/model/WorkbookElems.js", "../../../../sdkjs/cell/model/Workbook.js", "../../../../sdkjs/cell/model/Serialize.js", "../../../../sdkjs/cell/model/CellInfo.js", "../../../../sdkjs/cell/view/mobileTouch.js", - "../../../../sdkjs/cell/view/DrawingObjectsController.js", - "../../../../sdkjs/cell/view/StringRender.js", - "../../../../sdkjs/cell/view/CellTextRender.js", - "../../../../sdkjs/cell/view/CellEditorView.js", - "../../../../sdkjs/cell/view/HandlerList.js", - "../../../../sdkjs/cell/view/EventsController.js", - "../../../../sdkjs/cell/view/WorkbookView.js", + "../../../../sdkjs/cell/view/StringRender.js", + "../../../../sdkjs/cell/view/CellTextRender.js", + "../../../../sdkjs/cell/view/CellEditorView.js", + "../../../../sdkjs/cell/view/EventsController.js", + "../../../../sdkjs/cell/view/WorkbookView.js", "../../../../sdkjs/cell/view/WorksheetView.js", + "../../../../sdkjs/cell/view/DrawingObjectsController.js", "../../../../sdkjs/cell/model/DrawingObjects/Graphics.js", "../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js", "../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js", "../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js", "../../../../sdkjs/cell/model/DrawingObjects/Format/ShapePrototype.js", "../../../../sdkjs/cell/model/DrawingObjects/Format/ImagePrototype.js", - "../../../../sdkjs/cell/model/DrawingObjects/Format/GroupPrototype.js", - "../../../../sdkjs/cell/model/DrawingObjects/Format/ChartSpacePrototype.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", - "../../../../sdkjs/cell/Private/comments.js", - "../../../../sdkjs/word/Editor/Common.js", "../../../../sdkjs/word/Editor/DocumentContentElementBase.js", - "../../../../sdkjs/word/Editor/Comments.js", + "../../../../sdkjs/word/Editor/Comments.js", "../../../../sdkjs/word/Editor/CommentsChanges.js", "../../../../sdkjs/word/Editor/Styles.js", "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/word/Editor/RevisionsChange.js", + "../../../../sdkjs/word/Editor/FlowObjects.js", "../../../../sdkjs/word/Editor/ParagraphContent.js", + "../../../../sdkjs/word/Editor/ParagraphContentBase.js", "../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js", "../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js", "../../../../sdkjs/word/Editor/Paragraph/ParaDrawing.js", "../../../../sdkjs/word/Editor/Paragraph/ParaDrawingChanges.js", + "../../../../sdkjs/word/Editor/Hyperlink.js", + "../../../../sdkjs/word/Editor/HyperlinkChanges.js", + "../../../../sdkjs/word/Editor/Field.js", + "../../../../sdkjs/word/Editor/FieldChanges.js", + "../../../../sdkjs/word/Editor/Run.js", + "../../../../sdkjs/word/Editor/RunChanges.js", + "../../../../sdkjs/word/Editor/Math.js", + "../../../../sdkjs/word/Editor/MathChanges.js", "../../../../sdkjs/word/Editor/Paragraph.js", "../../../../sdkjs/word/Editor/ParagraphChanges.js", + "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", + "../../../../sdkjs/word/Editor/Sections.js", + "../../../../sdkjs/word/Editor/SectionsChanges.js", + "../../../../sdkjs/word/Editor/Numbering.js", + "../../../../sdkjs/word/Editor/NumberingChanges.js", + "../../../../sdkjs/word/Editor/HeaderFooter.js", "../../../../sdkjs/word/Editor/DocumentContentBase.js", "../../../../sdkjs/word/Editor/Document.js", "../../../../sdkjs/word/Editor/DocumentChanges.js", @@ -142,64 +161,46 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/DocumentControllerBase.js", "../../../../sdkjs/word/Editor/LogicDocumentController.js", "../../../../sdkjs/word/Editor/DrawingsController.js", - "../../../../sdkjs/word/Editor/HeaderFooterController.js", - "../../../../sdkjs/word/Editor/FlowObjects.js", - "../../../../sdkjs/word/Editor/ParagraphContentBase.js", - "../../../../sdkjs/word/Editor/Hyperlink.js", - "../../../../sdkjs/word/Editor/HyperlinkChanges.js", - "../../../../sdkjs/word/Editor/Field.js", - "../../../../sdkjs/word/Editor/FieldChanges.js", - "../../../../sdkjs/word/Editor/Run.js", - "../../../../sdkjs/word/Editor/RunChanges.js", - "../../../../sdkjs/word/Editor/Math.js", - "../../../../sdkjs/word/Editor/MathChanges.js", - "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", - "../../../../sdkjs/word/Editor/Sections.js", - "../../../../sdkjs/word/Editor/SectionsChanges.js", - "../../../../sdkjs/word/Editor/Numbering.js", - "../../../../sdkjs/word/Editor/NumberingChanges.js", - "../../../../sdkjs/word/Editor/HeaderFooter.js", - "../../../../sdkjs/word/Editor/Table.js", + "../../../../sdkjs/word/Editor/HeaderFooterController.js", + "../../../../sdkjs/word/Editor/Table.js", "../../../../sdkjs/word/Editor/Table/TableChanges.js", - "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", - "../../../../sdkjs/word/Editor/Table/TableDraw.js", - "../../../../sdkjs/word/Editor/Table/TableRow.js", + "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", + "../../../../sdkjs/word/Editor/Table/TableDraw.js", + "../../../../sdkjs/word/Editor/Table/TableRow.js", "../../../../sdkjs/word/Editor/Table/TableRowChanges.js", - "../../../../sdkjs/word/Editor/Table/TableCell.js", + "../../../../sdkjs/word/Editor/Table/TableCell.js", "../../../../sdkjs/word/Editor/Table/TableCellChanges.js", "../../../../sdkjs/word/Editor/StructuredDocumentTags/BlockLevel.js", "../../../../sdkjs/word/Editor/StructuredDocumentTags/InlineLevel.js", "../../../../sdkjs/word/Editor/StructuredDocumentTags/SdtPr.js", "../../../../sdkjs/word/Editor/StructuredDocumentTags/SdtPrChanges.js", - "../../../../sdkjs/word/Editor/Serialize2.js", - "../../../../sdkjs/word/Editor/Spelling.js", + "../../../../sdkjs/word/Editor/Serialize2.js", + "../../../../sdkjs/word/Editor/Spelling.js", "../../../../sdkjs/word/Editor/Footnotes.js", "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js", + "../../../../sdkjs/word/Editor/Common.js", "../../../../sdkjs/word/Math/mathTypes.js", - "../../../../sdkjs/word/Math/mathText.js", - "../../../../sdkjs/word/Math/mathContent.js", - "../../../../sdkjs/word/Math/base.js", - "../../../../sdkjs/word/Math/fraction.js", - "../../../../sdkjs/word/Math/degree.js", - "../../../../sdkjs/word/Math/matrix.js", - "../../../../sdkjs/word/Math/limit.js", - "../../../../sdkjs/word/Math/nary.js", - "../../../../sdkjs/word/Math/radical.js", - "../../../../sdkjs/word/Math/operators.js", - "../../../../sdkjs/word/Math/accent.js", - "../../../../sdkjs/word/Math/borderBox.js", - "../../../../sdkjs/word/apiCommon.js", - "../../../../sdkjs/common/applyDocumentChanges.js", - "../../../../sdkjs/word/apiBuilder.js", - "../../../../sdkjs/slide/apiBuilder.js", + "../../../../sdkjs/word/Math/mathText.js", + "../../../../sdkjs/word/Math/mathContent.js", + "../../../../sdkjs/word/Math/base.js", + "../../../../sdkjs/word/Math/fraction.js", + "../../../../sdkjs/word/Math/degree.js", + "../../../../sdkjs/word/Math/matrix.js", + "../../../../sdkjs/word/Math/limit.js", + "../../../../sdkjs/word/Math/nary.js", + "../../../../sdkjs/word/Math/radical.js", + "../../../../sdkjs/word/Math/operators.js", + "../../../../sdkjs/word/Math/accent.js", + "../../../../sdkjs/word/Math/borderBox.js", + "../../../../sdkjs/word/apiBuilder.js", + "../../../../sdkjs/slide/apiBuilder.js", "../../../../sdkjs/cell/apiBuilder.js", - "../../../../sdkjs/common/Drawings/Format/OleObject.js", + "../../../../sdkjs/common/clipboard_base.js", + "../../../../sdkjs/common/text_input.js", + "../../../../sdkjs/common/Drawings/Format/OleObject.js", "../../../../sdkjs/common/Drawings/Format/DrawingContent.js", - "../../../../sdkjs/common/clipboard_base.js", - "../../../../sdkjs/common/plugins.js", - "../../../../sdkjs/common/text_input.js", - "../../../../sdkjs/common/easysax.js", - "../../../../sdkjs/common/openxml.js" + "../../../../sdkjs/common/plugins.js", + "../../../../sdkjs/cell/Private/comments.js" ]; \ No newline at end of file From 9bcc68f01f6900cdc131ab3cfaef12e1d3ef0c8e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Aug 2017 14:08:19 +0300 Subject: [PATCH 05/76] [SSE] Fix Bug 35552. --- apps/spreadsheeteditor/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index c88beaca4..4dbf880eb 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -2,7 +2,7 @@ .toolbar { &:not(.cover) { - z-index: 102; + z-index: 510; } &.masked { From 1b79fa38ff8e8dbfa3c6d5b2adc4171d266951d8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Aug 2017 14:37:27 +0300 Subject: [PATCH 06/76] Fix Bug 35554, Fix Bug 35556. --- apps/common/main/resources/less/buttons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 6ac4fc876..9d24ba59f 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -414,7 +414,7 @@ } } - button.active { + button.active:not(.disabled) { background-color: @color-dark; } From 83d91f50443fde3be406e19819d297e331b3550c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Aug 2017 16:25:39 +0300 Subject: [PATCH 07/76] Fix Bug 35491. --- apps/common/main/lib/component/Button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 7ac5773f1..e595e4952 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -130,7 +130,7 @@ define([ '<% } %>'; var templateHugeCaption = - '' + '' + ''; diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 61b1d0388..6232d5feb 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -144,13 +144,23 @@ line-height: 20px; } + .btn-fixflex-hcenter { + flex-grow: 1; + } + + .btn-fixflex-vcenter { + .caret { + vertical-align: inherit; + } + } + .inner-box-caption { margin: 0; height: 18px; } div.inner-box-icon { - height: 28px; // TODO: clear. FF bug 984869. fixed. isn't released. + height: 28px; // TODO: clear. Firefox bug 984869. fixed. isn't released. } } From 0bb1d90bb33ee6c362edc1ee51840944ad26c29c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 15 Aug 2017 14:44:59 +0300 Subject: [PATCH 39/76] [Common] rename document in title --- apps/common/main/lib/view/Header.js | 28 +++++++++++++++------ apps/common/main/resources/less/header.less | 10 +++++++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 31c010e7b..bca203c83 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -70,7 +70,9 @@ define([ ''); var templateRightBox = '
' + - '
' + + '
' + + '' + + '
' + '<%= textSaveEnd %>' + '
' + '
' + @@ -382,12 +384,13 @@ define([ if ( this.labelDocName ) this.labelDocName.off(); this.labelDocName = $html.find('#rib-doc-name'); - this.labelDocName.on({ - 'keydown': onDocNameKeyDown.bind(this) - }); + // this.labelDocName.attr('maxlength', 50); + this.labelDocName.text = function (text) { + this.val(text).attr('size', text.length); + } if ( this.documentCaption ) { - this.labelDocName.val( this.documentCaption ); + this.labelDocName.text( this.documentCaption ); } if ( !_.isUndefined(this.options.canRename) ) { @@ -485,8 +488,8 @@ define([ this.documentCaption = value; this.isModified && (value += '*'); if ( this.labelDocName ) { - this.labelDocName.val( value ); - this.labelDocName.attr('size', value.length); + this.labelDocName.text( value ); + // this.labelDocName.attr('size', value.length); this.setCanRename(true); } @@ -504,7 +507,7 @@ define([ var _name = this.documentCaption; changed && (_name += '*'); - this.labelDocName.val(_name); + this.labelDocName.text(_name); }, setCanBack: function (value) { @@ -529,7 +532,16 @@ define([ title: me.txtRename, placement: 'cursor'} ); + + label.on({ + 'keydown': onDocNameKeyDown.bind(this), + 'blur': function (e) { + + } + }); + } else { + label.off(); label.attr('disabled', true); var tip = label.data('bs.tooltip'); if ( tip ) { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 4fb0027eb..bc92bd3f1 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -100,8 +100,16 @@ border: 0 none; cursor: default; - &:focus { + &:hover:not(:disabled) { + border: 1px solid @gray-dark; + background-color: rgba(255,255,255,0.2); + } + + &:focus:not(:active) { + border: 1px solid @gray-dark; cursor: text; + background-color: white; + color: @gray-deep; } } From 2db70932f2ebfecee4bd0158d2f163aec8e27c23 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 15 Aug 2017 14:48:58 +0300 Subject: [PATCH 40/76] [PE] debug deployment for reporter mode --- apps/presentationeditor/main/app.reporter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app.reporter.js b/apps/presentationeditor/main/app.reporter.js index 5a3e481b2..80fd60cee 100644 --- a/apps/presentationeditor/main/app.reporter.js +++ b/apps/presentationeditor/main/app.reporter.js @@ -45,8 +45,8 @@ require.config({ // scripts that do not call define() to register a module baseUrl: '../../', paths: { - jquery : '../vendor/jquery/jquery', - underscore : '../vendor/underscore/underscore', + jquery : '../vendor/jquery/jquery.min', + underscore : '../vendor/underscore/underscore-min', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', allfonts : '../../sdkjs/common/AllFonts', From a264c1f687a52ac881eca06e5da403bda9fe3463 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 Aug 2017 16:15:21 +0300 Subject: [PATCH 41/76] [DE] Fix bug with move-buttons in Insert Footnote button in the toolbar. --- apps/common/main/resources/less/buttons.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 6232d5feb..61d783629 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -129,6 +129,12 @@ min-width: 0; } + button.small .icon { + width: 20px; + height: 20px; + min-width: 0; + } + &.dropdown-toggle { .caption { max-width: 100px; @@ -172,6 +178,9 @@ .mx-button-otherstates-icon2(@icon-size); } + .btn.small { + .mx-button-otherstates-icon2(20px); + } } } From 8811be667853c30846bc55acef05d943773b8397 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 Aug 2017 17:09:40 +0300 Subject: [PATCH 42/76] [SSE] Fix Bug 35602. --- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 35ca7695f..b5143d50e 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -742,10 +742,12 @@ define([ if (value) { item = this.cmbRegSettings.store.findWhere({value: value}); this.cmbRegSettings.setValue(item ? item.get('value') : Common.util.LanguageInfo.getLocalLanguageName(value)[1]); + item && (value = this.cmbRegSettings.getValue()); } else { - this.cmbRegSettings.setValue((this.mode.lang) ? Common.util.LanguageInfo.getLocalLanguageName(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.mode.lang)))[1] : 0x0409); + value = this.mode.lang ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.mode.lang)) : 0x0409; + this.cmbRegSettings.setValue(Common.util.LanguageInfo.getLocalLanguageName(value)[1]); } - this.updateRegionalExample(this.cmbRegSettings.getValue()); + this.updateRegionalExample(value); }, applySettings: function() { From 891a4dc91f20dd9b1daa3ee3e6361e434e29d6c4 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 15 Aug 2017 19:30:16 +0300 Subject: [PATCH 43/76] [Common] locked click on branding logo --- apps/common/main/lib/view/Header.js | 4 ++-- apps/common/main/resources/less/header.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 31c010e7b..887e8d25a 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -216,8 +216,8 @@ define([ 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 newDocumentPage = window.open(_url); + // newDocumentPage && newDocumentPage.focus(); }); $panelUsers.on('shown.bs.dropdown', function () { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 4fb0027eb..eec6af437 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -125,7 +125,7 @@ #header-logo { max-width: 200px; height: 100%; - cursor: pointer; + //cursor: pointer; padding: 7px 24px 7px 12px; i { From a000f857137c1239e7d96bda13b1ad461677e9ce Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 16 Aug 2017 10:50:25 +0300 Subject: [PATCH 44/76] Change maximum size for plugin window. --- apps/common/main/lib/view/Plugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index e39bc2e22..80c4243fe 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -315,7 +315,7 @@ define([ var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; if (!_options.header) header_footer -= 34; - this.bordersOffset = 25; + this.bordersOffset = 35; _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width; _options.height += header_footer; _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height; @@ -407,7 +407,7 @@ define([ Common.UI.Window.prototype.setWidth.call(this, width + borders_width); this.$window.css('left',(maxWidth - width - borders_width) / 2); - this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2) * 0.9); + this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2)); }, onWindowResize: function() { From 57197575e5d3ede530c153b4507f1ddabcfdce7f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 16 Aug 2017 15:10:19 +0300 Subject: [PATCH 45/76] Change name for Plugins tab. --- apps/common/main/lib/view/Plugins.js | 2 +- apps/documenteditor/main/locale/en.json | 2 +- apps/presentationeditor/main/locale/en.json | 2 +- apps/spreadsheeteditor/main/locale/en.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 80c4243fe..beb354183 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -301,7 +301,7 @@ define([ strPlugins: 'Plugins', textLoading: 'Loading', textStart: 'Start', - groupCaption: 'Add-ons' + groupCaption: 'Plugins' }, Common.Views.Plugins || {})); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 9de27343c..76566bd5e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -186,7 +186,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", - "Common.Views.Plugins.groupCaption": "Add-ons", + "Common.Views.Plugins.groupCaption": "Plugins", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index dbac68533..614d7278d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -119,7 +119,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", - "Common.Views.Plugins.groupCaption": "Add-ons", + "Common.Views.Plugins.groupCaption": "Plugins", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index e3f105d64..6e4499751 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -105,7 +105,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", - "Common.Views.Plugins.groupCaption": "Add-ons", + "Common.Views.Plugins.groupCaption": "Plugins", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", From d822aacd47ad31fc820a4b26d44decd1586f97ec Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 16 Aug 2017 15:46:30 +0300 Subject: [PATCH 46/76] Change opacity for editor modal-mask. --- apps/common/main/resources/less/window.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 351069a5c..b6afa837e 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -14,7 +14,7 @@ left: 0; width: 100%; height: 100%; - opacity: 0; + opacity: 0.2; background-color: rgb(0,0,0); z-index: @zindex-modal - 1; } From 8fe9914a818dc7a52fd59a29536e89f07301fe58 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 16 Aug 2017 17:40:59 +0300 Subject: [PATCH 47/76] Use new icons for plugins. --- apps/common/main/lib/view/Plugins.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index beb354183..774a92e4c 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -95,7 +95,7 @@ define([ enableKeyEvents: false, itemTemplate: _.template([ '
', - '
1) ? 1 : 0] %>);">
', + '
1) ? 1 : 0) + (variations[currentVariation].get("icons").length>2 ? 2 : 0)] %>);">
', '<% if (variations.length>1) { %>', '
', '<% } %>', @@ -149,10 +149,11 @@ define([ var me = this; var _group = $('
'); this.storePlugins.each(function (model) { - var modes = model.get('variations'); - var guid = model.get('guid'); - var _icon_url = model.get('baseUrl') + modes[model.get('currentVariation')].get('icons')[(window.devicePixelRatio > 1) ? 1 : 0]; - var btn = new Common.UI.Button({ + var modes = model.get('variations'), + guid = model.get('guid'), + icons = modes[model.get('currentVariation')].get('icons'), + _icon_url = model.get('baseUrl') + icons[((window.devicePixelRatio > 1) ? 1 : 0) + (icons.length>2 ? 2 : 0)], + btn = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconImg: _icon_url, caption: model.get('name'), From 33a08d6df0c550ed92c7fcf3c2913697cec5492d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 16 Aug 2017 17:59:06 +0300 Subject: [PATCH 48/76] Change size for plugin icon. --- apps/common/main/resources/less/plugins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index 862005198..9ede1fcd6 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -125,7 +125,7 @@ #plugins-panel { .x-huge.icon-top { img { - height: 20px; + height: 26px; } .caption { From 43fa6a2c96f53adc89c56d3223504074d020ac49 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 16 Aug 2017 19:30:19 +0300 Subject: [PATCH 49/76] deploy favicon.ico --- build/documenteditor.json | 2 +- build/presentationeditor.json | 2 +- build/spreadsheeteditor.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/documenteditor.json b/build/documenteditor.json index c630b14bb..cf848dd71 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -119,7 +119,7 @@ "expand": true, "cwd": "../apps/documenteditor/main/resources/img/", "src": [ - "**/*.{png,jpg,gif}" + "**/*.{png,jpg,gif,ico}" ], "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img/" } diff --git a/build/presentationeditor.json b/build/presentationeditor.json index ed4289576..b929b26d8 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -119,7 +119,7 @@ "expand": true, "cwd": "../apps/presentationeditor/main/resources/img/", "src": [ - "**/*.{png,jpg,gif}" + "**/*.{png,jpg,gif,ico}" ], "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img/" } diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 650425953..9f3bef6c4 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -119,7 +119,7 @@ "expand": true, "cwd": "../apps/spreadsheeteditor/main/resources/img/", "src": [ - "**/*.{png,jpg,gif}" + "**/*.{png,jpg,gif,ico}" ], "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/" } From 5c21e657f0325bc132d4b64f5abec8f34c3a6d1f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 10:28:17 +0300 Subject: [PATCH 50/76] Fix Bug 35617. --- apps/common/main/lib/controller/Plugins.js | 1 + apps/common/main/lib/view/Plugins.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index d927184cf..9e009b19f 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -110,6 +110,7 @@ define([ var $panel = toolbar.$el.find('#plugins-panel'); if ( $panel ) { this.panelPlugins.renderTo( $panel ); + this.panelPlugins._onAppReady(); } } }, diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 774a92e4c..32a32d181 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -73,6 +73,7 @@ define([ initialize: function(options) { _.extend(this, options); this._locked = false; + this._pluginsIsInited = false; this._state = { DisabledControls: true }; @@ -266,7 +267,10 @@ define([ }, _onAppReady: function (mode) { + if (this._pluginsIsInited) return; + var me = this; + this._pluginsIsInited = (this.storePlugins.length>0); this.storePlugins.each(function(model) { var _plugin_btn = model.get('button'); From 7624fb1d5d7984a2b7ded7fc774c372e327de8ff Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 10:51:05 +0300 Subject: [PATCH 51/76] Change plugins window offset. --- apps/common/main/lib/view/Plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 32a32d181..cb23422d4 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -320,7 +320,7 @@ define([ var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; if (!_options.header) header_footer -= 34; - this.bordersOffset = 35; + this.bordersOffset = 40; _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width; _options.height += header_footer; _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height; From 9412d9bf12d53f2ac90a699e7f34a7335d12a183 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 11:40:50 +0300 Subject: [PATCH 52/76] Prevent user-select plugins modal window. --- apps/common/main/resources/less/window.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index b6afa837e..74f9c4000 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -96,6 +96,10 @@ &.modal { z-index: @zindex-modal; + -ms-touch-action: none; + -moz-user-select:none; + -khtml-user-select:none; + user-select:none; } &.dethrone { From 1843040605b4bd79c1819d6d9b14c92a6dd04022 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 15:39:28 +0300 Subject: [PATCH 53/76] Fix Bug 35626. --- apps/common/main/lib/collection/Users.js | 9 +++++++++ apps/common/main/lib/view/Header.js | 23 ++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/collection/Users.js b/apps/common/main/lib/collection/Users.js index 546851549..e9f472a50 100644 --- a/apps/common/main/lib/collection/Users.js +++ b/apps/common/main/lib/collection/Users.js @@ -60,6 +60,15 @@ define([ return count; }, + getEditingCount: function() { + var count = 0; + this.each(function(user){ + user.get('online') && !user.get('view') && ++count; + }); + + return count; + }, + findUser: function(id) { return this.find( function(model){ diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 887e8d25a..b9393a254 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -120,7 +120,7 @@ define([ $userList.scroller && $userList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true}); } - applyUsers( collection.getOnlineCount() ); + applyUsers( collection.getEditingCount() ); }; function onUsersChanged(model, collection) { @@ -129,13 +129,13 @@ define([ $userList.scroller && $userList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true}); } - applyUsers(model.collection.getOnlineCount()); + applyUsers(model.collection.getEditingCount()); }; function onResetUsers(collection, opts) { - var usercount = collection.getOnlineCount(); + var usercount = collection.getEditingCount(); if ( $userList ) { - if ( usercount > 1 ) { + if ( usercount > 1 || usercount > 0 && !appConfig.isEdit) { $userList.html(templateUserList({ users: collection.models, usertpl: _.template(templateUserItem), @@ -157,7 +157,7 @@ define([ }; function applyUsers(count) { - if ( count > 1 ) { + if ( count > 1 || count > 0 && !appConfig.isEdit) { $btnUsers .attr('data-toggle', 'dropdown') .addClass('dropdown-toggle') @@ -174,13 +174,13 @@ define([ } $btnUsers.find('.caption') - .css({'font-size': (count > 1 ? '12px' : '14px'), - 'margin-top': (count > 1 ? '0' : '-1px')}) - .html(count > 1 ? count : '+'); + .css({'font-size': ((count > 1 || count > 0 && !appConfig.isEdit) ? '12px' : '14px'), + 'margin-top': ((count > 1 || count > 0 && !appConfig.isEdit) ? '0' : '-1px')}) + .html((count > 1 || count > 0 && !appConfig.isEdit) ? count : '+'); var usertip = $btnUsers.data('bs.tooltip'); if ( usertip ) { - usertip.options.title = count > 1 ? usertip.options.titleExt : usertip.options.titleNorm; + usertip.options.title = (count > 1 || count > 0 && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm; usertip.setContent(); } } @@ -227,8 +227,9 @@ define([ $panelUsers.find('.cousers-menu') .on('click', function(e) { return false; }); + var editingUsers = storeUsers.getEditingCount(); $btnUsers.tooltip({ - title: 'Manage document access rights', + title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit) ? me.tipViewUsers : me.tipAccessRights, titleNorm: me.tipAccessRights, titleExt: me.tipViewUsers, placement: 'bottom', @@ -241,7 +242,7 @@ define([ $labelChangeRights.on('click', onUsersClick.bind(me)); $labelChangeRights[(!mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length)?'show':'hide'](); - $panelUsers[(storeUsers.size() > 1 || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide'](); + $panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide'](); if ( $saveStatus ) { $saveStatus.attr('data-width', me.textSaveExpander); From 4f37e52b8ca37f0e626b9ff853ca709cd4b3b16e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 16:44:57 +0300 Subject: [PATCH 54/76] Fix Bug 35626. refactoring rev. 1843040605b4bd79c1819d6d9b14c92a6dd04022. --- apps/common/main/lib/view/Header.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index b9393a254..2eb360396 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -135,7 +135,7 @@ define([ function onResetUsers(collection, opts) { var usercount = collection.getEditingCount(); if ( $userList ) { - if ( usercount > 1 || usercount > 0 && !appConfig.isEdit) { + if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit) { $userList.html(templateUserList({ users: collection.models, usertpl: _.template(templateUserItem), @@ -157,7 +157,7 @@ define([ }; function applyUsers(count) { - if ( count > 1 || count > 0 && !appConfig.isEdit) { + if ( count > 1 || count > 0 && appConfig && !appConfig.isEdit) { $btnUsers .attr('data-toggle', 'dropdown') .addClass('dropdown-toggle') @@ -174,13 +174,13 @@ define([ } $btnUsers.find('.caption') - .css({'font-size': ((count > 1 || count > 0 && !appConfig.isEdit) ? '12px' : '14px'), - 'margin-top': ((count > 1 || count > 0 && !appConfig.isEdit) ? '0' : '-1px')}) - .html((count > 1 || count > 0 && !appConfig.isEdit) ? count : '+'); + .css({'font-size': ((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? '12px' : '14px'), + 'margin-top': ((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? '0' : '-1px')}) + .html((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? count : '+'); var usertip = $btnUsers.data('bs.tooltip'); if ( usertip ) { - usertip.options.title = (count > 1 || count > 0 && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm; + usertip.options.title = (count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm; usertip.setContent(); } } From f5a32b57d4103467289bb1e713861b95a61881fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 17:03:36 +0300 Subject: [PATCH 55/76] Fix bug with default logo in About page. --- apps/common/main/resources/less/about.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index aa1e469ba..758f4032e 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -1,7 +1,7 @@ .about-dlg { .asc-about-office { background-repeat: no-repeat; - .background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 420px); + .background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 340px); width: 340px; height: 55px; From 8900b912d755e708b9d3587525dc984fc67705c6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 17 Aug 2017 17:32:37 +0300 Subject: [PATCH 56/76] User icon isn't displayed in FF, Safari on retina. --- apps/common/main/lib/view/Header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 2eb360396..561a26bac 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -81,7 +81,7 @@ define([ // '' + '