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

[SSE] Move sheet: drag and drop (fix bug with opening context menu)

Browse source
This commit is contained in:
Julia Svinareva 2020-02-25 14:37:43 +03:00
parent 2f223cfb5e
commit 28a376f874
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -161,7 +161,8 @@ define([
}, },
'cells:range': function(status){ 'cells:range': function(status){
me.onCellsRange(status); me.onCellsRange(status);
} },
'tabs:dragend': _.bind(me.onDragEndMouseUp, me)
}); });
Common.Gateway.on('processmouse', _.bind(me.onProcessMouse, me)); Common.Gateway.on('processmouse', _.bind(me.onProcessMouse, me));
@ -1525,6 +1526,10 @@ define([
(data.type == 'mouseup') && (this.mouse.isLeftButtonDown = false); (data.type == 'mouseup') && (this.mouse.isLeftButtonDown = false);
}, },
onDragEndMouseUp: function() {
this.mouse.isLeftButtonDown = false;
},
onDocumentMouseMove: function(e) { onDocumentMouseMove: function(e) {
if (e.target.localName !== 'canvas') { if (e.target.localName !== 'canvas') {
this.hideHyperlinkTip(); this.hideHyperlinkTip();

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

@ -243,6 +243,7 @@ define([
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(index, _.findWhere(arrData, {type: 'indexes'}).value);
Common.NotificationCenter.trigger('tabs:dragend', this);
} else { } else {
var names = [], wc = this.api.asc_getWorksheetsCount(); var names = [], wc = this.api.asc_getWorksheetsCount();
while (wc--) { while (wc--) {
@ -284,6 +285,7 @@ define([
} }
} }
this.dropTabs = undefined; this.dropTabs = undefined;
Common.NotificationCenter.trigger('tabs:dragend', this);
}, this) }, this)
}); });