diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js index 7edb86952..d3a1f3bd0 100644 --- a/apps/common/main/lib/component/ComboDataView.js +++ b/apps/common/main/lib/component/ComboDataView.js @@ -91,6 +91,7 @@ define([ this.rendered = false; this.needFillComboView = false; this.minWidth = this.options.minWidth; + this.delayRenderTips = this.options.delayRenderTips || false; this.fieldPicker = new Common.UI.DataView({ cls: 'field-picker', @@ -102,7 +103,8 @@ define([ '<%= title %>', '<% } %>', '' - ].join('')) + ].join('')), + delayRenderTips: this.delayRenderTips }); this.openButton = new Common.UI.Button({ @@ -137,7 +139,8 @@ define([ '<%= title %>', '<% } %>', '' - ].join('')) + ].join('')), + delayRenderTips: this.delayRenderTips }); // Handle resize diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 1fc31a77f..76f887b5a 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -272,6 +272,7 @@ define([ me.allowScrollbar = (me.options.allowScrollbar!==undefined) ? me.options.allowScrollbar : true; me.scrollAlwaysVisible = me.options.scrollAlwaysVisible || false; me.tabindex = me.options.tabindex || 0; + me.delayRenderTips = me.options.delayRenderTips || false; if (me.parentMenu) me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0); me.rendered = false; @@ -454,14 +455,28 @@ define([ var idx = _.indexOf(this.store.models, record); this.dataViewItems = this.dataViewItems.slice(0, idx).concat(view).concat(this.dataViewItems.slice(idx)); - if (record.get('tip')) { - var view_el = $(view.el); - view_el.attr('data-toggle', 'tooltip'); - view_el.tooltip({ - title : record.get('tip'), - placement : 'cursor', - zIndex : this.tipZIndex - }); + var me = this, + view_el = $(view.el), + tip = record.get('tip'); + if (tip) { + 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, + placement : 'cursor', + zIndex : me.tipZIndex + }); + view_el.mouseenter(); + }); + else { + view_el.attr('data-toggle', 'tooltip'); + view_el.tooltip({ + title : tip, + placement : 'cursor', + zIndex : me.tipZIndex + }); + } } this.listenTo(view, 'change', this.onChangeItem); diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 04d71b17a..1470e4092 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -235,7 +235,8 @@ define([ cls: 'combo-chart-style', dataHint: '1', dataHintDirection: 'bottom', - dataHintOffset: 'big' + dataHintOffset: 'big', + delayRenderTips: true }); this.cmbWrapType.menuPicker.itemTemplate = this.cmbWrapType.fieldPicker.itemTemplate = _.template([ '