src/js/init.js
branchpopcorn-port
changeset 795 8b69c3dbbc18
parent 785 980163a156d1
child 810 85a278e12495
--- a/src/js/init.js	Thu Feb 09 11:56:33 2012 +0100
+++ b/src/js/init.js	Thu Feb 09 11:56:57 2012 +0100
@@ -157,7 +157,9 @@
 
 /** configure modules. @see configureWidgets */
 IriSP.configureModules = function (popcornInstance, modulesList) {
- 
+  if (IriSP.null_or_undefined(modulesList))
+    return;
+  
   var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader);
   var ret_modules = [];
   var index;
@@ -246,6 +248,11 @@
   IriSP.paths = IriSP.underscore.defaults(IriSP.paths, IriSP.defaults.paths);
   IriSP.default_templates_vars = IriSP.underscore.defaults(IriSP.default_templates_vars, 
                                        IriSP.defaults.default_templates_vars());
+
+  if (IriSP.null_or_undefined(IriSP.user))
+    IriSP.user = {};
+  
+  IriSP.user = IriSP.underscore.defaults(IriSP.user, IriSP.defaults.user());
 };
 
 /** single point of entry for the metadataplayer */