Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #481 from ONLYOFFICE/fix/bug-fix

Browse source 
Fix/bug fix
This commit is contained in:
Julia Radzhabova 2020-08-26 16:32:22 +03:00 committed by GitHub
parent f721525565 2e483b5a89
commit 018860d100
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/common/main/lib/component/TabBar.js
View file

@ -222,6 +222,12 @@ define([
this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab); this.bar.trigger('tab:manual', this.bar, this.bar.tabs.indexOf(tab), tab);
} else { } else {
tab.changeState(); tab.changeState();
if (this.bar.isEditFormula)
setTimeout(function(){
$('#ce-cell-content').focus();
var $cellContent = $('#ce-cell-content')[0];
$cellContent.selectionStart = $cellContent.selectionEnd = $cellContent.value.length;
}, 500);
} }
} }
} }
@ -250,7 +256,14 @@ define([
} else { } else {
this.bar.$el.find('ul > li > span').attr('draggable', 'false'); this.bar.$el.find('ul > li > span').attr('draggable', 'false');
} }
this.bar.trigger('tab:drag', this.bar.selectTabs); if ($('#ce-cell-content').is(':focus'))
if (!this.bar.isEditFormula) {
$('#ce-cell-content').blur();
} else {
setTimeout(function () {
$('#ce-cell-content').focus();
}, 500)
}
}, this) }, this)
}); });
tab.$el.children().on( tab.$el.children().on(
@ -351,10 +364,9 @@ define([
this.tabs[this.tabs.length - 1].$el.removeClass('mousemove right'); this.tabs[this.tabs.length - 1].$el.removeClass('mousemove right');
}, this)); }, this));
addEvent(this.$bar[0], 'drop', _.bind(function (event) { addEvent(this.$bar[0], 'drop', _.bind(function (event) {
var index = this.tabs.length;
this.$el.find('.mousemove').removeClass('mousemove right'); this.$el.find('.mousemove').removeClass('mousemove right');
if (this.isDrop === undefined) { if (this.isDrop === undefined) {
this.trigger('tab:drop', event.dataTransfer, index); this.trigger('tab:drop', event.dataTransfer, 'last');
} else { } else {
this.isDrop = undefined; this.isDrop = undefined;
} }
@ -543,12 +555,17 @@ define([
this.checkInvisible(suppress); this.checkInvisible(suppress);
} else if ( index >= (this.tabs.length - 1) || index == 'last') { } else if ( index >= (this.tabs.length - 1) || index == 'last') {
var tab = this.tabs[this.tabs.length-1].$el; var tab = this.tabs[this.tabs.length-1].$el;
if (this.$bar.find('.separator-item').length === 0) {
this.$bar.append('<li class="separator-item"><span></span></li>');
}
this.$bar.scrollLeft(this.$bar.scrollLeft() + (tab.position().left + parseInt(tab.css('width')) - this.$bar.width()) + (this.$bar.width() > 400 ? 20 : 5)); this.$bar.scrollLeft(this.$bar.scrollLeft() + (tab.position().left + parseInt(tab.css('width')) - this.$bar.width()) + (this.$bar.width() > 400 ? 20 : 5));
this.checkInvisible(suppress); this.checkInvisible(suppress);
} else { } else {
if (!this.isTabVisible(this.tabs.length - 1) && this.$bar.find('.separator-item').length === 0) {
this.$bar.append('<li class="separator-item"><span></span></li>');
}
var rightbound = this.$bar.width(), var rightbound = this.$bar.width(),
tab, right, left; tab, right, left;
if (index == 'forward') { if (index == 'forward') {
for (var i = 0; i < this.tabs.length; i++) { for (var i = 0; i < this.tabs.length; i++) {
tab = this.tabs[i].$el; tab = this.tabs[i].$el;
@ -624,7 +641,7 @@ define([
//left = tab.position().left; //left = tab.position().left;
//right = left + tab.width(); //right = left + tab.width();
return !(left < leftbound) && !(right - rightbound > 0.1); return !(left < leftbound) && !(right - rightbound > 0.5);
} }
return false; return false;

3
apps/common/main/resources/less/tabbar.less
View file

@ -41,9 +41,6 @@
cursor: pointer; cursor: pointer;
} }
} }
&:last-of-type {
margin-right: 20px;
}
} }
&.bottom { &.bottom {

14
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View file

@ -212,13 +212,15 @@ define([
}, },
onFieldsDragStart: function (item, index, event) { onFieldsDragStart: function (item, index, event) {
this._state.field = {record: item.model};
event.originalEvent.dataTransfer.effectAllowed = 'move'; event.originalEvent.dataTransfer.effectAllowed = 'move';
event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14);
this.pivotIndex = index; this.pivotIndex = index;
this.fromListView = this.fieldsList.$el[0].id; this.fromListView = this.fieldsList.$el[0].id;
}, },
onItemsDragStart: function (listview, item, index, event) { onItemsDragStart: function (type, listview, item, index, event) {
this._state.field = {record: item.model, type: type};
event.originalEvent.dataTransfer.effectAllowed = 'move'; event.originalEvent.dataTransfer.effectAllowed = 'move';
event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14);
this.itemIndex = index; this.itemIndex = index;
@ -267,7 +269,7 @@ define([
}, },
onDragOver: function (listview, event) { onDragOver: function (listview, event) {
if ((this.pivotIndex === -2 && (this.enterListView === 'pivot-list-filters' || this.enterListView === 'pivot-list-values')) || if (event.originalEvent.dataTransfer.types[0] === 'onlyoffice' || (this.pivotIndex === -2 && (this.enterListView === 'pivot-list-filters' || this.enterListView === 'pivot-list-values')) ||
(this.fromListView === 'pivot-list-fields' && this.enterListView === 'pivot-list-fields')) { (this.fromListView === 'pivot-list-fields' && this.enterListView === 'pivot-list-fields')) {
event.originalEvent.dataTransfer.dropEffect = 'none'; event.originalEvent.dataTransfer.dropEffect = 'none';
} else { } else {
@ -502,7 +504,7 @@ define([
}); });
this.columnsList.dataViewItems.forEach(function (item, index) { this.columnsList.dataViewItems.forEach(function (item, index) {
item.$el.attr('draggable', true); item.$el.attr('draggable', true);
item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, me.columnsList, item, index)); item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, 0, me.columnsList, item, index));
item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index)); item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index));
item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index)); item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index));
item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.columnsList, item, index)); item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.columnsList, item, index));
@ -512,7 +514,7 @@ define([
this.columnsList.$el.find('.item').last().css({'margin-bottom': '10px'}); this.columnsList.$el.find('.item').last().css({'margin-bottom': '10px'});
this.rowsList.dataViewItems.forEach(function (item, index) { this.rowsList.dataViewItems.forEach(function (item, index) {
item.$el.attr('draggable', true); item.$el.attr('draggable', true);
item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, me.rowsList, item, index)); item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, 1, me.rowsList, item, index));
item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index)); item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index));
item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index)); item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index));
item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.rowsList, item, index)); item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.rowsList, item, index));
@ -522,7 +524,7 @@ define([
this.rowsList.$el.find('.item').last().css({'margin-bottom': '10px'}); this.rowsList.$el.find('.item').last().css({'margin-bottom': '10px'});
this.valuesList.dataViewItems.forEach(function (item, index) { this.valuesList.dataViewItems.forEach(function (item, index) {
item.$el.attr('draggable', true); item.$el.attr('draggable', true);
item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, me.valuesList, item, index)); item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, 2, me.valuesList, item, index));
item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index)); item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index));
item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index)); item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index));
item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.valuesList, item, index)); item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.valuesList, item, index));
@ -532,7 +534,7 @@ define([
this.valuesList.$el.find('.item').last().css({'margin-bottom': '10px'}); this.valuesList.$el.find('.item').last().css({'margin-bottom': '10px'});
this.filtersList.dataViewItems.forEach(function (item, index) { this.filtersList.dataViewItems.forEach(function (item, index) {
item.$el.attr('draggable', true); item.$el.attr('draggable', true);
item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, me.filtersList, item, index)); item.$el.on('dragstart', _.bind(me.onItemsDragStart, me, 3, me.filtersList, item, index));
item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index)); item.$el.on('dragenter', _.bind(me.onDragItemEnter, me, item, index));
item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index)); item.$el.on('dragleave', _.bind(me.onDragItemLeave, me, item, index));
item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.filtersList, item, index)); item.$el.on('dragover', _.bind(me.onDragItemOver, me, me.filtersList, item, index));

