pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 06:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE][SSE] Fix updating tip for custom bullet

Browse Source
This commit is contained in:
Julia Radzhabova
2022-05-13 13:47:53 +03:00
parent fd386eea95
commit ede44512e5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/main/lib/component/DataView.js
View File

@ -476,12 +476,12 @@ define([
var me = this,
view_el = $(view.el),
tip = record.get('tip');
if (tip) {
if (tip!==undefined && tip!==null) {
if (this.delayRenderTips)
view_el.one('mouseenter', function(){ // hide tooltip when mouse is over menu
view_el.attr('data-toggle', 'tooltip');
view_el.tooltip({
title : tip,
title : record.get('tip'), // use actual tip, because it can be changed
placement : 'cursor',
zIndex : me.tipZIndex
});
@ -490,7 +490,7 @@ define([
else {
view_el.attr('data-toggle', 'tooltip');
view_el.tooltip({
title : tip,
title : record.get('tip'), // use actual tip, because it can be changed
placement : 'cursor',
zIndex : me.tipZIndex
});

1
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View File

@ -3801,6 +3801,7 @@ define([
outerMenu: {menu: view.menuParagraphBullets.menu, index: 0},
groups : view.paraBulletsPicker.groups,
store : view.paraBulletsPicker.store,
delayRenderTips: true,
itemTemplate: _.template('<% if (type==0) { %>' +
'<div id="<%= id %>" class="item-markerlist"></div>' +
'<% } else if (type==1) { %>' +