Update shit
This commit is contained in:
parent
bb9709ee0d
commit
980826eb81
|
@ -31,3 +31,6 @@ openshift
|
||||||
|
|
||||||
# Private files
|
# Private files
|
||||||
Private.js
|
Private.js
|
||||||
|
|
||||||
|
log.txt
|
||||||
|
static/uploaded
|
||||||
|
|
|
@ -7,7 +7,7 @@ block append css
|
||||||
block content
|
block content
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-8
|
.col-md-10
|
||||||
#canvases
|
#canvases
|
||||||
canvas#canvas-pdf(style={"border" : "1px solid #000000", position:'absolute'})
|
canvas#canvas-pdf(style={"border" : "1px solid #000000", position:'absolute'})
|
||||||
canvas#canvas-paint.noselect(onmousedown="sio.onMouseDown(event);", onmousemove="sio.onMouseMove(event);", onmouseup="sio.onMouseUp(event);", onmouseout="sio.onMouseUp(event);", style={position:'absolute'})
|
canvas#canvas-paint.noselect(onmousedown="sio.onMouseDown(event);", onmousemove="sio.onMouseMove(event);", onmouseup="sio.onMouseUp(event);", onmouseout="sio.onMouseUp(event);", style={position:'absolute'})
|
||||||
|
@ -32,7 +32,7 @@ block content
|
||||||
.btn-group
|
.btn-group
|
||||||
button.btn.btn-default#viewer-laser(onclick="sio.switchAudienceLaser();") Audience laser is disabled
|
button.btn.btn-default#viewer-laser(onclick="sio.switchAudienceLaser();") Audience laser is disabled
|
||||||
|
|
||||||
.col-md-4
|
.col-md-2
|
||||||
.btn-group
|
.btn-group
|
||||||
button.btn.btn-default#start(onclick="sio.startPresentation();")
|
button.btn.btn-default#start(onclick="sio.startPresentation();")
|
||||||
span.glyphicon.glyphicon-play
|
span.glyphicon.glyphicon-play
|
||||||
|
|
|
@ -13,7 +13,7 @@ var http = require('http').Server(app);
|
||||||
var io = require('socket.io')(http);
|
var io = require('socket.io')(http);
|
||||||
require('./lib/socket.js')(io);
|
require('./lib/socket.js')(io);
|
||||||
|
|
||||||
var isDev = app.get('env') === 'development';
|
var isDev = false; // app.get('env') === 'development';
|
||||||
|
|
||||||
app.set('view engine', 'pug');
|
app.set('view engine', 'pug');
|
||||||
app.set('trust proxy', 1);
|
app.set('trust proxy', 1);
|
||||||
|
@ -62,7 +62,7 @@ if ( isDev ) {
|
||||||
serverIpAddress = 'localhost';
|
serverIpAddress = 'localhost';
|
||||||
} else {
|
} else {
|
||||||
// Openhift conf
|
// Openhift conf
|
||||||
serverPort = process.env.OPENSHIFT_NODEJS_PORT || 8080;
|
serverPort = process.env.OPENSHIFT_NODEJS_PORT || 4001;
|
||||||
serverIpAddress = process.env.OPENSHIFT_NODEJS_IP || '127.0.0.1';
|
serverIpAddress = process.env.OPENSHIFT_NODEJS_IP || '127.0.0.1';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ $(function() { sio = (function() {
|
||||||
var lasers = {};
|
var lasers = {};
|
||||||
var drawAudienceLasers = false;
|
var drawAudienceLasers = false;
|
||||||
|
|
||||||
PDFJS.getDocument('/static/uploaded/' + filename + '.pdf').then(function getPdf(_pdf) {
|
PDFJS.getDocument('/static/uploaded/' + filename + '.pdf?' + (Math.floor(Math.random() * 10000))).then(function getPdf(_pdf) {
|
||||||
pdf = _pdf;
|
pdf = _pdf;
|
||||||
updateUI();
|
updateUI();
|
||||||
});
|
});
|
||||||
|
|
|
@ -18,7 +18,7 @@ $(function() { sio = (function() {
|
||||||
var lasers = {};
|
var lasers = {};
|
||||||
|
|
||||||
|
|
||||||
PDFJS.getDocument('/static/uploaded/' + filename + '.pdf').then(function getPdfHelloWorld(_pdf) {
|
PDFJS.getDocument('/static/uploaded/' + filename + '.pdf?' + (Math.floor(Math.random() * 10000))).then(function getPdfHelloWorld(_pdf) {
|
||||||
|
|
||||||
pdf = _pdf;
|
pdf = _pdf;
|
||||||
update();
|
update();
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -4,7 +4,7 @@ block css
|
||||||
meta( name='viewport', content='width=device-width, initial-scale=1.0' )
|
meta( name='viewport', content='width=device-width, initial-scale=1.0' )
|
||||||
meta( name='description', content='Baking Bootstrap Snippets with Jade' )
|
meta( name='description', content='Baking Bootstrap Snippets with Jade' )
|
||||||
//- Bootswatch Theme
|
//- Bootswatch Theme
|
||||||
link(href="https://bootswatch.com/cerulean/bootstrap.min.css", rel="stylesheet")
|
link(href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css", rel="stylesheet")
|
||||||
|
|
||||||
block base_content
|
block base_content
|
||||||
nav.navbar.navbar-default( role="navigation" )
|
nav.navbar.navbar-default( role="navigation" )
|
||||||
|
@ -25,4 +25,4 @@ block base_content
|
||||||
block content
|
block content
|
||||||
|
|
||||||
block prepend js
|
block prepend js
|
||||||
script( src='http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js' )
|
script( src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js' )
|
||||||
|
|
Loading…
Reference in New Issue