Fix onLoad callback

src/css_composer/main.js

@@ -81,18 +81,23 @@ define(function(require) {
           rules = new CssRules([], c);
           rules.add(c.rules);
 
-          // Load if requested
-          if(c.stm && c.stm.getConfig().autoload)
-            this.load();
-
           rulesView = new CssRulesView({
             collection: rules,
             config: c,
           });
+          return this;
+        },
+
+        /**
+         * On load callback
+         * @private
+         */
+        onLoad: function(){
+          if(c.stm && c.stm.getConfig().autoload)
+              this.load();
 
           if(c.stm && c.stm.isAutosave())
             c.em.listenRules(this.getAll());
-          return this;
         },
 
         /**
@@ -114,7 +119,8 @@ define(function(require) {
           }else if(d.css)
             obj = c.em.get('Parser').parseCss(d.css);
 
-          rules.reset(obj);
+          if(obj)
+            rules.reset(obj);
           return obj;
         },
 

src/dom_components/main.js

@@ -139,7 +139,8 @@ define(function(require) {
         }else if(d.html)
           obj = d.html;
 
-        this.getComponents().reset(obj);
+        if(obj)
+          this.getComponents().reset(obj);
         return obj;
       },
 

src/editor/model/Editor.js

@@ -14,6 +14,7 @@ define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'Dev
 				previousModel: null,
 				changesCount:	0,
 				storables: [],
+				toLoad: [],
 				device: '',
 			},
 
@@ -29,6 +30,10 @@ define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'Dev
 					this.loadModule(name);
 				}, this);
 
+				this.get('toLoad').forEach(function(M){
+					M.onLoad();
+				});
+
 				this.initUndoManager(); // Is already called (inside components and css composer)
 
 				this.on('change:selectedComponent', this.componentSelected, this);
@@ -61,9 +66,8 @@ define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'Dev
 				if(!M.private)
 					this.set(M.name, M);
 
-				// Load callback
 				if(M.onLoad)
-					M.onLoad();
+					this.get('toLoad').push(M);
 
 				return this;
 			},