projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-13823 - Switch statusPage to use tabbed interface
[civicrm-core.git]
/
ang
/
crmUi.js
diff --git
a/ang/crmUi.js
b/ang/crmUi.js
index 300d745a3a297bf41e642ff88a79eda5be8ca588..fc0310ba0ba6d5d240b80dd4eda3ff4ed5f8b665 100644
(file)
--- a/
ang/crmUi.js
+++ b/
ang/crmUi.js
@@
-394,7
+394,9
@@
}
ngModel.$render = function(value) {
}
ngModel.$render = function(value) {
- CRM.wysiwyg.setVal(elm, ngModel.$viewValue);
+ editor.done(function() {
+ CRM.wysiwyg.setVal(elm, ngModel.$viewValue);
+ });
};
}
};
};
}
};
@@
-429,20
+431,20
@@
var titleLocked = parse(attrs.titleLocked, ts('Locked'));
var titleUnlocked = parse(attrs.titleUnlocked, ts('Unlocked'));
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)
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)
.prop('title', titleLocked(scope))
;
}
else {
$(element)
- .removeClass('
ui-icon-locked
')
- .addClass('
ui-icon-unlocked
')
+ .removeClass('
fa-lock
')
+ .addClass('
fa-unlock
')
.prop('title', titleUnlocked(scope))
;
}
.prop('title', titleUnlocked(scope))
;
}
@@
-599,7
+601,7
@@
function init() {
// TODO watch select2-options
function init() {
// TODO watch select2-options
- element.
s
elect2(scope.crmUiSelect || {});
+ element.
crmS
elect2(scope.crmUiSelect || {});
if (ngModel) {
element.on('change', refreshModel);
$timeout(ngModel.$render);
if (ngModel) {
element.on('change', refreshModel);
$timeout(ngModel.$render);
@@
-837,13
+839,19
@@
};
})
};
})
- // Example: <button crm-icon="check">Save</button>
+ // Example for Font Awesome: <button crm-icon="fa-check">Save</button>
+ // Example for jQuery UI (deprecated): <button crm-icon="check">Save</button>
.directive('crmIcon', function() {
return {
restrict: 'EA',
scope: {},
link: function (scope, element, attrs) {
.directive('crmIcon', function() {
return {
restrict: 'EA',
scope: {},
link: function (scope, element, attrs) {
- $(element).prepend('<span class="icon ui-icon-' + attrs.crmIcon + '"></span> ');
+ if (attrs.crmIcon.substring(0,3) == 'fa-') {
+ $(element).prepend('<i class="crm-i ' + attrs.crmIcon + '"></i> ');
+ }
+ else {
+ $(element).prepend('<span class="icon ui-icon-' + attrs.crmIcon + '"></span> ');
+ }
if ($(element).is('button')) {
$(element).addClass('crm-button');
}
if ($(element).is('button')) {
$(element).addClass('crm-button');
}