diff --git a/apps/common/main/lib/component/LoadMask.js b/apps/common/main/lib/component/LoadMask.js index c9634f2aa..1742b2064 100644 --- a/apps/common/main/lib/component/LoadMask.js +++ b/apps/common/main/lib/component/LoadMask.js @@ -131,6 +131,8 @@ define([ // if (ownerEl.height()<1 || ownerEl.width()<1) // loaderEl.css({visibility: 'hidden'}); + loaderEl.css('min-width', $('.asc-loadmask-title', loaderEl).width() + 105); + if (ownerEl && ownerEl.closest('.asc-window.modal').length==0) Common.util.Shortcuts.suspendEvents(); },500); @@ -158,7 +160,9 @@ define([ this.title = title; if (this.ownerEl && this.ownerEl.ismasked && this.loaderEl){ - $('.asc-loadmask-title', this.loaderEl).html(title); + var el = $('.asc-loadmask-title', this.loaderEl); + el.html(title); + this.loaderEl.css('min-width', el.width() + 105); } }, diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index f6f110811..bbbb1bbb8 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -89,12 +89,8 @@ define([ template : _.template([ '
', - '
', - '
', - '
', - '
', - '
', - '
', + '
', + '
', '<% if (this.options.enableKeyEvents) { %>', '', '<% } %>', diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 599ab11cf..5847e14ab 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -268,9 +268,15 @@ define([ }); tab.$el.children().on( {dragstart: $.proxy(function (e) { - var event = e.originalEvent, - img = document.createElement('div'); - event.dataTransfer.setDragImage(img, 0, 0); + var event = e.originalEvent; + if (!Common.Utils.isIE) { + var img = document.createElement('div'); + event.dataTransfer.setDragImage(img, 0, 0); + } else { + this.bar.selectTabs.forEach(function (tab) { + tab.$el.find('span').prop('title', ''); + }); + } event.dataTransfer.effectAllowed = 'move'; this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs); }, this), @@ -279,8 +285,14 @@ define([ if (!this.bar.isEditFormula) { this.bar.$el.find('.mousemove').removeClass('mousemove right'); $(e.currentTarget).parent().addClass('mousemove'); - var data = event.dataTransfer.getData("onlyoffice"); - event.dataTransfer.dropEffect = data ? 'move' : 'none'; + var data; + if (!Common.Utils.isIE) { + data = event.dataTransfer.getData('onlyoffice'); + event.dataTransfer.dropEffect = data ? 'move' : 'none'; + } else { + data = event.dataTransfer.getData('text'); + event.dataTransfer.dropEffect = data === 'sheet' ? 'move' : 'none'; + } } else { event.dataTransfer.dropEffect = 'none'; } @@ -356,8 +368,14 @@ define([ event.dataTransfer.effectAllowed = 'move'; }, this)); addEvent(this.$bar[0], 'dragenter', _.bind(function (event) { - var data = event.dataTransfer.getData("onlyoffice"); - event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none'; + var data; + if (!Common.Utils.isIE) { + data = event.dataTransfer.getData('onlyoffice'); + event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none'; + } else { + data = event.dataTransfer.getData('text'); + event.dataTransfer.dropEffect = (data === 'sheet' && !this.isEditFormula) ? 'move' : 'none'; + } }, this)); addEvent(this.$bar[0], 'dragover', _.bind(function (event) { if (event.preventDefault) { diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 2ae5c19c5..3af8ce85c 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -205,6 +205,7 @@ define([ plugin.set_Name(item.get('name')); plugin.set_Guid(item.get('guid')); plugin.set_BaseUrl(item.get('baseUrl')); + plugin.set_MinVersion(item.get('minVersion')); var variations = item.get('variations'), variationsArr = []; @@ -511,7 +512,8 @@ define([ var me = this; var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = me.appOptions.isEdit, - editor = me.editor; + editor = me.editor, + apiVersion = me.api.GetVersion(); if ( pluginsdata instanceof Array ) { var arr = [], arrUI = [], lang = me.appOptions.lang.split(/[\-_]/)[0]; @@ -550,7 +552,7 @@ define([ description: description, index: variationsArr.length, url: itemVar.url, - icons: itemVar.icons, + icons: itemVar.icons2 || itemVar.icons, buttons: itemVar.buttons, visible: visible, help: itemVar.help @@ -565,6 +567,9 @@ define([ if (typeof item.nameLocale == 'object') name = item.nameLocale[lang] || item.nameLocale['en'] || name || ''; + if (pluginVisible) + pluginVisible = me.checkPluginVersion(apiVersion, item.minVersion); + arr.push(new Common.Models.Plugin({ name : name, guid: item.guid, @@ -573,7 +578,8 @@ define([ currentVariation: 0, visible: pluginVisible, groupName: (item.group) ? item.group.name : '', - groupRank: (item.group) ? item.group.rank : 0 + groupRank: (item.group) ? item.group.rank : 0, + minVersion: item.minVersion })); } }); @@ -610,6 +616,25 @@ define([ } }, + checkPluginVersion: function(apiVersion, pluginVersion) { + if (apiVersion && apiVersion!=='develop' && pluginVersion && typeof pluginVersion == 'string') { + var res = pluginVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/), + apires = apiVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/); + if (res && res.length>1 && apires && apires.length>1) { + for (var i=0; i<3; i++) { + var pluginVer = res[i+1] ? parseInt(res[i+1]) : 0, + apiVer = apires[i+1] ? parseInt(apires[i+1]) : 0; + if (pluginVer>apiVer) + return false; + if (pluginVer'); } - var $parent = this.labelDocName.parent(); - var _left_width = $parent.position().left, - _right_width = $parent.next().outerWidth(); + if (!config.isEdit || !config.customization || !config.customization.compactHeader) { + var $parent = this.labelDocName.parent(); + var _left_width = $parent.position().left, + _right_width = $parent.next().outerWidth(); - if ( _left_width < _right_width ) - this.labelDocName.parent().css('padding-left', _right_width - _left_width); - else this.labelDocName.parent().css('padding-right', _left_width - _right_width); + if ( _left_width < _right_width ) + this.labelDocName.parent().css('padding-left', _right_width - _left_width); + else this.labelDocName.parent().css('padding-right', _left_width - _right_width); + } } } diff --git a/apps/common/main/resources/img/about/logo-white_s.svg b/apps/common/main/resources/img/about/logo-white_s.svg new file mode 100644 index 000000000..95b51b5ca --- /dev/null +++ b/apps/common/main/resources/img/about/logo-white_s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/about/logo.png b/apps/common/main/resources/img/about/logo.png deleted file mode 100644 index 1de95f26b..000000000 Binary files a/apps/common/main/resources/img/about/logo.png and /dev/null differ diff --git a/apps/common/main/resources/img/about/logo@2x.png b/apps/common/main/resources/img/about/logo@2x.png deleted file mode 100644 index d6761c806..000000000 Binary files a/apps/common/main/resources/img/about/logo@2x.png and /dev/null differ diff --git a/apps/common/main/resources/img/about/logo_s.svg b/apps/common/main/resources/img/about/logo_s.svg new file mode 100644 index 000000000..04df9911d --- /dev/null +++ b/apps/common/main/resources/img/about/logo_s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png index 03fb0999d..06748aa9b 100755 Binary files a/apps/common/main/resources/img/controls/common-controls.png and b/apps/common/main/resources/img/controls/common-controls.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@1.5x.png b/apps/common/main/resources/img/controls/common-controls@1.5x.png index 1fd7da019..07cd6907c 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@1.5x.png and b/apps/common/main/resources/img/controls/common-controls@1.5x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index 7d368d53e..7284ca270 100755 Binary files a/apps/common/main/resources/img/controls/common-controls@2x.png and b/apps/common/main/resources/img/controls/common-controls@2x.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png b/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png index dcec675fb..c41c5dafd 100644 Binary files a/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png and b/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png differ diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index 84be73a77..781f05365 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -4,18 +4,15 @@ margin-bottom: 5px; &:before { - content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')"); + //content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')"); + content: ~"url('@{common-image-const-path}/about/logo_s.svg')"; - @media only screen { - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - content: ~"url('@{common-image-const-path}/about/logo@2x.png')"; - display: block; - transform: scale(.5); - } + .theme-dark & { + content: ~"url('@{common-image-const-path}/about/logo-white_s.svg')"; } + + height: 45px; + width: auto; } } diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index e662126f2..4720f2cbe 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -265,11 +265,11 @@ } .btn-edit { - background-position: -2px -233px; + background-position: -2px -232px; } .btn-delete { - background-position: -22px -233px; + background-position: -22px -232px; } .btn-accept { @@ -293,7 +293,7 @@ width: 7px; height: 12px; left: 6px; - top: -2px; + top: 0px; } &.comment-resolved { diff --git a/apps/common/main/resources/less/slider.less b/apps/common/main/resources/less/slider.less index ed156501b..fc134d2bf 100644 --- a/apps/common/main/resources/less/slider.less +++ b/apps/common/main/resources/less/slider.less @@ -2,33 +2,51 @@ position: relative; height: 18px; + &.single-slider { + padding-top: 7px; + + .track { + @track-height: 4px; + height: @track-height; + border: @track-height / 2 solid @border-regular-control-ie; + border: @track-height / 2 solid @border-regular-control; + border-radius: @track-height / 2; + width: calc(100% + @track-height); + margin-left: -@track-height / 2; + } + + .thumb { + @thumb-width: 12px; + width: @thumb-width; + height: @thumb-width; + + border: @scaled-one-px-value-ie solid @icon-normal-ie; + border: @scaled-one-px-value solid @icon-normal; + background-color: @background-normal-ie; + background-color: @background-normal; + border-radius: @thumb-width / 2; + + top: 3px; + margin-left: @thumb-width / -2; + + &.active { + } + } + } + .thumb { position: absolute; left: 0; - top: 0; - width: 13px; - height: 15px; margin-left: -7px; cursor: default; - background-position: @slide-thumb-offset-x @slide-thumb-offset-y; &.active { - background-position: @slide-thumb-offset-x @slide-thumb-offset-y - 30px; } } .track { height: 18px; background-color: transparent; - .track-left { - background-position: @slide-track-offset-x @slide-track-offset-y; - } - .track-right { - background-position: @slide-track-offset-x - 7px @slide-track-offset-y; - } - .track-center { - background-position: @slide-track-offset-x @slide-track-offset-y - 18px; - } div { width: 7px; diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less index 73cb0cf4a..9e56c1e8d 100644 --- a/apps/common/main/resources/less/spinner.less +++ b/apps/common/main/resources/less/spinner.less @@ -61,7 +61,7 @@ opacity: @component-disabled-opacity; } - &:hover { + &:hover:not(:disabled):not(.disabled) { background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } @@ -79,4 +79,4 @@ transform: rotate(-135deg) translate(2px,2px); } } -} \ No newline at end of file +} diff --git a/apps/common/mobile/lib/controller/Plugins.js b/apps/common/mobile/lib/controller/Plugins.js index cac9f2113..4bb6a6506 100644 --- a/apps/common/mobile/lib/controller/Plugins.js +++ b/apps/common/mobile/lib/controller/Plugins.js @@ -238,6 +238,7 @@ define([ plugin.set_Name(item['name']); plugin.set_Guid(item['guid']); plugin.set_BaseUrl(item['baseUrl']); + plugin.set_MinVersion(item['minVersion']); var variations = item['variations'], variationsArr = []; diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 9c5e43e65..4a76a9bbf 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -67,6 +67,7 @@ define([ this.addListeners({ 'Links': { 'links:contents': this.onTableContents, + 'links:contents-open': this.onTableContentsOpen, 'links:update': this.onTableContentsUpdate, 'links:notes': this.onNotesClick, 'links:hyperlink': this.onHyperlinkClick, @@ -79,6 +80,7 @@ define([ 'DocumentHolder': { 'links:contents': this.onTableContents, 'links:update': this.onTableContentsUpdate, + 'links:contents-open': this.onTableContentsOpen, 'links:caption': this.onCaptionClick } }); @@ -309,6 +311,10 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, + onTableContentsOpen: function(menu) { + this.api.asc_getButtonsTOC(menu.items[0].options.previewId, menu.items[1].options.previewId); + }, + onNotesClick: function(type) { var me = this; switch (type) { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 5bd678cb9..d83c38d90 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1163,12 +1163,6 @@ define([ $('.doc-placeholder').remove(); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog(); - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - Common.UI.Themes.toggleTheme(); - - // getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); - }) }, onLicenseChanged: function(params) { @@ -1680,12 +1674,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1791,10 +1782,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index 28939bc82..04b925479 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -56,12 +56,18 @@ define([ button.on('click', function (b, e) { me.fireEvent('links:contents', [0]); }); + button.menu.on('show:after', function (menu, e) { + me.fireEvent('links:contents-open', [menu]); + }); }); this.contentsMenu.on('item:click', function (menu, item, e) { setTimeout(function(){ me.fireEvent('links:contents', [item.value, true]); }, 10); }); + this.contentsMenu.on('show:after', function (menu, e) { + me.fireEvent('links:contents-open', [menu]); + }); this.btnContentsUpdate.menu.on('item:click', function (menu, item, e) { me.fireEvent('links:update', [item.value]); @@ -229,15 +235,15 @@ define([ (new Promise(function (accept, reject) { accept(); })).then(function(){ - var contentsTemplate = _.template('
'); + var contentsTemplate = _.template('
'); me.btnsContents.forEach( function(btn) { btn.updateHint( me.tipContents ); var _menu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0}, - {template: contentsTemplate, offsety: 72, value: 1}, + {template: contentsTemplate, offsety: 0, value: 0, previewId: 'id-toolbar-toc-0'}, + {template: contentsTemplate, offsety: 72, value: 1, previewId: 'id-toolbar-toc-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] @@ -249,8 +255,8 @@ define([ me.contentsMenu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0}, - {template: contentsTemplate, offsety: 72, value: 1}, + {template: contentsTemplate, offsety: 0, value: 0, previewId: 'id-toolbar-toc-menu-0'}, + {template: contentsTemplate, offsety: 72, value: 1, previewId: 'id-toolbar-toc-menu-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png deleted file mode 100644 index c7f8a04b2..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png index 5def4781c..7fabeedd9 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png and b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png index 0f342c266..aa20557e6 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png and b/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-all-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-all-for-cells-only.png deleted file mode 100644 index 38ab0e519..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-all-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png deleted file mode 100644 index 0caec51b7..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-no-outer-or-inner.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-no-outer-or-inner.png deleted file mode 100644 index 14bbd7ba0..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-no-outer-or-inner.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outer-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outer-for-cells-only.png deleted file mode 100644 index b158cfb64..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outer-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png deleted file mode 100644 index 3d7a62685..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png deleted file mode 100644 index 9faf9efc4..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-outer-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-outer-for-cells-only.png deleted file mode 100644 index be3f88fa5..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-outer-for-cells-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png deleted file mode 100644 index b9d240e20..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-and-inner-lines.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-and-inner-lines.png deleted file mode 100644 index ba542c52d..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-and-inner-lines.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-only.png deleted file mode 100644 index 5c0ccc7e0..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-bottom-outside-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-bottom-outside-only.png deleted file mode 100644 index 3f874a95e..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-bottom-outside-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-inner-lines-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-inner-lines-only.png deleted file mode 100644 index c229c3538..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-inner-lines-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-left-outside-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-left-outside-only.png deleted file mode 100644 index 4040613a7..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-left-outside-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-no.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-no.png deleted file mode 100644 index 421fced49..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-no.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png deleted file mode 100644 index 5c11ea2ae..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-top-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-top-only.png deleted file mode 100644 index 8c8372684..000000000 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-top-only.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/submit-form.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/submit-form.png index c55e2e6b5..456fd1ee1 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar/2x/big/submit-form.png and b/apps/documenteditor/main/resources/img/toolbar/2x/big/submit-form.png differ diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index b8cef6cd6..ad6824616 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -48,10 +48,8 @@ > li > a.item-contents { div { - .background-ximage-v2('toolbar/contents.png', 246px, @commonimage: false); background-color: #fff; - width: 246px; - height: @contents-menu-item-height; + width: 248px; .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); @@ -61,6 +59,10 @@ .box-shadow(0 0 0 2px @border-control-focus-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); } + + canvas { + vertical-align: middle; + } } &:hover, &:focus { @@ -72,18 +74,6 @@ } } } - - .loop(@counter) when (@counter > 0) { - .loop((@counter - 1)); - li:nth-child(@{counter}) > a.item-contents { - div { - @incr-height: (@counter - 1)*@contents-menu-item-height; - background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})"; - } - } - } - - .loop(2); } // page number position diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 82b2c7728..58839bd12 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -886,12 +886,6 @@ define([ $('.doc-placeholder').remove(); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog(); - - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - - Common.UI.Themes.toggleTheme(); - }) }, onLicenseChanged: function(params) { @@ -1367,12 +1361,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1465,10 +1456,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 8f9e5a56d..2cfc5e353 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1628,7 +1628,7 @@ define([ store: PE.getCollection('SlideLayouts'), itemTemplate: _.template([ '
', - '
', + '
', '
<%= title %>
', '
' ].join('')) diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 67160a27c..5b82f595b 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -151,7 +151,9 @@ } .slidenum-div { - background-color: @body-bg; + background-color: @background-normal-ie; + background-color: @background-normal; + color: @text-normal-ie; color: @text-normal; padding: 5px 12px; border: 1px solid rgba(0, 0, 0, 0.15); diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 1c03b892b..13a3fef13 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -38,6 +38,7 @@ text-align: center; text-overflow: ellipsis; white-space: normal; + line-height: 14px; } & > div:first-child { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index c9eaaa928..fa9ab1001 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -952,11 +952,6 @@ define([ Common.Gateway.documentReady(); if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && (Common.Utils.InternalSettings.get("guest-username")===null)) this.showRenameUserDialog(); - - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - Common.UI.Themes.toggleTheme(); - }) }, onLicenseChanged: function(params) { @@ -1566,12 +1561,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1679,6 +1671,10 @@ define([ config.msg = this.errorPasteMultiSelect; break; + case Asc.c_oAscError.ID.PivotWithoutUnderlyingData: + config.msg = this.errorPivotWithoutUnderlying; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1725,10 +1721,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, @@ -2924,7 +2918,8 @@ define([ errorPivotGroup: 'Cannot group that selection.', leavePageTextOnClose: 'All unsaved changes in this document will be lost.
Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.', errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.', - textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.' + textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', + errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js index fabddb861..aac363f90 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js @@ -214,7 +214,7 @@ define([ onFieldsDragStart: function (item, index, event) { this._state.field = {record: item.model}; event.originalEvent.dataTransfer.effectAllowed = 'move'; - event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); + !Common.Utils.isIE && event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); this.pivotIndex = index; this.fromListView = this.fieldsList.$el[0].id; }, @@ -222,7 +222,7 @@ define([ onItemsDragStart: function (type, listview, item, index, event) { this._state.field = {record: item.model, type: type}; event.originalEvent.dataTransfer.effectAllowed = 'move'; - event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); + !Common.Utils.isIE && event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); this.itemIndex = index; this.pivotIndex = listview.store.at(index).attributes.pivotIndex; this.fromListView = listview.$el[0].id; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index fa373495d..3ee9d402e 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -203,6 +203,7 @@ define([ }, this), 'tab:dragstart': _.bind(function (dataTransfer, selectTabs) { + Common.Utils.isIE && (this.isDrop = false); Common.UI.Menu.Manager.hideAll(); this.api.asc_closeCellEditor(); var arrTabs = [], @@ -234,12 +235,18 @@ define([ arr.push({type: 'names', value: arrName}); arr.push({type: 'key', value: Common.Utils.InternalSettings.get("sse-doc-info-key")}); var json = JSON.stringify(arr); - dataTransfer.setData("onlyoffice", json); + if (!Common.Utils.isIE) { + dataTransfer.setData('onlyoffice', json); + } else { + dataTransfer.setData('text', 'sheet'); + this.dataTransfer = json; + } this.dropTabs = selectTabs; }, this), 'tab:drop': _.bind(function (dataTransfer, index) { - if (this.isEditFormula) return; - var data = dataTransfer.getData("onlyoffice"); + if (this.isEditFormula || (Common.Utils.isIE && this.dataTransfer === undefined)) return; + Common.Utils.isIE && (this.isDrop = true); + var data = !Common.Utils.isIE ? dataTransfer.getData('onlyoffice') : this.dataTransfer; if (data) { var arrData = JSON.parse(data); if (arrData) { @@ -277,7 +284,7 @@ define([ } }, this), 'tab:dragend': _.bind(function (cut) { - if (cut) { + if (cut && !(Common.Utils.isIE && this.isDrop === false)) { if (this.dropTabs.length > 0) { var arr = []; this.dropTabs.forEach(function (tab) { @@ -287,6 +294,10 @@ define([ } } this.dropTabs = undefined; + if (Common.Utils.isIE) { + this.isDrop = undefined; + this.dataTransfer = undefined; + } Common.NotificationCenter.trigger('tabs:dragend', this); }, this) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 79a004543..aec9561cc 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -658,6 +658,7 @@ "SSE.Controllers.Main.errorPasteSlicerError": "Table slicers cannot be copied from one workbook to another.", "SSE.Controllers.Main.errorPivotGroup": "Cannot group that selection.", "SSE.Controllers.Main.errorPivotOverlap": "A pivot table report cannot overlap a table.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "The Pivot Table report was saved without the underlying data.
Use the 'Refresh' button to update the report.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "Unfortunately, it is not possible to print more than 1500 pages at once in the current program version.
This restriction will be removed in the upcoming releases.", "SSE.Controllers.Main.errorProcessSaveResult": "Saving failed", "SSE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png index 861c6474c..b0a791bf1 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png differ