Skip to content

Commit

Permalink
refs #3813 use jqueryui tooltip plugin instead of piwiks selfmade one…
Browse files Browse the repository at this point in the history
… for datatables
  • Loading branch information
sgiehl committed Mar 29, 2013
1 parent 237517a commit f61bbbc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion plugins/CoreHome/templates/datatable.css
Expand Up @@ -636,7 +636,7 @@ table.dataTable .dataTableRowActions a img {
height: 17px;
}

body .piwik-tooltip.rowActionTooltip {
body .ui-tooltip.rowActionTooltip {
font-size: 11px;
padding: 3px 5px 3px 6px;
}
Expand Down
15 changes: 5 additions & 10 deletions plugins/CoreHome/templates/datatable.js
Expand Up @@ -1452,7 +1452,6 @@ dataTable.prototype =
return function (e) {
$(this).blur();
container.hide();
Piwik_Tooltip.hide();
if (typeof actionInstances[action.name].onClick == 'function') {
return actionInstances[action.name].onClick(el, tr, e);
}
Expand All @@ -1477,15 +1476,11 @@ dataTable.prototype =
}

if (typeof action.dataTableIconTooltip != 'undefined') {
actionEl.hover((function (action) {
return function () {
Piwik_Tooltip.showWithTitle(
action.dataTableIconTooltip[0],
action.dataTableIconTooltip[1],
'rowActionTooltip');
};
})(action), function () {
Piwik_Tooltip.hide();
actionEl.tooltip({
track: true,
items: 'a',
content: '<h3>'+action.dataTableIconTooltip[0]+'</h3>'+action.dataTableIconTooltip[1],
tooltipClass: 'rowActionTooltip'
});
}
}
Expand Down
4 changes: 1 addition & 3 deletions plugins/CoreHome/templates/jquery.ui.autocomplete.css
Expand Up @@ -55,9 +55,7 @@
}

.ui-widget-content {
background: url(../../../libs/jquery/themes/base/images/ui-bg_flat_75_ffffff_40x100.png) repeat-x scroll 50% 50% #FFFFFF;
border: 0 solid #D4D4D4;
color: #222;
border: 0;
}

.ui-corner-all {
Expand Down

0 comments on commit f61bbbc

Please sign in to comment.