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

Merge pull request #1436 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
catbasilio 2021-12-23 15:18:31 +03:00 committed by GitHub
parent 980a5b4c2b 98ad5de513
commit c4d2ddd032
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/HintManager.js
View file

@ -149,6 +149,9 @@ Common.UI.HintManager = new(function() {
var _showHints = function () { var _showHints = function () {
_inputLetters = ''; _inputLetters = '';
if (_currentLevel === 0) {
Common.NotificationCenter.trigger('toolbar:collapse');
}
if (_currentHints.length === 0 || ($('#file-menu-panel').is(':visible' || _isEditDiagram) && _currentLevel === 1)) { if (_currentHints.length === 0 || ($('#file-menu-panel').is(':visible' || _isEditDiagram) && _currentLevel === 1)) {
_getHints(); _getHints();
} }

2
apps/common/main/lib/mods/perfect-scrollbar.js
View file

@ -210,6 +210,7 @@
currentPageX; currentPageX;
$scrollbarX.bind('mousedown' + eventClassName, function (e) { $scrollbarX.bind('mousedown' + eventClassName, function (e) {
Common.NotificationCenter.trigger('hints:clear');
currentPageX = e.pageX; currentPageX = e.pageX;
currentLeft = $scrollbarX.position().left; currentLeft = $scrollbarX.position().left;
$scrollbarXRail.addClass('in-scrolling'); $scrollbarXRail.addClass('in-scrolling');
@ -240,6 +241,7 @@
currentPageY; currentPageY;
$scrollbarY.bind('mousedown' + eventClassName, function (e) { $scrollbarY.bind('mousedown' + eventClassName, function (e) {
Common.NotificationCenter.trigger('hints:clear');
currentPageY = e.pageY; currentPageY = e.pageY;
currentTop = $scrollbarY.position().top; currentTop = $scrollbarY.position().top;
$scrollbarYRail.addClass('in-scrolling'); $scrollbarYRail.addClass('in-scrolling');

3
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -231,6 +231,9 @@ define([
// Common.NotificationCenter.on('menu:afterkeydown', _.bind(this.onAfterKeydownMenu, this)); // Common.NotificationCenter.on('menu:afterkeydown', _.bind(this.onAfterKeydownMenu, this));
Common.NotificationCenter.on('style:commitsave', _.bind(this.onSaveStyle, this)); Common.NotificationCenter.on('style:commitsave', _.bind(this.onSaveStyle, this));
Common.NotificationCenter.on('style:commitchange', _.bind(this.onUpdateStyle, this)); Common.NotificationCenter.on('style:commitchange', _.bind(this.onUpdateStyle, this));
Common.NotificationCenter.on('toolbar:collapse', _.bind(function () {
this.toolbar.collapse();
}, this));
}, },
onLaunch: function() { onLaunch: function() {

3
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -177,6 +177,9 @@ define([
} }
} }
}); });
Common.NotificationCenter.on('toolbar:collapse', _.bind(function () {
this.toolbar.collapse();
}, this));
var me = this; var me = this;

3
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -149,6 +149,9 @@ define([
}); });
Common.NotificationCenter.on('page:settings', _.bind(this.onApiSheetChanged, this)); Common.NotificationCenter.on('page:settings', _.bind(this.onApiSheetChanged, this));
Common.NotificationCenter.on('formula:settings', _.bind(this.applyFormulaSettings, this)); Common.NotificationCenter.on('formula:settings', _.bind(this.applyFormulaSettings, this));
Common.NotificationCenter.on('toolbar:collapse', _.bind(function () {
this.toolbar.collapse();
}, this));
this.editMode = true; this.editMode = true;
this._isAddingShape = false; this._isAddingShape = false;