Moved versionnumber out to own file instead of defining it two places

This commit is contained in:
Kasper Rynning-Tønnesen
2017-12-27 17:47:43 +01:00
parent 6df3af6978
commit 4afcbda9db
4 changed files with 15 additions and 10 deletions

View File

@@ -4,7 +4,7 @@ var gulp = require('gulp'),
concat = require('gulp-concat'); concat = require('gulp-concat');
gulp.task('js', function () { gulp.task('js', function () {
gulp.src(['server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) gulp.src(['server/VERSION.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
@@ -15,7 +15,7 @@ gulp.task('js', function () {
}); });
gulp.task('embed', function () { gulp.task('embed', function () {
gulp.src(['server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js']) gulp.src(['server/VERSION.js', 'server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js'])
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
@@ -26,7 +26,7 @@ gulp.task('embed', function () {
}); });
gulp.task('callback', function () { gulp.task('callback', function () {
gulp.src(['server/public/assets/js/callback.js']) gulp.src(['server/VERSION.js', 'server/public/assets/js/callback.js'])
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
@@ -41,7 +41,7 @@ gulp.task('build', function() {
}) })
gulp.task('remotecontroller', function () { gulp.task('remotecontroller', function () {
gulp.src(['server/public/assets/js/remotecontroller.js']) gulp.src(['server/VERSION.js', 'server/public/assets/js/remotecontroller.js'])
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
@@ -52,9 +52,9 @@ gulp.task('remotecontroller', function () {
}); });
gulp.task('default', function(){ gulp.task('default', function(){
gulp.watch('server/public/assets/js/*.js', ['js']); gulp.watch(['server/VERSION.js', 'server/public/assets/js/*.js'], ['js']);
gulp.watch('server/public/assets/js/*.js', ['embed']); gulp.watch(['server/VERSION.js', 'server/public/assets/js/*.js'], ['embed']);
gulp.watch(['server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']); gulp.watch(['server/VERSION.js', 'server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']);
//gulp.watch('server/public/assets/js/*.js', ['nochan']); //gulp.watch('server/public/assets/js/*.js', ['nochan']);
gulp.watch('server/public/assets/js/remotecontroller.js', ['remotecontroller']); gulp.watch(['server/VERSION.js', 'server/public/assets/js/remotecontroller.js'], ['remotecontroller']);
}); });

5
server/VERSION.js Normal file
View File

@@ -0,0 +1,5 @@
VERSION = 3;
try {
module.exports = VERSION;
} catch(e) {}

View File

@@ -1,4 +1,4 @@
VERSION = 3; VERSION = require('./VERSION.js');
var server; var server;
var add = ""; var add = "";

View File

@@ -1,4 +1,4 @@
var VERSION = 3;
var chan = window.chan === undefined ? $("#chan").html() : window.chan; var chan = window.chan === undefined ? $("#chan").html() : window.chan;
var w_p = true; var w_p = true;
var hasadmin = 0; var hasadmin = 0;