X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=ang%2FcrmUi.js;h=b5c76b2c3de065a3c4d3e33ac79a13daeb58a1bb;hb=98de9232b0152a9aaa270dc5f5ce11becf192b56;hp=4e9afcfaada724dd47bd5c051f640bdd5720f3b2;hpb=88cdfcb1999b6cba85e1cb5d68eb4df891cdd028;p=civicrm-core.git
diff --git a/ang/crmUi.js b/ang/crmUi.js
index 4e9afcfaad..b5c76b2c3d 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -64,7 +64,7 @@
// Simple wrapper around $.crmDatepicker.
// example with no time input:
- // example with custom date format:
+ // example with custom date format:
.directive('crmUiDatepicker', function () {
return {
restrict: 'AE',
@@ -429,20 +429,20 @@
var titleLocked = parse(attrs.titleLocked, ts('Locked'));
var titleUnlocked = parse(attrs.titleUnlocked, ts('Unlocked'));
- $(element).addClass('ui-icon lock-button');
+ $(element).addClass('crm-i lock-button');
var refresh = function () {
var locked = binding(scope);
if (locked) {
$(element)
- .removeClass('ui-icon-unlocked')
- .addClass('ui-icon-locked')
+ .removeClass('fa-unlock')
+ .addClass('fa-lock')
.prop('title', titleLocked(scope))
;
}
else {
$(element)
- .removeClass('ui-icon-locked')
- .addClass('ui-icon-unlocked')
+ .removeClass('fa-lock')
+ .addClass('fa-unlock')
.prop('title', titleUnlocked(scope))
;
}
@@ -837,13 +837,19 @@
};
})
- // Example:
+ // Example for Font Awesome:
+ // Example for jQuery UI (deprecated):
.directive('crmIcon', function() {
return {
restrict: 'EA',
scope: {},
link: function (scope, element, attrs) {
- $(element).prepend(' ');
+ if (attrs.crmIcon.substring(0,3) == 'fa-') {
+ $(element).prepend(' ');
+ }
+ else {
+ $(element).prepend(' ');
+ }
if ($(element).is('button')) {
$(element).addClass('crm-button');
}