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 b5c76b2c3de065a3c4d3e33ac79a13daeb58a1bb..fc0310ba0ba6d5d240b80dd4eda3ff4ed5f8b665 100644 (file)
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -394,7 +394,9 @@
           }
 
           ngModel.$render = function(value) {
-            CRM.wysiwyg.setVal(elm, ngModel.$viewValue);
+            editor.done(function() {
+              CRM.wysiwyg.setVal(elm, ngModel.$viewValue);
+            });
           };
         }
       };
@@ -599,7 +601,7 @@
 
           function init() {
             // TODO watch select2-options
-            element.select2(scope.crmUiSelect || {});
+            element.crmSelect2(scope.crmUiSelect || {});
             if (ngModel) {
               element.on('change', refreshModel);
               $timeout(ngModel.$render);