From c420ac3c8013d4a9edee8dd9943f1eb22cd2d99c Mon Sep 17 00:00:00 2001 From: Antoine ELIAS Date: Tue, 29 Mar 2016 12:20:19 +0200 Subject: [PATCH] remove trailing whitesapce Change-Id: I8d71e0667484ca3937229ea35c7840499b4ac9ba --- scilab/node/scilab_process.js | 14 +++++----- scilab/node/scilab_server.js | 36 ++++++++++++------------- scilab/node/static/index.html | 50 +++++++++++++++++------------------ scilab/node/static/main.js | 24 ++++++++--------- scilab/node/static/scilab.css | 8 +++--- scilab/node/static/scilab_create.js | 10 +++---- scilab/node/static/scilab_setter.js | 12 ++++----- 7 files changed, 77 insertions(+), 77 deletions(-) diff --git a/scilab/node/scilab_process.js b/scilab/node/scilab_process.js index c687e7f..975cc12 100644 --- a/scilab/node/scilab_process.js +++ b/scilab/node/scilab_process.js @@ -31,7 +31,7 @@ dispatchio.on('connection', function (dspSocket) { }); dspSocket.on('force_reload', function (msg) { - msgHistory = []; //reset history, sciab was closed or has crashed. + msgHistory = []; //reset history, sciab was closed or has crashed. }); dspSocket.on('imagepath', function (msg) { @@ -40,7 +40,7 @@ dispatchio.on('connection', function (dspSocket) { dspSocket.on('quit', function () { L('quit' + '(' + process.pid + ')'); - + //prevent accidental close, wait 10 minutes before really close Scilab. quitTO = setTimeout( function() { L('send quit to Scilab'); @@ -58,14 +58,14 @@ dispatchio.on('connection', function (dspSocket) { //resend all gui creation information var size = msgHistory.length; L('history: ' + size); - dspSocket.emit("graphic_reconnection", "start"); + dspSocket.emit("graphic_reconnection", "start"); for(var i = 0 ; i < size ; ++i) { //L('%d : %s', i+1, msgHistory[i]); dspSocket.emit('graphic_create', msgHistory[i]); } - dspSocket.emit("graphic_reconnection", "end"); + dspSocket.emit("graphic_reconnection", "end"); }); - + L('open commandio socket'); //start command server to chat with Scilab var commandio = require('socket.io')(cmdPort); @@ -117,7 +117,7 @@ dispatchio.on('connection', function (dspSocket) { L('scilab graphic disconnected'+ '(' + process.pid + ')'); graphic_ready = false; }); - + //send to server scilab is ready graphic_ready = true; if(command_ready) { @@ -145,7 +145,7 @@ dispatchio.on('connection', function (dspSocket) { scilabApp.stdout.on('data', function(data) { L('scilab out :' + data.toString()); }); - */ + */ scilabApp.stderr.on('data', function(data) { L('scilab err :' + data.toString()); }); diff --git a/scilab/node/scilab_server.js b/scilab/node/scilab_server.js index 252a6a4..160fbc5 100644 --- a/scilab/node/scilab_server.js +++ b/scilab/node/scilab_server.js @@ -18,12 +18,12 @@ var processAlive = false; var prcSocket; io.on('connection', function (socket) { //incoming connection from web users - + if(processAlive === false) { //start process fork('./scilab_process.js'/*, [], {execArgv: ['--debug=5859']}*/); processAlive = true; - + var prcAddr = 'http://127.0.0.1:10002'; prcSocket = require('socket.io-client')(prcAddr); L('dispatcher connected'); @@ -34,30 +34,30 @@ io.on('connection', function (socket) { } prcSocket.emit('imagepath', {path:__dirname + '/static/'}); - + prcSocket.on('command_end', function() { socket.emit('command_end'); }); - + prcSocket.on('graphic_create', function(msg) { //L(msg); socket.emit('graphic_create', msg); }); - + prcSocket.on('graphic_delete', function(msg) { socket.emit('graphic_delete', msg); }); - + prcSocket.on('graphic_update', function(msg) { socket.emit('graphic_update', msg); }); - + prcSocket.on('graphic_reconnection', function(msg) { //L(msg); socket.emit('graphic_reconnection', msg); }); - - + + prcSocket.on('status', function(msg) { if(msg.data === 'ready') { //send ready message to client @@ -67,15 +67,15 @@ io.on('connection', function (socket) { } }); - prcSocket.on('connection', function(msg) { + prcSocket.on('connection', function(msg) { L('dispatcher connected'); }); - prcSocket.on('reconnect', function(msg) { + prcSocket.on('reconnect', function(msg) { L('dispatcher reconnect'); }); - prcSocket.on('reconnection', function(msg) { + prcSocket.on('reconnection', function(msg) { L('dispatcher connected'); }); @@ -84,24 +84,24 @@ io.on('connection', function (socket) { prcSocket.disconnect(); processAlive = false; }); - + //receive command from client socket.on('command', function (msg) { prcSocket.emit('command', msg); }); - + socket.on('callback', function (msg) { prcSocket.emit('callback', msg); }); - + socket.on('callback', function (msg) { prcSocket.emit('callback', msg); }); - + socket.on('force_reload', function () { L('force reload'); - prcSocket.emit('force_reload'); - prcSocket.emit('command', {data:"exec(getenv('SCIFILES') + '" + "/start" + ".sce', -1);"}); + prcSocket.emit('force_reload'); + prcSocket.emit('command', {data:"exec(getenv('SCIFILES') + '" + "/start" + ".sce', -1);"}); }); }); diff --git a/scilab/node/static/index.html b/scilab/node/static/index.html index ed79cb4..f891b10 100644 --- a/scilab/node/static/index.html +++ b/scilab/node/static/index.html @@ -12,37 +12,37 @@ - - - - - - - - - - - + + + + + + + + + + +

Scilab WebView

-
- +
+ diff --git a/scilab/node/static/main.js b/scilab/node/static/main.js index 93f6aaa..4e9a5e8 100644 --- a/scilab/node/static/main.js +++ b/scilab/node/static/main.js @@ -39,17 +39,17 @@ socket.on('graphic_update', function (msg) { }); socket.on('graphic_reconnection', function (msg) { - var scilab = document.getElementById('scilab'); - switch(msg) { - case 'start': - console.log('hidden'); - scilab.style.visibility = 'hidden'; - break; - case 'end' : - console.log('visible'); - scilab.style.visibility = 'visible'; - break; - } + var scilab = document.getElementById('scilab'); + switch(msg) { + case 'start': + console.log('hidden'); + scilab.style.visibility = 'hidden'; + break; + case 'end' : + console.log('visible'); + scilab.style.visibility = 'visible'; + break; + } }); function onPushButton() { @@ -111,7 +111,7 @@ function onSpinner() { //tools function unload() { - socket.close(); + socket.close(); } function setInfo(data) { diff --git a/scilab/node/static/scilab.css b/scilab/node/static/scilab.css index a2d1304..2f91675 100644 --- a/scilab/node/static/scilab.css +++ b/scilab/node/static/scilab.css @@ -17,7 +17,7 @@ body { .GO_FIGURE { /* - "position" must be relative or absolute + "position" must be relative or absolute to allow absolue positioning of children */ position: relative; @@ -51,7 +51,7 @@ body { line-height:20px; text-align:left; vertical-align: middle; - margin-bottom: 0px; + margin-bottom: 0px; overflow : hidden; font-family: Tahoma, Verdana, Segoe, sans-serif; font-size:11px; @@ -225,7 +225,7 @@ body { .window { /* - "position" must be relative or absolute + "position" must be relative or absolute to allow absolue positioning of children */ position: relative; @@ -249,5 +249,5 @@ body { } #ex1Slider .slider-selection { - background: #BABABA; + background: #BABABA; } diff --git a/scilab/node/static/scilab_create.js b/scilab/node/static/scilab_create.js index 7fb6603..571e048 100644 --- a/scilab/node/static/scilab_create.js +++ b/scilab/node/static/scilab_create.js @@ -85,8 +85,8 @@ function createCombobox(uid) { function createSpinner(uid) { var __temp__ = createCommonIUControl(uid, 'INPUT', 'GO_UI_SPINNER'); __temp__.type = 'number'; - //$("#" + getIdString(uid)).TouchSpin({verticalbuttons: true}); - return __temp__; + //$("#" + getIdString(uid)).TouchSpin({verticalbuttons: true}); + return __temp__; } function createTab(uid) { @@ -101,7 +101,7 @@ function createTab(uid) { function deleteObject(uid) { var __child__ = getElementById(uid); - if(__child__) { - __child__.parentNode.removeChild(__child__); - } + if(__child__) { + __child__.parentNode.removeChild(__child__); + } } \ No newline at end of file diff --git a/scilab/node/static/scilab_setter.js b/scilab/node/static/scilab_setter.js index 22aa86f..4838e81 100644 --- a/scilab/node/static/scilab_setter.js +++ b/scilab/node/static/scilab_setter.js @@ -72,12 +72,12 @@ function setVisible(uid, val) { } function setUIEnable(uid, val) { - var __child__ = $('#' + getIdString(uid)); - if(val) { - __child__.removeClass("disabled"); - } else { - __child__.addClass("disabled"); - } + var __child__ = $('#' + getIdString(uid)); + if(val) { + __child__.removeClass("disabled"); + } else { + __child__.addClass("disabled"); + } } function setUIForegroundColor(uid, val) { -- 1.7.9.5