Commit 364ff7d6 authored by Jérémie Garcia's avatar Jérémie Garcia

build update and small fix

parent bc9e6cc7
......@@ -14,8 +14,8 @@ gulp.task('traj', function () {
'!./cache/**',
'!./build/**',
'!./node_modules/gulp/**',
'./node_modules/gulp-util/**',
'./node_modules/nw-builder/**'],
'!./node_modules/gulp-util/**',
'!./node_modules/nw-builder/**'],
//platforms: ['osx32', 'win32', 'linux32'] // change this to 'win' for/on windows
platforms: ['osx'] // change this to 'win' for/on windows
});
......
......@@ -21,7 +21,7 @@
"ws": "0.7.1"
},
"devDependencies": {
"gulp": "^3.8.11",
"gulp": "^3.9.0",
"gulp-util": "3.0.4",
"nw-builder": "^2.0.2"
}
......
if (typeof require !== 'undefined') {
var fs = require('fs'),
var fs = require('fs'),
ws = require('ws'),
url = require('url'),
net = require('net'),
......@@ -15,7 +15,7 @@ if (typeof require !== 'undefined') {
if(typeof global.interface === 'undefined') { // only run if not reloading...
var OSC_ADMIN_PORT = 10000, WEBSOCKET_ADMIN_PORT = 10001, ids = [];
global.interface = {
count: 0,
servers: [],
......@@ -910,12 +910,11 @@ var path = window.location.pathname;
path = path.substr(0, path.lastIndexOf('WOB'));
var save_directory = path + "traj";
//WArning may have permission problems!
if (!fs.existsSync(save_directory)){
fs.mkdirSync(save_directory);
}
function savetraj(args){
var session_dir = save_directory+"/"+args[0];
......@@ -978,7 +977,6 @@ var default_traj_server = {
name : "TrajectoiresServer",
};
var def_server = global.interface.serverRow(default_traj_server);
//global.interface.trajectoiresPage = fs.readFileSync( './server/interfaces/Trajectoires.html', ['utf-8'] );
......@@ -995,7 +993,6 @@ var def_server = global.interface.serverRow(default_traj_server);
}
}
var server_ip = addresses[0];
// var server_ip = os.hostname();
var link = 'http://' + server_ip + ':8080/Trajectoires.html';
......@@ -1018,7 +1015,6 @@ code.on('end', function() {
document.getElementById("target-qrcode").appendChild(elem);
});
global.interface.oscAdminIn.on('', function(args) {
if(args.path in __admin) {
__admin[ args.path ]( args.params, { type:'OSC' } );
......@@ -1056,7 +1052,7 @@ Mousetrap.bind('command+escape', function() { win.isFullscreen = !win.isFullscre
$(window).on('load', function() {
win.moveTo(0,30);
win.resizeTo(800, 650);
//win.blur();
win.show();
//win.blur();
win.show();
});
}
......@@ -38,9 +38,6 @@ Traj.Manager = {
cpt++;
}
};
console.log("Get Multiplay create");
console.log(indexes);
return indexes;
},
......@@ -50,9 +47,7 @@ Traj.Manager = {
},
createMultiPlayIndexes : function(){
var indexes = [];
//for each sources
for (var i = 0 ; i < Traj.Manager.NB_SOURCES; i++) {
var idx = 'undefined';
......
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