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

[DE] Fix Bug 51614

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-30 14:33:35 +03:00
parent 6dc642b47c
commit 8fa074ef8d
8 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/embed/resources/less/common.less
View file

@ -687,6 +687,7 @@
font-weight: bold;
font-size: 11px;
box-shadow: 0 6px 12px rgba(0,0,0,0.175);
max-width: 350px;
padding: 5px 12px;
white-space: pre-wrap;

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

@ -221,7 +221,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="" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

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

@ -213,7 +213,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="" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

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

@ -322,7 +322,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="" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/documenteditor/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="" style="display:none;"></div>
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

56
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -44,7 +44,8 @@ DE.ApplicationController = new(function(){
appOptions = {},
btnSubmit,
_submitFail, $submitedTooltip, $requiredTooltip,
$listControlMenu, listControlItems = [], listObj;
$listControlMenu, listControlItems = [], listObj,
bodyWidth = 0;
var LoadingDocument = -256;
@ -84,6 +85,7 @@ DE.ApplicationController = new(function(){
} else {
$('#toolbar').addClass('top');
$('#editor_sdk').addClass('top');
ttOffset[1] = 40;
}
config.canBackToFolder = (config.canBackToFolder!==false) && config.customization && config.customization.goback &&
@ -219,33 +221,47 @@ DE.ApplicationController = new(function(){
var $ttEl, $tooltip;
function onDocMouseMove(data) {
if (data) {
if (data.get_Type() == 1) { // hyperlink
var type = data.get_Type();
if (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Form) { // hyperlink
me.isHideBodyTip = false;
var str = (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? me.txtPressLink : data.get_FormHelpText();
if (str.length>500)
str = str.substr(0, 500) + '...';
str = common.utils.htmlEncode(str);
if ( !$ttEl ) {
$ttEl = $('.hyperlink-tooltip');
$ttEl.tooltip({'container':'body', 'trigger':'manual'});
$ttEl.on('shown.bs.tooltip', function(e) {
}
$ttEl.ttpos = [data.get_X(), data.get_Y()];
if ( !$tooltip)
$tooltip = $ttEl.data('bs.tooltip').tip();
$tooltip.css({
left: $ttEl.ttpos[0] + ttOffset[0],
top: $ttEl.ttpos[1] + ttOffset[1]
});
if (!$tooltip.is(':visible')) {
var tip = $ttEl.data('bs.tooltip');
tip.options.title = str;
tip.show([-1000, -1000]);
} else
$tooltip.find('.tooltip-inner')['text'](str);
$tooltip.find('.tooltip-arrow').css({left: 10});
});
}
var ttHeight = $tooltip.height(),
ttWidth = $tooltip.width();
!bodyWidth && (bodyWidth = $('body').width());
if ( !$tooltip ) {
$ttEl.ttpos = [data.get_X(), data.get_Y()];
$ttEl.tooltip('show');
} else {
$tooltip.css({
left:data.get_X() + ttOffset[0],
top:data.get_Y() + ttOffset[1]
});
$ttEl.ttpos[1] -= (ttHeight - ttOffset[1] + 20);
if ($ttEl.ttpos[0] + ttWidth + 10 >bodyWidth) {
$ttEl.ttpos[0] = bodyWidth - ttWidth - 5;
if ($ttEl.ttpos[1] < 0)
$ttEl.ttpos[1] += ttHeight + ttOffset[1] + 20;
} else if ($ttEl.ttpos[1] < 0) {
$ttEl.ttpos[1] = 0;
$ttEl.ttpos[0] += 20;
}
$tooltip.css({
left: $ttEl.ttpos[0],
top: $ttEl.ttpos[1]
});
}
}
}
@ -807,6 +823,7 @@ DE.ApplicationController = new(function(){
function onDocumentResize() {
api && api.Resize();
bodyWidth = $('body').width();
}
function createController(){
@ -910,6 +927,7 @@ DE.ApplicationController = new(function(){
textRequired: 'Fill all required fields to send form.',
textGotIt: 'Got it',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
txtEmpty: '(Empty)'
txtEmpty: '(Empty)',
txtPressLink: 'Press Ctrl and click link'
}
})();

1
apps/documenteditor/embed/locale/en.json
View file

@ -35,6 +35,7 @@
"DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"DE.ApplicationController.waitText": "Please, wait...",
"DE.ApplicationController.txtEmpty": "(Empty)",
"DE.ApplicationController.txtPressLink": "Press Ctrl and click link",
"DE.ApplicationView.txtDownload": "Download",
"DE.ApplicationView.txtDownloadDocx": "Download as docx",
"DE.ApplicationView.txtDownloadPdf": "Download as pdf",

1
apps/documenteditor/embed/locale/ru.json
View file

@ -33,6 +33,7 @@
"DE.ApplicationController.unknownErrorText": "Неизвестная ошибка.",
"DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
"DE.ApplicationController.waitText": "Пожалуйста, подождите...",
"DE.ApplicationController.txtPressLink": "Нажмите Ctrl и щелкните по ссылке",
"DE.ApplicationView.txtDownload": "Скачать файл",
"DE.ApplicationView.txtDownloadDocx": "Скачать как docx",
"DE.ApplicationView.txtDownloadPdf": "Скачать как pdf",