Merge branch 'develop' into hotfix/v5.0.4

This commit is contained in:
Julia Radzhabova
2017-11-13 18:32:25 +03:00
committed by GitHub
154 changed files with 7236 additions and 883 deletions

View File

@ -64,6 +64,7 @@ define([
onResetItems : function() {
this.innerEl = null;
Common.UI.DataView.prototype.onResetItems.call(this);
this.trigger('items:reset', this);
},
onAddItem: function(record, index) {
@ -97,6 +98,16 @@ define([
this.listenTo(view, 'dblclick',this.onDblClickItem);
this.listenTo(view, 'select', this.onSelectItem);
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
});
}
if (!this.isSuspendEvents)
this.trigger('item:add', this, view, record);
}