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

Merge pull request #1397 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-12-07 20:38:29 +03:00 committed by GitHub
parent 0afd388801 ddf2be862c
commit 4ac91c3042
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -108,6 +108,7 @@ define([
Common.Gateway.on('init', this.loadConfig.bind(this));
Common.Gateway.on('opendocument', this.loadDocument.bind(this));
Common.Gateway.on('showmessage', this.onExternalMessage.bind(this));
Common.NotificationCenter.on('showmessage', this.onExternalMessage.bind(this));
Common.Gateway.appReady();
}

2
apps/presentationeditor/embed/index.html
View file

@ -273,7 +273,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/presentationeditor/embed/index.html.deploy
View file

@ -267,7 +267,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/presentationeditor/embed/index_loader.html
View file

@ -321,7 +321,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/presentationeditor/embed/index_loader.html.deploy
View file

@ -314,7 +314,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

11
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -41,7 +41,7 @@ PE.ApplicationController = new(function(){
maxPages = 0,
created = false,
currentPage = 0,
ttOffset = [0, -10],
ttOffset = [5, -10],
labelDocName;
var LoadingDocument = -256;
@ -206,10 +206,11 @@ PE.ApplicationController = new(function(){
$ttEl.tooltip({'container':'body', 'trigger':'manual'});
$ttEl.on('shown.bs.tooltip', function(e) {
$tooltip = $ttEl.data('bs.tooltip').tip();
var pos = $ttEl.ttpos[1] - $tooltip.height() + ttOffset[1];
(pos<0) && (pos = 0);
$tooltip.css({
left: $ttEl.ttpos[0] + ttOffset[0],
top: $ttEl.ttpos[1] + ttOffset[1]
top: pos
});
$tooltip.find('.tooltip-arrow').css({left: 10});
@ -220,9 +221,11 @@ PE.ApplicationController = new(function(){
$ttEl.ttpos = [data.get_X(), data.get_Y()];
$ttEl.tooltip('show');
} else {
var pos = $ttEl.ttpos[1] - $tooltip.height() + ttOffset[1];
(pos<0) && (pos = 0);
$tooltip.css({
left:data.get_X() + ttOffset[0],
top:data.get_Y() + ttOffset[1]
top:pos
});
}
}

2
apps/spreadsheeteditor/embed/index.html
View file

@ -246,7 +246,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -238,7 +238,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/spreadsheeteditor/embed/index_loader.html
View file

@ -320,7 +320,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/spreadsheeteditor/embed/index_loader.html.deploy
View file

@ -312,7 +312,7 @@
</div>
</div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Press Ctrl and click the link" style="display:none;"></div>
<div class="hyperlink-tooltip" data-toggle="tooltip" title="Click the link to open it" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>