vmario/dubdiff
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update server port and set new dubdiff method

Browse Source
This commit is contained in:
Adam Brown 2016-11-03 22:28:51 +00:00
parent ab1229e8da
commit 30609b17da
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -37,7 +37,7 @@ module.exports = function (grunt) {
}, },
express: { express: {
options: { options: {
port: process.env.PORT || 9000 port: process.env.PORT || 80
}, },
dev: { dev: {
options: { options: {
@ -208,7 +208,7 @@ module.exports = function (grunt) {
options: { options: {
nodeArgs: ['--debug-brk'], nodeArgs: ['--debug-brk'],
env: { env: {
PORT: process.env.PORT || 9000 PORT: process.env.PORT || 80
}, },
callback: function (nodemon) { callback: function (nodemon) {
nodemon.on('log', function (event) { nodemon.on('log', function (event) {
@ -431,7 +431,7 @@ module.exports = function (grunt) {
dist: [ dist: [
'jade', 'jade',
'sass', 'sass',
'imagemin', //'imagemin',
'svgmin' 'svgmin'
] ]
}, },

7
server/components/wdiff/index.js
View File

@ -14,8 +14,9 @@ temp.track();
// Perform a comparison between a and b // Perform a comparison between a and b
// the callback should have parameters (err, result) // the callback should have parameters (err, result)
module.exports = newversion
module.exports = function(a, b, asMarkdown, callback) { function newversion (a, b, asMarkdown, callback) {
//a few strings have to be escaped: "[-", "-]", "{+", and "+}" //a few strings have to be escaped: "[-", "-]", "{+", and "+}"
@ -50,7 +51,7 @@ module.exports = function(a, b, asMarkdown, callback) {
return callback(null, resData); return callback(null, resData);
} }
var oldversion = function(a, b, asMarkdown, callback) { function oldversion (a, b, asMarkdown, callback) {
//!!! this nested file-open is not a good pattern //!!! this nested file-open is not a good pattern
// better would be to use promises and write the two files asynchronously // better would be to use promises and write the two files asynchronously
@ -325,4 +326,4 @@ function unescapeString(str) {
str = str.replace(/\&\#91\;-/gm, "[-") str = str.replace(/\&\#91\;-/gm, "[-")
str = str.replace(/-\&\#93\;/gm, "-]") str = str.replace(/-\&\#93\;/gm, "-]")
return str return str
} }