2
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -243,7 +243,7 @@ define([
if (arrData) { if (arrData) {
var key = _.findWhere(arrData, {type: 'key'}).value; var key = _.findWhere(arrData, {type: 'key'}).value;
if (Common.Utils.InternalSettings.get("sse-doc-info-key") === key) { if (Common.Utils.InternalSettings.get("sse-doc-info-key") === key) {
this.api.asc_moveWorksheet(index, _.findWhere(arrData, {type: 'indexes'}).value); this.api.asc_moveWorksheet(_.isNumber(index) ? index : this.api.asc_getWorksheetsCount(), _.findWhere(arrData, {type: 'indexes'}).value);
this.api.asc_enableKeyEvents(true); this.api.asc_enableKeyEvents(true);
Common.NotificationCenter.trigger('tabs:dragend', this); Common.NotificationCenter.trigger('tabs:dragend', this);
} else { } else {

18
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -166,6 +166,12 @@
} }
} }
&:last-of-type {
span {
margin-right: 0;
}
}
> span { > span {
display: inline-block; display: inline-block;
.border-radius(0); .border-radius(0);
@ -266,6 +272,18 @@
} }
} }
} }
&.separator-item {
margin-left: 20px;
width: 1px;
> span {
padding: 0;
margin: 0;
width: 1px;
&::after {
content: none;
}
}
}
} }
} }