From c708c550566a85055599d5acadb660991201eb0b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 30 Aug 2019 16:34:11 +0300 Subject: [PATCH 001/265] [SSE] Bug 37388 --- apps/common/main/lib/component/Tab.js | 9 ++++++ apps/common/main/lib/component/TabBar.js | 32 +++++++++++++++---- .../main/resources/less/statusbar.less | 8 +++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 29e93b32c..89f6f28e3 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -82,6 +82,10 @@ define([ this.$el.addClass('active'); }, + isSelected: function() { + return this.$el.hasClass('selected'); + }, + deactivate: function(){ this.$el.removeClass('active'); }, @@ -110,6 +114,11 @@ define([ this.$el.removeClass(cls); }, + toggleClass: function(cls) { + if (cls.length) + this.$el.toggleClass(cls); + }, + hasClass: function(cls) { return this.$el.hasClass(cls); }, diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 0c6868add..b4d3f7803 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -69,12 +69,20 @@ define([ }; StateManager.prototype.attach = function (tab) { - tab.changeState = $.proxy(function () { - this.trigger('tab:change', tab); - this.bar.$el.find('ul > li.active').removeClass('active'); - tab.activate(); + tab.changeState = $.proxy(function (select) { + if (select) { + tab.toggleClass('selected'); + } else { + if (!tab.isSelected()) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + tab.addClass('selected'); + } + this.trigger('tab:change', tab); + this.bar.$el.find('ul > li.active').removeClass('active'); + tab.activate(); - this.bar.trigger('tab:changed', this.bar, this.bar.tabs.indexOf(tab), tab); + this.bar.trigger('tab:changed', this.bar, this.bar.tabs.indexOf(tab), tab); + } }, this); var dragHelper = new (function() { @@ -283,10 +291,22 @@ define([ }); tab.$el.on({ - click: $.proxy(function () { + click: $.proxy(function (event) { if (!tab.disabled && !tab.$el.hasClass('active')) { if (tab.control == 'manual') { this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); + } else if (event.ctrlKey || event.metaKey) { + tab.changeState(true); + } else if (event.shiftKey) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + var $active = this.bar.$el.find('ul > li.active'), + indexAct = $active.index(), + indexCur = tab.sheetindex; + var startIndex = (indexCur > indexAct) ? indexAct : indexCur, + endIndex = (indexCur > indexAct) ? indexCur : indexAct; + for(var i = startIndex; i <= endIndex; i++) { + this.bar.tabs[i].changeState(true); + } } else { tab.changeState(); } diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index da2c0b79d..58dfef726 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -194,6 +194,14 @@ } } + &.selected { + > a { + border-bottom-color: @body-bg; + background-color: @body-bg; + box-shadow: 0px 2px 0 @gray-deep inset; + } + } + &.coauth-locked { > a { outline: none; From 0cc3ddfca64fa9d9be224b4f1306d2fb57fbb540 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 2 Sep 2019 13:52:16 +0300 Subject: [PATCH 002/265] [SSE] Bug 37388 --- apps/common/main/lib/component/Tab.js | 2 +- apps/common/main/lib/component/TabBar.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 89f6f28e3..b3b5644ef 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -51,7 +51,7 @@ define([ this.active = false; this.label = 'Tab'; this.cls = ''; - this.template = _.template(['
  • ', + this.template = _.template(['
  • ', '<%- label %>', '
    • '].join('')); diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index b4d3f7803..8e5ff01a3 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -292,10 +292,8 @@ define([ tab.$el.on({ click: $.proxy(function (event) { - if (!tab.disabled && !tab.$el.hasClass('active')) { - if (tab.control == 'manual') { - this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); - } else if (event.ctrlKey || event.metaKey) { + if (!tab.disabled) { + if (event.ctrlKey || event.metaKey) { tab.changeState(true); } else if (event.shiftKey) { this.bar.$el.find('ul > li.selected').removeClass('selected'); @@ -304,11 +302,15 @@ define([ indexCur = tab.sheetindex; var startIndex = (indexCur > indexAct) ? indexAct : indexCur, endIndex = (indexCur > indexAct) ? indexCur : indexAct; - for(var i = startIndex; i <= endIndex; i++) { + for (var i = startIndex; i <= endIndex; i++) { this.bar.tabs[i].changeState(true); } - } else { - tab.changeState(); + } else if (!tab.$el.hasClass('active')) { + if (tab.control == 'manual') { + this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); + } else { + tab.changeState(); + } } } !tab.disabled && Common.NotificationCenter.trigger('edit:complete', this.bar); From db5e747c3671bafbabf7c7d75fc55ca812bbbbe2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 3 Sep 2019 14:09:22 +0300 Subject: [PATCH 003/265] [SSE] Bug 37388 --- apps/common/main/lib/component/TabBar.js | 27 +++++- .../main/app/controller/Statusbar.js | 83 +++++++++++++++---- .../main/app/view/Statusbar.js | 2 +- 3 files changed, 95 insertions(+), 17 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 8e5ff01a3..62dd31ee7 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -72,10 +72,18 @@ define([ tab.changeState = $.proxy(function (select) { if (select) { tab.toggleClass('selected'); + var selectTab = _.find(this.bar.selectTabs, function (item) {return item.sheetindex === tab.sheetindex;}); + if (selectTab) { + this.bar.selectTabs = _.without(this.bar.selectTabs, selectTab); + } else { + this.bar.selectTabs.push(tab); + } } else { if (!tab.isSelected()) { this.bar.$el.find('ul > li.selected').removeClass('selected'); tab.addClass('selected'); + this.bar.selectTabs.length = 0; + this.bar.selectTabs.push(tab); } this.trigger('tab:change', tab); this.bar.$el.find('ul > li.active').removeClass('active'); @@ -297,9 +305,10 @@ define([ tab.changeState(true); } else if (event.shiftKey) { this.bar.$el.find('ul > li.selected').removeClass('selected'); + this.bar.selectTabs.length = 0; var $active = this.bar.$el.find('ul > li.active'), indexAct = $active.index(), - indexCur = tab.sheetindex; + indexCur = this.bar.tabs.indexOf(tab); var startIndex = (indexCur > indexAct) ? indexAct : indexCur, endIndex = (indexCur > indexAct) ? indexCur : indexAct; for (var i = startIndex; i <= endIndex; i++) { @@ -319,7 +328,11 @@ define([ this.trigger('tab:dblclick', this, this.tabs.indexOf(tab), tab); }, this.bar), contextmenu: $.proxy(function () { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); + if (this.selectTabs.length > 1) { + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); + } else { + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); + } }, this.bar), mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { @@ -344,6 +357,7 @@ define([ tabs: [], template: _.template('
      '), + selectTabs: [], initialize : function (options) { _.extend(this.config, options); @@ -419,6 +433,10 @@ define([ me.$bar.append(tab.render().$el); me.tabs.push(tab); me.manager.attach(tab); + if (tab.isActive()) { + me.selectTabs.length = 0; + me.selectTabs.push(tab); + } } } else { for (i = tabs.length; i-- > 0 ; ) { @@ -432,6 +450,11 @@ define([ me.tabs.splice(index, 0, tab); } + if (tab.isActive()) { + me.selectTabs.length = 0; + me.selectTabs.push(tab); + } + me.manager.attach(tab); } } diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index b88aee8a8..ca3aeec10 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -247,20 +247,54 @@ define([ onTabMenu: function(obj, item, e) { var me = this; - switch (item.value){ - case 'ins': - setTimeout(function(){ - me.api.asc_insertWorksheet(me.createSheetName()); - }, 1); - break; - case 'del': this.deleteWorksheet(); break; - case 'ren': this.renameWorksheet(); break; - case 'copy': this.moveWorksheet(false); break; - case 'move': this.moveWorksheet(true); break; - case 'hide': - setTimeout(function(){ - me.hideWorksheet(true);}, 1); - break; + var selectTabs = this.statusbar.tabbar.selectTabs; + if (selectTabs.length > 1) { + switch (item.value) { + case 'ins': + setTimeout(function () { + //me.api.asc_insertWorksheets(); + }, 1); + break; + case 'del': + this.deleteWorksheets(); + break; + case 'copy': + this.moveWorksheets(false); + break; + case 'move': + this.moveWorksheets(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheets(selectTabs); + }, 1,); + break; + } + } else { + switch (item.value) { + case 'ins': + setTimeout(function () { + me.api.asc_insertWorksheet(me.createSheetName()); + }, 1); + break; + case 'del': + this.deleteWorksheet(); + break; + case 'ren': + this.renameWorksheet(); + break; + case 'copy': + this.moveWorksheet(false); + break; + case 'move': + this.moveWorksheet(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheet(true); + }, 1); + break; + } } }, @@ -297,6 +331,10 @@ define([ return name; }, + deleteWorksheets: function() { + + }, + deleteWorksheet: function() { var me = this; @@ -317,6 +355,19 @@ define([ } }, + hideWorksheets: function(selectTabs) { + var me = this; + if (selectTabs) { + if (selectTabs.length === me.statusbar.tabbar.tabs.length) { + Common.UI.warning({msg: me.errorLastSheet}); + } else { + me.statusbar.tabbar.selectTabs.forEach(function (item) { + //me.hideWorksheet(true, item.sheetindex); + }); + } + } + }, + hideWorksheet: function(hide, index) { if ( hide ) { this.statusbar.tabbar.tabs.length == 1 ? @@ -376,6 +427,10 @@ define([ } }, + moveWorksheets: function() { + + }, + moveWorksheet: function(cut, silent, index, destPos) { var me = this; var wc = me.api.asc_getWorksheetsCount(), items = [], i = -1; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 247da69e5..d4117fb93 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -409,7 +409,7 @@ define([ // Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()], false); // hide popover }, - onTabMenu: function (o, index, tab) { + onTabMenu: function (o, index, tab, select) { if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable) && !this.mode.isDisconnected ) { From b7364f56315da73633e64f93baf89be5116e5829 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 6 Sep 2019 13:07:47 +0300 Subject: [PATCH 004/265] [SSE] Bug 37388 (Add Ungroup Sheets, Select All Sheets) --- apps/common/main/lib/component/TabBar.js | 31 +++++++++++++++--- .../main/app/controller/Statusbar.js | 32 ------------------- .../main/app/view/Statusbar.js | 23 +++++++++++-- 3 files changed, 47 insertions(+), 39 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 62dd31ee7..e572730e1 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -315,6 +315,10 @@ define([ this.bar.tabs[i].changeState(true); } } else if (!tab.$el.hasClass('active')) { + if (this.bar.tabs.length === this.bar.selectTabs.length) { + this.bar.$el.find('ul > li.selected').removeClass('selected'); + this.bar.selectTabs.length = 0; + } if (tab.control == 'manual') { this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); } else { @@ -328,11 +332,7 @@ define([ this.trigger('tab:dblclick', this, this.tabs.indexOf(tab), tab); }, this.bar), contextmenu: $.proxy(function () { - if (this.selectTabs.length > 1) { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); - } else { - this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab); - } + this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); }, this.bar), mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { @@ -507,6 +507,27 @@ define([ this.checkInvisible(); }, + setSelectAll: function(isSelect) { + var me = this; + me.selectTabs.length = 0; + if (isSelect) { + me.tabs.forEach(function(tab){ + if (!tab.isSelected()) { + tab.addClass('selected'); + } + me.selectTabs.push(tab); + }); + } else { + me.tabs.forEach(function(tab){ + if (tab.isActive()) { + me.selectTabs.push(tab); + } else if (tab.isSelected()) { + tab.removeClass('selected'); + } + }); + } + }, + getActive: function(iselem) { return iselem ? this.$bar.find('> li.active') : this.$bar.find('> li.active').index(); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index ca3aeec10..96420bede 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -248,29 +248,6 @@ define([ onTabMenu: function(obj, item, e) { var me = this; var selectTabs = this.statusbar.tabbar.selectTabs; - if (selectTabs.length > 1) { - switch (item.value) { - case 'ins': - setTimeout(function () { - //me.api.asc_insertWorksheets(); - }, 1); - break; - case 'del': - this.deleteWorksheets(); - break; - case 'copy': - this.moveWorksheets(false); - break; - case 'move': - this.moveWorksheets(true); - break; - case 'hide': - setTimeout(function () { - me.hideWorksheets(selectTabs); - }, 1,); - break; - } - } else { switch (item.value) { case 'ins': setTimeout(function () { @@ -295,7 +272,6 @@ define([ }, 1); break; } - } }, createSheetName: function() { @@ -331,10 +307,6 @@ define([ return name; }, - deleteWorksheets: function() { - - }, - deleteWorksheet: function() { var me = this; @@ -427,10 +399,6 @@ define([ } }, - moveWorksheets: function() { - - }, - moveWorksheet: function(cut, silent, index, destPos) { var me = this; var wc = me.api.asc_getWorksheetsCount(), items = [], i = -1; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index d4117fb93..fd1f65930 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -241,7 +241,10 @@ define([ { caption: this.itemTabColor, menu: menuColorItems - } + }, + { caption: '--' }, + {caption: this.selectAllSheets, value: 'selectall'}, + {caption: this.ungroupSheets, value: 'noselect'} ] }).on('render:after', function(btn) { var colorVal = $('
      '); @@ -432,6 +435,15 @@ define([ this.tabMenu.items[6].setDisabled(isdoclocked); this.tabMenu.items[7].setDisabled(issheetlocked); + if (select.length === 1) { + this.tabMenu.items[10].hide(); + } else { + this.tabMenu.items[10].show(); + } + + this.tabMenu.items[9].setDisabled(issheetlocked); + this.tabMenu.items[10].setDisabled(issheetlocked); + this.api.asc_closeCellEditor(); this.api.asc_enableKeyEvents(false); @@ -473,6 +485,11 @@ define([ onTabMenuClick: function (o, item) { if (item && this.api) { this.enableKeyEvents = (item.value === 'ins' || item.value === 'hide'); + if (item.value === 'selectall') { + this.tabbar.setSelectAll(true); + } else if (item.value === 'noselect') { + this.tabbar.setSelectAll(false); + } } }, @@ -544,7 +561,9 @@ define([ textMin : 'MIN', textMax : 'MAX', filteredRecordsText : '{0} of {1} records filtered', - filteredText : 'Filter mode' + filteredText : 'Filter mode', + selectAllSheets : 'Select All Sheets', + ungroupSheets : 'Ungroup Sheets' }, SSE.Views.Statusbar || {})); SSE.Views.Statusbar.RenameDialog = Common.UI.Window.extend(_.extend({ From 92e56f78153b23e00bbfa68a1a7f9a1237f7493c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Sep 2019 12:45:40 +0300 Subject: [PATCH 005/265] Fix Bug 42882 --- apps/common/main/resources/less/comments.less | 4 ++++ apps/common/main/resources/less/input.less | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 33a0e6c1c..ca3b3b5b4 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -187,6 +187,10 @@ &.user-select { cursor: text; } + &.user-select::selection { + background: #3494fb; + color: white; + } } .user-reply { diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index 60220b42f..a529b2ae2 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -80,3 +80,8 @@ input.error { input[type="password"] { font-size: 16px; } + +input[type="text"]::selection, textarea::selection { + background: #3494fb; + color: white; +} From 0153af839d3fbb184177114fa0dcd24a3bc7779c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Sep 2019 13:33:35 +0300 Subject: [PATCH 006/265] [SSE] Fix autosum icon --- apps/common/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 76220cbc1..73006083d 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -520,7 +520,7 @@ .button-normal-icon(btn-watermark, 63, @toolbar-big-icon-size); .button-normal-icon(btn-color-schema, 64, @toolbar-big-icon-size); .button-normal-icon(btn-ins-formula, 65, @toolbar-big-icon-size); -.button-normal-icon(btn-autosumm, 66, @toolbar-big-icon-size); +.button-normal-icon(btn-autosum, 66, @toolbar-big-icon-size); .button-normal-icon(btn-recent, 67, @toolbar-big-icon-size); .button-normal-icon(btn-finance, 68, @toolbar-big-icon-size); .button-normal-icon(btn-logic, 69, @toolbar-big-icon-size); From 6f8950111853b13ff81d20fcac0f6f1940415153 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Sep 2019 16:15:09 +0300 Subject: [PATCH 007/265] Fix Bug 42933 (fix rev.c823cb38fe55456f0c84886acfda459cba7cdf43, Bug 41193) --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index aed29897b..c4ddc9092 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -237,7 +237,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 20b123b3b..67c58fc25 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -215,7 +215,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8de80cf02..821dfc3a4 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -224,7 +224,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) From 03fb7e883c0bf44d0928879f987ca8917f7b4381 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Sep 2019 16:18:38 +0300 Subject: [PATCH 008/265] [DE] Fix changing display mode for track changes (without plugins tab) --- 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 36c163b9b..0430cd768 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -190,7 +190,7 @@ define([ item.setDisabled(disable); }); - this.pluginsMask.css('display', disable ? 'block' : 'none'); + this.pluginsMask && this.pluginsMask.css('display', disable ? 'block' : 'none'); } }, From e744a710e322d22226df721845dabe89e0b2c1e5 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 26 Sep 2019 11:35:29 +0300 Subject: [PATCH 009/265] [SSE] Bug 37388 (delete, hide select tabs) --- .../main/app/controller/Statusbar.js | 75 ++++++++----------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 96420bede..3c6b35802 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -247,31 +247,35 @@ define([ onTabMenu: function(obj, item, e) { var me = this; - var selectTabs = this.statusbar.tabbar.selectTabs; - switch (item.value) { - case 'ins': - setTimeout(function () { - me.api.asc_insertWorksheet(me.createSheetName()); - }, 1); - break; - case 'del': - this.deleteWorksheet(); - break; - case 'ren': - this.renameWorksheet(); - break; - case 'copy': - this.moveWorksheet(false); - break; - case 'move': - this.moveWorksheet(true); - break; - case 'hide': - setTimeout(function () { - me.hideWorksheet(true); - }, 1); - break; - } + var selectTabs = this.statusbar.tabbar.selectTabs, + arrIndex = []; + selectTabs.forEach(function (item) { + arrIndex.push(item.sheetindex); + }); + switch (item.value) { + case 'ins': + setTimeout(function () { + me.api.asc_insertWorksheet(me.createSheetName()); + }, 1); + break; + case 'del': + this.deleteWorksheet(arrIndex); + break; + case 'ren': + this.renameWorksheet(); + break; + case 'copy': + this.moveWorksheet(false); + break; + case 'move': + this.moveWorksheet(true); + break; + case 'hide': + setTimeout(function () { + me.hideWorksheet(true, arrIndex); + }, 1); + break; + } }, createSheetName: function() { @@ -307,17 +311,17 @@ define([ return name; }, - deleteWorksheet: function() { + deleteWorksheet: function(selectTabs) { var me = this; - if (this.statusbar.tabbar.tabs.length == 1) { + if (this.statusbar.tabbar.tabs.length == 1 || selectTabs.length === this.statusbar.tabbar.tabs.length) { Common.UI.warning({msg: this.errorLastSheet}); } else { Common.UI.warning({ msg: this.warnDeleteSheet, buttons: ['ok','cancel'], callback: function(btn) { - if (btn == 'ok' && !me.api.asc_deleteWorksheet()) { + if (btn == 'ok' && !me.api.asc_deleteWorksheet(selectTabs)) { _.delay(function(){ Common.UI.error({msg: me.errorRemoveSheet}); },10); @@ -327,22 +331,9 @@ define([ } }, - hideWorksheets: function(selectTabs) { - var me = this; - if (selectTabs) { - if (selectTabs.length === me.statusbar.tabbar.tabs.length) { - Common.UI.warning({msg: me.errorLastSheet}); - } else { - me.statusbar.tabbar.selectTabs.forEach(function (item) { - //me.hideWorksheet(true, item.sheetindex); - }); - } - } - }, - hideWorksheet: function(hide, index) { if ( hide ) { - this.statusbar.tabbar.tabs.length == 1 ? + (this.statusbar.tabbar.tabs.length == 1 || index.length === this.statusbar.tabbar.tabs.length) ? Common.UI.warning({msg: this.errorLastSheet}) : this.api['asc_hideWorksheet'](index); } else { From 8f4537a22a7277f4d9736a2b81412b0ee9d1c80d Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 26 Sep 2019 14:24:33 +0300 Subject: [PATCH 010/265] [SSE] Bug 37388 (set worksheet color) --- .../main/app/controller/Statusbar.js | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 3c6b35802..2774ad85b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -495,18 +495,26 @@ define([ }, setWorksheetColor: function (color) { + var me = this; if (this.api) { - var sindex = this.api.asc_getActiveWorksheetIndex(); - var tab = _.findWhere(this.statusbar.tabbar.tabs, {sheetindex: sindex}); - if (tab) { + var selectTabs = this.statusbar.tabbar.selectTabs, + arrIndex = []; + selectTabs.forEach(function (item) { + arrIndex.push(item.sheetindex); + }); + if (arrIndex) { if ('transparent' === color) { - this.api.asc_setWorksheetTabColor(sindex, null); - tab.$el.find('a').css('box-shadow', ''); + this.api.asc_setWorksheetTabColor(null, arrIndex); + selectTabs.forEach(function (tab) { + tab.$el.find('a').css('box-shadow', ''); + }); } else { var asc_clr = Common.Utils.ThemeColor.getRgbColor(color); if (asc_clr) { - this.api.asc_setWorksheetTabColor(sindex, asc_clr); - this.setTabLineColor(tab, asc_clr); + this.api.asc_setWorksheetTabColor(asc_clr, arrIndex); + selectTabs.forEach(function (tab) { + me.setTabLineColor(tab, asc_clr); + }); } } } From 3b82ac999d58354d6f57ae665247425970b4f21c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Sep 2019 18:15:59 +0300 Subject: [PATCH 011/265] [SSE] Fix button icons (chat, comments) --- apps/spreadsheeteditor/main/resources/less/leftmenu.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 7a666f012..8ceea12aa 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -11,8 +11,8 @@ } } -button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -63*@toolbar-icon-size;} -button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} +button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} +button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -2*@toolbar-icon-size;} .button-normal-icon(btn-menu-file, 61, @toolbar-icon-size); .button-normal-icon(btn-menu-search, 62, @toolbar-icon-size); From defd8e7edb9aebaec61b785aa74a6f2deb740c27 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 27 Sep 2019 16:41:19 +0300 Subject: [PATCH 012/265] [Common mobile] Custom Color --- .../mobile/lib/component/ThemeColorPalette.js | 246 +++++++++++++++++- .../resources/less/ios/_color-palette.less | 67 +++++ .../less/material/_color-palette.less | 67 +++++ .../mobile/resources/css/app-ios.css | 66 ++++- .../mobile/resources/css/app-material.css | 65 ++++- .../mobile/resources/css/app-ios.css | 64 +++++ .../mobile/resources/css/app-material.css | 64 +++++ .../mobile/resources/css/app-ios.css | 64 +++++ .../mobile/resources/css/app-material.css | 64 +++++ 9 files changed, 762 insertions(+), 5 deletions(-) diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.js b/apps/common/mobile/lib/component/ThemeColorPalette.js index f183868ba..70687ca51 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.js +++ b/apps/common/mobile/lib/component/ThemeColorPalette.js @@ -97,6 +97,20 @@ define([ '', '', '', + '
    • ', + '
      <%= me.textCustomColors %>
      ', + '
      ', + '
      ', + '
      ', + '<%=circlesColors%>', + '
      ', + '
      ', + '
      ', + '
      ', + '
      ', + '
      ', + '
      ', + '
      • ', '
    ', '' ].join('')), @@ -133,14 +147,41 @@ define([ themeColors[row].push(effect); }); + // custom color + if (!this.currentHsl) + this.currentHsl = []; + if (!this.currentHsb) + this.currentHsb = []; + if (!this.currentHue) + this.currentHue = []; + var total = 256, + circles = ''; + for (var i = total; i > 0; i -= 1) { + var angle = i * Math.PI / (total / 2); + var hue = 360 / total * i; + circles += ''; + } + $(me.el).append(me.template({ themeColors: themeColors, - standartColors: standartColors + standartColors: standartColors, + circlesColors: circles })); + this.afterRender(); + return me; }, + afterRender: function () { + this.$colorPicker = $('.color-picker-wheel'); + this.$colorPicker.on({ + 'touchstart': this.handleTouchStart.bind(this), + 'touchmove': this.handleTouchMove.bind(this), + 'touchend': this.handleTouchEnd.bind(this) + }); + }, + isColor: function(val) { return typeof(val) == 'string' && (/[0-9A-Fa-f]{6}/).test(val); }, @@ -190,6 +231,7 @@ define([ } else if (! _.isUndefined(color.effectValue)) { el.find('a[data-effectvalue=' + color.effectValue + '][data-color=' + color.color + ']').addClass('active'); } + this.currentHsl = this.colorHexToRgb(color.color); } else { if (/#?[a-fA-F0-9]{6}/.test(color)) { color = /#?([a-fA-F0-9]{6})/.exec(color)[1]; @@ -200,7 +242,14 @@ define([ } else { el.find('.custom-colors a[data-color=' + color + ']').addClass('active'); } + this.currentHsl = this.colorHexToRgb(color); } + if (!this.currentHsl) { + this.currentHsl = this.colorHexToRgb('000000'); + } + this.currentHsl = this.colorRgbToHsl(...this.currentHsl); + this.currentHsb = this.colorHslToHsb(...this.currentHsl); + this.updateCustomColor(true); }, @@ -208,7 +257,200 @@ define([ $(this.el).find('.color-palette a').removeClass('active'); }, + colorHexToRgb(hex) { + var h = hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i, function(m, r, g, b) { return (r + r + g + g + b + b)}); + var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(h); + return result + ? result.slice(1).map(function (n) { return parseInt(n, 16)}) + : null; + }, + + colorRgbToHsl(r, g, b) { + r /= 255; // eslint-disable-line + g /= 255; // eslint-disable-line + b /= 255; // eslint-disable-line + var max = Math.max(r, g, b); + var min = Math.min(r, g, b); + var d = max - min; + var h; + if (d === 0) h = 0; + else if (max === r) h = ((g - b) / d) % 6; + else if (max === g) h = (b - r) / d + 2; + else if (max === b) h = (r - g) / d + 4; + var l = (min + max) / 2; + var s = d === 0 ? 0 : d / (1 - Math.abs(2 * l - 1)); + if (h < 0) h = 360 / 60 + h; + return [h * 60, s, l]; + }, + + colorHslToHsb(h, s, l) { + var HSB = { + h, + s: 0, + b: 0, + }; + var HSL = {h, s, l}; + var t = HSL.s * (HSL.l < 0.5 ? HSL.l : 1 - HSL.l); + HSB.b = HSL.l + t; + HSB.s = HSL.l > 0 ? 2 * t / HSB.b : HSB.s; + return [HSB.h, HSB.s, HSB.b]; + }, + + colorHsbToHsl(h, s, b) { + var HSL = { + h, + s: 0, + l: 0, + }; + var HSB = { h, s, b }; + HSL.l = (2 - HSB.s) * HSB.b / 2; + HSL.s = HSL.l && HSL.l < 1 ? HSB.s * HSB.b / (HSL.l < 0.5 ? HSL.l * 2 : 2 - HSL.l * 2) : HSL.s; + return [HSL.h, HSL.s, HSL.l]; + }, + + colorHslToRgb(h, s, l) { + var c = (1 - Math.abs(2 * l - 1)) * s; + var hp = h / 60; + var x = c * (1 - Math.abs((hp % 2) - 1)); + var rgb1; + if (Number.isNaN(h) || typeof h === 'undefined') { + rgb1 = [0, 0, 0]; + } else if (hp <= 1) rgb1 = [c, x, 0]; + else if (hp <= 2) rgb1 = [x, c, 0]; + else if (hp <= 3) rgb1 = [0, c, x]; + else if (hp <= 4) rgb1 = [0, x, c]; + else if (hp <= 5) rgb1 = [x, 0, c]; + else if (hp <= 6) rgb1 = [c, 0, x]; + var m = l - (c / 2); + var result = rgb1.map(function (n) { + return Math.max(0, Math.min(255, Math.round(255 * (n + m)))); + }); + return result; + }, + + colorRgbToHex(r, g, b) { + var result = [r, g, b].map( function (n) { + var hex = n.toString(16); + return hex.length === 1 ? ('0' + hex) : hex; + }).join(''); + return ('#' + result); + }, + + setHueFromWheelCoords: function (x, y) { + var wheelCenterX = this.wheelRect.left + this.wheelRect.width / 2; + var wheelCenterY = this.wheelRect.top + this.wheelRect.height / 2; + var angleRad = Math.atan2(y - wheelCenterY, x - wheelCenterX); + var angleDeg = angleRad * 180 / Math.PI + 90; + if (angleDeg < 0) angleDeg += 360; + angleDeg = 360 - angleDeg; + this.currentHsl[0] = angleDeg; + this.updateCustomColor(); + }, + + setSBFromSpecterCoords: function (x, y) { + var s = (x - this.specterRect.left) / this.specterRect.width; + var b = (y - this.specterRect.top) / this.specterRect.height; + s = Math.max(0, Math.min(1, s)); + b = 1 - Math.max(0, Math.min(1, b)); + + this.currentHsb = [this.currentHsl[0], s, b]; + this.currentHsl = this.colorHsbToHsl(...this.currentHsb); + this.updateCustomColor(); + }, + + handleTouchStart: function (e) { + this.clearSelection(); + if (this.isMoved || this.isTouched) return; + this.touchStartX = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX; + this.touchCurrentX = this.touchStartX; + this.touchStartY = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY; + this.touchCurrentY = this.touchStartY; + var $targetEl = $(e.target); + this.wheelHandleIsTouched = $targetEl.closest('.color-picker-wheel-handle').length > 0; + this.wheelIsTouched = $targetEl.closest('circle').length > 0; + this.specterHandleIsTouched = $targetEl.closest('.color-picker-sb-spectrum-handle').length > 0; + if (!this.specterHandleIsTouched) { + this.specterIsTouched = $targetEl.closest('.color-picker-sb-spectrum').length > 0; + } + if (this.wheelIsTouched) { + this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect(); + this.setHueFromWheelCoords(this.touchStartX, this.touchStartY); + } + if (this.specterIsTouched) { + this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect(); + this.setSBFromSpecterCoords(this.touchStartX, this.touchStartY); + } + if (this.specterHandleIsTouched || this.specterIsTouched) { + this.$el.find('.color-picker-sb-spectrum-handle').addClass('color-picker-sb-spectrum-handle-pressed'); + } + }, + + handleTouchMove: function (e) { + if (!(this.wheelIsTouched || this.wheelHandleIsTouched) && !(this.specterIsTouched || this.specterHandleIsTouched)) return; + this.touchCurrentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX; + this.touchCurrentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY; + e.preventDefault(); + if (!this.isMoved) { + // First move + this.isMoved = true; + if (this.wheelHandleIsTouched) { + this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect(); + } + if (this.specterHandleIsTouched) { + this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect(); + } + } + if (this.wheelIsTouched || this.wheelHandleIsTouched) { + this.setHueFromWheelCoords(this.touchCurrentX, this.touchCurrentY); + } + if (this.specterIsTouched || this.specterHandleIsTouched) { + this.setSBFromSpecterCoords(this.touchCurrentX, this.touchCurrentY); + } + }, + + handleTouchEnd: function () { + this.isMoved = false; + if (this.specterIsTouched || this.specterHandleIsTouched) { + this.$el.find('.color-picker-sb-spectrum-handle').removeClass('color-picker-sb-spectrum-handle-pressed'); + } + this.wheelIsTouched = false; + this.wheelHandleIsTouched = false; + this.specterIsTouched = false; + this.specterHandleIsTouched = false; + }, + + updateCustomColor: function (firstSelect) { + var specterWidth = this.$el.find('.color-picker-sb-spectrum')[0].offsetWidth, + specterHeight = this.$el.find('.color-picker-sb-spectrum')[0].offsetHeight, + wheelSize = this.$el.find('.color-picker-wheel')[0].offsetWidth, + wheelHalfSize = wheelSize / 2, + angleRad = this.currentHsl[0] * Math.PI / 180, + handleSize = wheelSize / 6, + handleHalfSize = handleSize / 2, + tX = wheelHalfSize - Math.sin(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize, + tY = wheelHalfSize - Math.cos(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize; + this.$el.find('.color-picker-wheel-handle') + .css({'background-color': 'hsl(' + this.currentHsl[0] + ', 100%, 50%)'}) + .css({transform: 'translate(' + tX + 'px,' + tY + 'px)'}); + + this.$el.find('.color-picker-sb-spectrum') + .css({'background-color': 'hsl(' + this.currentHsl[0] + ', 100%, 50%)'}); + + if (this.currentHsb && this.currentHsl) { + this.$el.find('.color-picker-sb-spectrum-handle') + .css({'background-color': 'hsl(' + this.currentHsl[0] + ', ' + (this.currentHsl[1] * 100) + '%,' + (this.currentHsl[2] * 100) + '%)'}) + .css({transform: 'translate(' + specterWidth * this.currentHsb[1] + 'px, ' + specterHeight * (1 - this.currentHsb[2]) + 'px)'}); + } + + if (!firstSelect) { + var color = this.colorHslToRgb(...this.currentHsl); + this.currentColor = this.colorRgbToHex(...color); + this.trigger('select', this, this.currentColor); + } + }, + textThemeColors: 'Theme Colors', - textStandartColors: 'Standard Colors' + textStandartColors: 'Standard Colors', + textCustomColors: 'Custom Colors' }, Common.UI.ThemeColorPalette || {})); }); \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_color-palette.less b/apps/common/mobile/resources/less/ios/_color-palette.less index 2fa543df4..c986a5bef 100644 --- a/apps/common/mobile/resources/less/ios/_color-palette.less +++ b/apps/common/mobile/resources/less/ios/_color-palette.less @@ -40,4 +40,71 @@ overflow: visible; } } + + .custom-colors { + .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; + svg { + width: 100%; + height: auto; + } + .color-picker-wheel-handle { + width: calc(100% / 6); + height: calc(100% / 6); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0,0,0,0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; + } + .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; + } + .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; + &:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0,0,0,0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; + } + &.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); + } + } + } + } } \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_color-palette.less b/apps/common/mobile/resources/less/material/_color-palette.less index 49fa72501..14e5e00c3 100644 --- a/apps/common/mobile/resources/less/material/_color-palette.less +++ b/apps/common/mobile/resources/less/material/_color-palette.less @@ -44,4 +44,71 @@ &.list-block:last-child li:last-child a { border-radius: 0; } + + .custom-colors { + .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; + svg { + width: 100%; + height: auto; + } + .color-picker-wheel-handle { + width: calc(100% / 6); + height: calc(100% / 6); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0,0,0,0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; + } + .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; + } + .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; + &:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0,0,0,0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; + } + &.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); + } + } + } + } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 409d688e1..9fe5f8d7a 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6221,6 +6221,70 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .color-palette .standart-colors .item-inner { overflow: visible; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } @@ -7081,7 +7145,6 @@ html.pixel-ratio-3 .numbers li { max-height: 100%; overflow: auto; } - .doc-placeholder { background: #fbfbfb; width: 100%; @@ -7097,7 +7160,6 @@ html.pixel-ratio-3 .numbers li { background: #e2e2e2; overflow: hidden; position: relative; - -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; -o-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index b89e0c23f..ccec7b046 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5815,6 +5815,70 @@ html.phone .document-menu .list-block .item-link { .color-palette.list-block:last-child li:last-child a { border-radius: 0; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } @@ -6867,7 +6931,6 @@ html.pixel-ratio-3 .numbers li { background: #e2e2e2; overflow: hidden; position: relative; - -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; -o-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index 79ef64e8c..8af9052b4 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6221,6 +6221,70 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .color-palette .standart-colors .item-inner { overflow: visible; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index b714f1d28..a962db4d8 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -5815,6 +5815,70 @@ html.phone .document-menu .list-block .item-link { .color-palette.list-block:last-child li:last-child a { border-radius: 0; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index 74b26d6ad..05de4bbc3 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6221,6 +6221,70 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .color-palette .standart-colors .item-inner { overflow: visible; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index dd99508dd..27e044769 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -5825,6 +5825,70 @@ html.phone .document-menu .list-block .item-link { .color-palette.list-block:last-child li:last-child a { border-radius: 0; } +.color-palette .custom-colors .color-picker-wheel { + position: relative; + width: 330px; + max-width: 100%; + height: auto; + font-size: 0; + margin-left: auto; + margin-right: auto; +} +.color-palette .custom-colors .color-picker-wheel svg { + width: 100%; + height: auto; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-wheel-handle { + width: calc(16.66666667%); + height: calc(16.66666667%); + position: absolute; + box-sizing: border-box; + border: 2px solid #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + background: red; + border-radius: 50%; + left: 0; + top: 0; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum { + background-color: #000; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); + position: relative; + width: 45%; + height: 45%; + left: 50%; + top: 50%; + transform: translate3d(-50%, -50%, 0); + position: absolute; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle { + width: 4px; + height: 4px; + position: absolute; + left: -2px; + top: -2px; + z-index: 1; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle:after { + background-color: inherit; + content: ''; + position: absolute; + width: 16px; + height: 16px; + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + box-sizing: border-box; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + transition: 150ms; + transition-property: transform; + transform-origin: center; +} +.color-palette .custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after { + transform: scale(1.5) translate(-33.333%, -33.333%); +} .about .page-content { text-align: center; } From 84796a03a6ebd63d8461b7d691decf350c79d87e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 1 Oct 2019 11:30:54 +0300 Subject: [PATCH 013/265] Update icons --- apps/common/main/resources/img/header/buttons.svg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/img/header/buttons.svg b/apps/common/main/resources/img/header/buttons.svg index 9e257e97d..b808b1cb7 100644 --- a/apps/common/main/resources/img/header/buttons.svg +++ b/apps/common/main/resources/img/header/buttons.svg @@ -42,11 +42,11 @@ - - - - - + + + + + diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index e826c5a01..e8e17a25b 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -173,7 +173,7 @@ From d3a039f6b04fb6c9f6e29f1f839dab09d9ffbdf5 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 8 Oct 2019 14:16:46 +0300 Subject: [PATCH 055/265] [DE mobile] Custom Color (paragraph) --- .../app/template/EditParagraph.template | 16 ++++++++ .../mobile/app/view/edit/EditParagraph.js | 39 ++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/app/template/EditParagraph.template b/apps/documenteditor/mobile/app/template/EditParagraph.template index 5abd3fcf1..b655baa3b 100644 --- a/apps/documenteditor/mobile/app/template/EditParagraph.template +++ b/apps/documenteditor/mobile/app/template/EditParagraph.template @@ -184,4 +184,20 @@ + + + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textCustomColor %>
    +
    <% if (phone) { %><% } %>
    +
    +
    +
    +
    + +
    +
    \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/view/edit/EditParagraph.js b/apps/documenteditor/mobile/app/view/edit/EditParagraph.js index dde7c7158..b1b163da7 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditParagraph.js +++ b/apps/documenteditor/mobile/app/view/edit/EditParagraph.js @@ -150,6 +150,24 @@ define([ el: $('.page[data-page=edit-paragraph-color] .page-content'), transparent: true }); + this.paletteBackgroundColor.on('customcolor', function () { + me.showCustomColor(); + }); + var template = _.template(['
    ', + '', + '
    '].join('')); + $('.page[data-page=edit-paragraph-color] .page-content').append(template({scope: this})); + $('#edit-paragraph-add-custom-color').single('click', _.bind(this.showCustomColor, this)); Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-color]', '.page[data-page=edit-paragraph-color] .page-content'); this.fireEvent('page:show', [this, '#edit-paragraph-color']); @@ -160,6 +178,23 @@ define([ Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-advanced]', '.page[data-page=edit-paragraph-advanced] .page-content'); }, + showCustomColor: function () { + var me = this, + selector = '#edit-paragraph-custom-color-view'; + me.showPage(selector, true); + + me.customColorPicker = new Common.UI.HsbColorPicker({ + el: $('.page[data-page=edit-paragraph-custom-color] .page-content'), + color: me.paletteBackgroundColor.currentColor + }); + me.customColorPicker.on('addcustomcolor', function (colorPicker, color) { + me.paletteBackgroundColor.addNewDynamicColor(colorPicker, color); + DE.getController('EditContainer').rootView.router.back(); + }); + + me.fireEvent('page:show', [me, selector]); + }, + textBackground: 'Background', textAdvSettings: 'Advanced settings', textPrgStyles: 'Paragraph styles', @@ -174,7 +209,9 @@ define([ textPageBreak: 'Page Break Before', textOrphan: 'Orphan Control', textKeepLines: 'Keep Lines Together', - textKeepNext: 'Keep with Next' + textKeepNext: 'Keep with Next', + textAddCustomColor: 'Add Custom Color', + textCustomColor: 'Custom Color' } })(), DE.Views.EditParagraph || {})) }); \ No newline at end of file From a78b3202475c056da5081f021e640ad980a0f0ef Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 8 Oct 2019 14:42:21 +0300 Subject: [PATCH 056/265] [DE mobile] Custom Color (chart) --- .../mobile/app/template/EditChart.template | 16 ++++ .../mobile/app/view/edit/EditChart.js | 76 ++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/app/template/EditChart.template b/apps/documenteditor/mobile/app/template/EditChart.template index 538bb8d1e..c420cb543 100644 --- a/apps/documenteditor/mobile/app/template/EditChart.template +++ b/apps/documenteditor/mobile/app/template/EditChart.template @@ -371,4 +371,20 @@ + + + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textCustomColor %>
    +
    <% if (phone) { %><% } %>
    +
    +
    +
    +
    + +
    +
    \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/view/edit/EditChart.js b/apps/documenteditor/mobile/app/view/edit/EditChart.js index 001a33c7c..8e31eab8d 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditChart.js +++ b/apps/documenteditor/mobile/app/view/edit/EditChart.js @@ -220,6 +220,24 @@ define([ el: $('#tab-chart-fill'), transparent: true }); + this.paletteFillColor.on('customcolor', function () { + me.showCustomFillColor(); + }); + var template = _.template(['
    ', + '', + '
    '].join('')); + $('#tab-chart-fill').append(template({scope: this})); + $('#edit-chart-add-custom-color').single('click', _.bind(this.showCustomFillColor, this)); this.fireEvent('page:show', [this, selector]); @@ -242,10 +260,64 @@ define([ this.paletteBorderColor = new Common.UI.ThemeColorPalette({ el: $('.page[data-page=edit-chart-border-color] .page-content') }); + this.paletteBorderColor.on('customcolor', function () { + me.showCustomBorderColor(); + }); + var template = _.template(['
    ', + '', + '
    '].join('')); + $('.page[data-page=edit-chart-border-color] .page-content').append(template({scope: this})); + $('#edit-chart-add-custom-border-color').single('click', _.bind(this.showCustomBorderColor, this)); this.fireEvent('page:show', [this, selector]); }, + showCustomFillColor: function() { + var me = this, + selector = '#edit-chart-custom-color-view'; + me.showPage(selector, true); + + me.customColorPicker = new Common.UI.HsbColorPicker({ + el: $('.page[data-page=edit-chart-custom-color] .page-content'), + color: me.paletteFillColor.currentColor + }); + me.customColorPicker.on('addcustomcolor', function (colorPicker, color) { + me.paletteFillColor.addNewDynamicColor(colorPicker, color); + DE.getController('EditContainer').rootView.router.back(); + }); + + me.fireEvent('page:show', [me, selector]); + }, + + showCustomBorderColor: function() { + var me = this, + selector = '#edit-chart-custom-color-view'; + me.showPage(selector, true); + + me.customBorderColorPicker = new Common.UI.HsbColorPicker({ + el: $('.page[data-page=edit-chart-custom-color] .page-content'), + color: me.paletteBorderColor.currentColor + }); + me.customBorderColorPicker.on('addcustomcolor', function (colorPicker, color) { + me.paletteBorderColor.addNewDynamicColor(colorPicker, color); + me.paletteFillColor.updateDynamicColors(); + me.paletteFillColor.select(me.paletteFillColor.currentColor); + DE.getController('EditContainer').rootView.router.back(); + }); + + me.fireEvent('page:show', [me, selector]); + }, + textStyle: 'Style', textWrap: 'Wrap', textReorder: 'Reorder', @@ -270,7 +342,9 @@ define([ textFill: 'Fill', textBorder: 'Border', textSize: 'Size', - textColor: 'Color' + textColor: 'Color', + textAddCustomColor: 'Add Custom Color', + textCustomColor: 'Custom Color' } })(), DE.Views.EditChart || {})) }); \ No newline at end of file From dea4d0a4c1d66a9a4c5c2ebfff317ae42bb0eab2 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 8 Oct 2019 14:59:26 +0300 Subject: [PATCH 057/265] [DE] units for zero was cleared in app.css during deployment --- apps/documenteditor/main/resources/less/toolbar.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 39e72988b..c4ab40396 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -70,7 +70,8 @@ .loop((@counter - 1)); li:nth-child(@{counter}) > a.item-contents { div { - background-position: 0 calc(~"var(--bckgHOffset) - " (@counter - 1)*@contents-menu-item-height); + @incr-height: (@counter - 1)*@contents-menu-item-height; + background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})"; } } } From f588e9b67a3d513d8541a33a20f5e223cd5e8b3a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 8 Oct 2019 15:12:15 +0300 Subject: [PATCH 058/265] [SSE] Internal mode --- apps/api/documents/api.js | 3 +++ apps/spreadsheeteditor/main/index.html | 3 +-- apps/spreadsheeteditor/main/index.html.deploy | 11 +++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index ed34a79cb..59985afe8 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -770,6 +770,9 @@ } } + if (config.editorConfig && (config.editorConfig.mode == 'editdiagram' || config.editorConfig.mode == 'editmerge')) + params += "&internal=true"; + if (config.frameEditorId) params += "&frameEditorId=" + config.frameEditorId; diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 6eadc7fbc..479573391 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -238,8 +238,7 @@
    -
    -
    +
    diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 41e28c0e1..2d0c9373b 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -243,14 +243,21 @@
    -
    -
    +