Commit c510b2a7 authored by Benjamin Fischer's avatar Benjamin Fischer
Browse files

Merge branch 'branches/windowManager' of...

Merge branch 'branches/windowManager' of hg::ssh://forge.physik.rwth-aachen.de/hg/vispa-web/vispa into branches/windowManager
parents 0d15ca45 5c15e02c
......@@ -252,7 +252,7 @@ define(["jquery", "emitter"], function($, Emitter) {
sort: "name",
reverse: false
};
this.view.spawnInstance("file", "FileSelector", args);
this.view.spawnInstance("file2", "FileSelector", args);
return this;
},
......
......@@ -9,14 +9,15 @@ define(["jquery", "emitter", "vispa/extension"], function($, Emitter, Extension)
this.view = view;
// commandline template -> list of extensions
this.commandlineTemplates = {
"python %file": ["py"],
"sh %file": ["sh"],
"php %file": ["php"],
"pdflatex %file": ["tex"],
"gcc %file -o %file.out && ./%file.out": ["c"],
"g++ %file -o %file.out && ./%file.out": ["cc", "cp", "cxx", "cpp", "CPP", "c++", "C"],
"R -f %file": ["R"],
"octave -q -f %file": ["m"]
"python '%file'": ["py"],
"sh '%file'": ["sh"],
"php '%file'": ["php"],
"pdflatex '%file'": ["tex"],
"gcc '%file' -o '%file.out' && './%file.out'": ["c"],
"g++ '%file' -o '%file.out' && './%file.out'": ["cc", "cp", "cxx", "cpp",
"CPP", "c++", "C"],
"R -f '%file'": ["R"],
"octave -q -f '%file'": ["m"]
};
this.commandline = null;
......@@ -208,7 +209,7 @@ define(["jquery", "emitter", "vispa/extension"], function($, Emitter, Extension)
var node = $("<a/>");
node.html(name);
node.on({
mouseover: function() {
mouseover: function() {
$("body").css("cursor", "hand");
},
mouseleave: function() {
......
......@@ -306,7 +306,7 @@ define(["jquery", "emitter"], function($, Emitter) {
sort: "name",
reverse: false
};
this.view.spawnInstance("file", "FileSelector", args);
this.view.spawnInstance("file2", "FileSelector", args);
}
});
......
......@@ -239,7 +239,7 @@ define([
reverse: false
};
this.spawnInstance("file", "FileSelector", args);
this.spawnInstance("file2", "FileSelector", args);
}
},{
iconClass: "fa-file-text",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment