From 1d802d12a476ca6918a8d325ed6b29d5103f0c94 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvoborni@redhat.com>
Date: Fri, 12 Apr 2013 17:25:24 +0200
Subject: Builder: allow to use custom factory/ctor when using type

https://fedorahosted.org/freeipa/ticket/3235
---
 install/ui/src/freeipa/_base/Builder.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/install/ui/src/freeipa/_base/Builder.js b/install/ui/src/freeipa/_base/Builder.js
index bcd60715..464a2c09 100644
--- a/install/ui/src/freeipa/_base/Builder.js
+++ b/install/ui/src/freeipa/_base/Builder.js
@@ -158,15 +158,7 @@ define(['dojo/_base/declare',
                 delete s.$pre_ops;
                 delete s.$post_ops;
 
-                if (c) {
-                    cs.ctor = c;
-                    cs.spec = s;
-                }
-                else if (f) {
-                    cs.factory = f;
-                    cs.spec = s;
-                }
-                else if (t) {
+                if (t) {
                     cs = this._query_registry(t);
                     if (cs.spec && m) {
                         lang.mixin(cs.spec, s);
@@ -177,6 +169,9 @@ define(['dojo/_base/declare',
                     cs.spec = s;
                 }
 
+                if (c) cs.ctor = c;
+                if (f) cs.factory = f;
+
                 cs.pre_ops = cs.pre_ops || [];
                 cs.post_ops = cs.post_ops || [];
                 if (pre) cs.pre_ops.push.call(cs.pre_ops, pre);
-- 
cgit