equal
deleted
inserted
replaced
155 return ret_widgets; |
155 return ret_widgets; |
156 }; |
156 }; |
157 |
157 |
158 /** configure modules. @see configureWidgets */ |
158 /** configure modules. @see configureWidgets */ |
159 IriSP.configureModules = function (popcornInstance, modulesList) { |
159 IriSP.configureModules = function (popcornInstance, modulesList) { |
160 |
160 if (IriSP.null_or_undefined(modulesList)) |
|
161 return; |
|
162 |
161 var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader); |
163 var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader); |
162 var ret_modules = []; |
164 var ret_modules = []; |
163 var index; |
165 var index; |
164 |
166 |
165 for (index = 0; index < modulesList.length; index++) { |
167 for (index = 0; index < modulesList.length; index++) { |
244 } |
246 } |
245 |
247 |
246 IriSP.paths = IriSP.underscore.defaults(IriSP.paths, IriSP.defaults.paths); |
248 IriSP.paths = IriSP.underscore.defaults(IriSP.paths, IriSP.defaults.paths); |
247 IriSP.default_templates_vars = IriSP.underscore.defaults(IriSP.default_templates_vars, |
249 IriSP.default_templates_vars = IriSP.underscore.defaults(IriSP.default_templates_vars, |
248 IriSP.defaults.default_templates_vars()); |
250 IriSP.defaults.default_templates_vars()); |
|
251 |
|
252 if (IriSP.null_or_undefined(IriSP.user)) |
|
253 IriSP.user = {}; |
|
254 |
|
255 IriSP.user = IriSP.underscore.defaults(IriSP.user, IriSP.defaults.user()); |
249 }; |
256 }; |
250 |
257 |
251 /** single point of entry for the metadataplayer */ |
258 /** single point of entry for the metadataplayer */ |
252 IriSP.initPlayer = function(config, metadata_url, libdir, platform_url) { |
259 IriSP.initPlayer = function(config, metadata_url, libdir, platform_url) { |
253 IriSP.configureDefaults(libdir, platform_url); |
260 IriSP.configureDefaults(libdir, platform_url); |