summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-03-21 16:41:29 +0100
committerMartin Kosek <mkosek@redhat.com>2013-03-22 13:40:01 +0100
commit7506a40a673f499cdcb2a4775362ff42bfaf83fa (patch)
tree9d510118d773fe2b2ccde90432c78f341b53d39c
parent722b1886a178f5727fcfef49558e5d5e855401c2 (diff)
downloadfreeipa-7506a40a673f499cdcb2a4775362ff42bfaf83fa.tar.gz
freeipa-7506a40a673f499cdcb2a4775362ff42bfaf83fa.tar.xz
freeipa-7506a40a673f499cdcb2a4775362ff42bfaf83fa.zip
Load extension.js after UI AMD modules.
This patch is fix for upcoming ipa-3-1 minor release. Loading of extension.js was removed with introduction of AMD modules. This patch returns the feature to avoid regressions. In 3.2 it will be handled differently (multiple plugins).
-rw-r--r--install/ui/src/freeipa/app.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/install/ui/src/freeipa/app.js b/install/ui/src/freeipa/app.js
index 3dcb10f49..c30d09fe9 100644
--- a/install/ui/src/freeipa/app.js
+++ b/install/ui/src/freeipa/app.js
@@ -116,11 +116,14 @@ define([
container.append('<p>'+error_thrown.message+'</p>');
}
+
return {
run: function() {
- IPA.init({
- on_success: init_on_success,
- on_error: init_on_error
+ require(['./ext/extension.js'], function() {
+ IPA.init({
+ on_success: init_on_success,
+ on_error: init_on_error
+ });
});
}
};