# HG changeset patch # User rougeronj # Date 1434362894 -7200 # Node ID 66c3b474a3312cb24e154df92cbe27ed1fe0c406 # Parent a5da9a586297ab1d21f83624a5426c63bd8caa42 start backbone.history when project is done loading (loadingStatus = false) diff -r a5da9a586297 -r 66c3b474a331 client/js/dataloader.js --- a/client/js/dataloader.js Mon Jun 15 11:02:09 2015 +0200 +++ b/client/js/dataloader.js Mon Jun 15 12:08:14 2015 +0200 @@ -67,7 +67,6 @@ this.project.set(this.convert(data), { validate: true }); - Backbone.history.start(); }; })(window); diff -r a5da9a586297 -r 66c3b474a331 client/js/renderer/scene.js --- a/client/js/renderer/scene.js Mon Jun 15 11:02:09 2015 +0200 +++ b/client/js/renderer/scene.js Mon Jun 15 12:08:14 2015 +0200 @@ -365,6 +365,9 @@ _this.$.find(".loader").hide(250); }, 3000); } + else{ + Backbone.history.start(); + } }); this.renkan.project.on("add:users remove:users", _thRedrawUsers);