Browse Source

closes #283

pull/335/head
Alper Ebicoglu 8 years ago
parent
commit
831dd93749
  1. 15
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

15
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

@ -78,10 +78,12 @@
if (fieldItem.displayNameHtml) { if (fieldItem.displayNameHtml) {
$a.html(fieldItem.text); $a.html(fieldItem.text);
} else { } else {
if (fieldItem.icon) {
var icon = fieldItem.iconClass ? fieldItem.iconClass : "fa fa-" + fieldItem.icon; if (fieldItem.icon !== undefined && fieldItem.icon) {
$a.append($("<i>").addClass(icon + " mr-1")); $a.append($("<i>").addClass("fa fa-" + fieldItem.icon + " mr-1"));
} } else if (fieldItem.iconClass) {
$a.append($("<i>").addClass(fieldItem.iconClass + " mr-1"));
}
$a.append(fieldItem.text); $a.append(fieldItem.text);
} }
@ -115,14 +117,13 @@
.addClass('action-button'); .addClass('action-button');
var $dropdownButton = $('<button/>'); var $dropdownButton = $('<button/>');
if (field.icon !== undefined) { if (field.icon !== undefined) {
//setting field.icon=null will show no icon.
if (field.icon) { if (field.icon) {
$dropdownButton.append($("<i>").addClass("fa fa-" + field.icon + " mr-1")); $dropdownButton.append($("<i>").addClass("fa fa-" + field.icon + " mr-1"));
} }
} else if (field.iconClass) { } else if (field.iconClass) {
$dropdownButton.append($("<i>").addClass(field.iconClass)); $dropdownButton.append($("<i>").addClass(field.iconClass + " mr-1"));
} else { } else {
$dropdownButton.append($("<i>").addClass("fa fa-cog mr-1")); $dropdownButton.append($("<i>").addClass("fa fa-cog mr-1"));
} }

Loading…
Cancel
Save