Skip to content

Commit 0639088

Browse files
committed
rewrite
1 parent 160bf82 commit 0639088

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/mvc/core/MVCInject.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,23 @@ module mvc {
112112
}
113113
let aliasName = Singleton.GetAliasName(fullClassName);
114114
let isProxy = ReflectUtils.IsSubclassOf(classType, Proxy);
115-
let isMediator = ReflectUtils.IsSubclassOf(classType, Mediator);
116-
if (isProxy || isMediator) {
117-
Singleton.RegisterClass(classType, aliasName);
118-
} else {
115+
let isMediator:boolean;
116+
if(isProxy){
117+
if(this.facade.hasProxyByName(aliasName)) {
118+
return this.facade.getProxyByName(aliasName);
119+
}
120+
}else if(isMediator=ReflectUtils.IsSubclassOf(classType, Mediator)){
121+
if(this.facade.hasMediatorByName(aliasName)) {
122+
return this.facade.getMediatorByName(aliasName);
123+
}
124+
}else{
119125
let ins = new classType();
120126
if (ins[MVCInject.INJECTABLE_FULLNAME]) {
121127
ins = this.inject(ins);
122128
}
123129
return ins;
124130
}
125131

126-
if (isMediator && this.facade.hasMediatorByName(aliasName)) {
127-
return this.facade.getMediatorByName(aliasName);
128-
} else if (isProxy && this.facade.hasProxyByName(aliasName)) {
129-
return this.facade.getProxyByName(aliasName);
130-
}
131-
132132
let ins = this.facade.getInjectLock(aliasName);
133133
if (!ins) {
134134
ins = Singleton.__GetOrCreateOneInstance(aliasName);

0 commit comments

Comments
 (0)