Skip to content

Commit

Permalink
#245 Disregard gmeConfig when project or create in url.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmeijer committed Mar 16, 2015
1 parent ae547e6 commit ef66ac2
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/client/js/WebGME.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@ define(['logManager',
openProjectLoadDialog;

// URL query has higher priority than the config.
initialThingsToDo.projectToLoad = initialThingsToDo.projectToLoad || gmeConfig.client.defaultProject.name;
initialThingsToDo.branchToLoad = initialThingsToDo.branchToLoad || gmeConfig.client.defaultProject.branch;
initialThingsToDo.objectToLoad = initialThingsToDo.objectToLoad || gmeConfig.client.defaultProject.node;
if ((initialThingsToDo.projectToLoad || initialThingsToDo.createNewProject) === false) {
initialThingsToDo.projectToLoad = gmeConfig.client.defaultProject.name;
initialThingsToDo.branchToLoad = initialThingsToDo.branchToLoad || gmeConfig.client.defaultProject.branch;
initialThingsToDo.objectToLoad = initialThingsToDo.objectToLoad || gmeConfig.client.defaultProject.node;
}


layoutManager = new LayoutManager();
layoutManager.loadLayout(initialThingsToDo.layoutToLoad, function () {
Expand Down

0 comments on commit ef66ac2

Please sign in to comment.