Skip to content

Commit

Permalink
use relative cmd/ url #19
Browse files Browse the repository at this point in the history
  • Loading branch information
peller committed Jan 28, 2013
1 parent f0af69a commit 9c20f56
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions maqetta.core.client/WebContent/davinci/Workbench.js
Expand Up @@ -378,7 +378,7 @@ var Workbench = {
},

logoff: function(args) {
var loading = dojo.create("div", {
dojo.create("div", {
'class': 'loading',
innerHTML: '<table><tr><td><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>&nbsp;Logging off...</td></tr></table>' // FIXME: i18n
}, dojo.body(), "first");
Expand Down Expand Up @@ -1065,9 +1065,8 @@ var Workbench = {
loadProject: function(projectName) {

return Workbench.setActiveProject(projectName).then(function(){
//location.href=".";
/* make sure the server has maqetta setup for the project */
location.href="/maqetta/cmd/configProject?configOnly=true&project=" + projectName;
// make sure the server has maqetta setup for the project
location.href="cmd/configProject?configOnly=true&project=" + encodeURIComponent(projectName);
});

// if the project was set via URL parameter, clear it off.
Expand Down Expand Up @@ -1200,10 +1199,8 @@ var Workbench = {
perspectiveId = Workbench.activePerspective,
perspective = Runtime.getExtension("davinci.perspective", perspectiveId),
position = 'left',
cp1 = null,
created = false,
pxHeight = dijit.byId('mainBody')._borderBox.h - 5;

cp1 = null;

dojo.some(perspective.views, function(view){
if(view.viewID == viewId){
position = view.position;
Expand Down

0 comments on commit 9c20f56

Please sign in to comment.