X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=ang%2FcrmUi.js;h=ecfe172a99c837a8f2c2919ad9a4881e26e45048;hb=f6cecca82b633c59425f51d27f7ae0db689233fc;hp=b27499fdeed5f1a95bb28da6f146642ace5fe7bf;hpb=7d2bebc479b977f4f6db250d5ac11fc57849b4f8;p=civicrm-core.git
diff --git a/ang/crmUi.js b/ang/crmUi.js
index b27499fdee..ecfe172a99 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -5,7 +5,7 @@
pageTitle = 'CiviCRM',
documentTitle = 'CiviCRM';
- angular.module('crmUi', [])
+ angular.module('crmUi', CRM.angRequires('crmUi'))
// example
...content...
// WISHLIST: crmCollapsed should support two-way/continuous binding
@@ -576,6 +576,7 @@
.directive('crmUiSelect', function ($parse, $timeout) {
return {
require: '?ngModel',
+ priority: 1,
scope: {
crmUiSelect: '='
},
@@ -611,7 +612,6 @@
element.crmSelect2(scope.crmUiSelect || {});
if (ngModel) {
element.on('change', refreshModel);
- $timeout(ngModel.$render);
}
}
@@ -690,7 +690,8 @@
return {
restrict: 'EA',
scope: {
- crmUiTabSet: '@'
+ crmUiTabSet: '@',
+ tabSetOptions: '@'
},
templateUrl: '~/crmUi/tabset.html',
transclude: true,
@@ -1010,7 +1011,7 @@
// If the CMS has already added title markup to the page, use it
$('h1').not('.crm-container h1').each(function() {
if (_.trim($(this).html()) === pageTitle) {
- $(this).html(newPageTitle);
+ $(this).addClass('crm-page-title').html(newPageTitle);
$el.hide();
}
});