File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,12 @@ global.moduleInit = function() {
73
73
return ev ;
74
74
} ;
75
75
76
+ function modelInit ( modelName , newModel )
77
+ {
78
+ for ( var i in model [ modelName ] ) delete model [ modelName ] [ i ] ;
79
+ for ( var i in newModel ) model [ modelName ] [ i ] = newModel [ i ] ;
80
+ }
81
+
76
82
//initialize step1
77
83
for ( var i in config . modules )
78
84
{
@@ -115,6 +121,10 @@ for(var i in config.modules)
115
121
} finally {
116
122
if ( module )
117
123
{
124
+ if ( info . type == 'model' )
125
+ {
126
+ modelInit ( info . name , module . model ) ;
127
+ }
118
128
if ( hasOwnProperty ( modules [ i ] , 'ready' ) ) module . ready ( ) ;
119
129
console . log ( '....OK!' ) ;
120
130
}
@@ -144,8 +154,7 @@ for(var i in config.modules)
144
154
}
145
155
else if ( info . type == 'model' )
146
156
{
147
- for ( var i in module . model )
148
- model [ info . name ] [ i ] = module . model [ i ] ;
157
+ modelInit ( info . name , module . model ) ;
149
158
}
150
159
else if ( info . type == 'extension' )
151
160
{
You can’t perform that action at this time.
0 commit comments