From 4573796166b6b8afc5a0bcd9c82f987daba15464 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 21 Dec 2014 23:16:23 +0000 Subject: [PATCH 1/2] fix --- src/static/js/broadcast_revisions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/broadcast_revisions.js b/src/static/js/broadcast_revisions.js index 9774dc3f7..1980bdf30 100644 --- a/src/static/js/broadcast_revisions.js +++ b/src/static/js/broadcast_revisions.js @@ -48,7 +48,7 @@ function loadBroadcastRevisionsJS() }); } - var revisionInfo = {}; + revisionInfo = {}; revisionInfo.addChangeset = function(fromIndex, toIndex, changeset, backChangeset, timeDelta) { var startRevision = revisionInfo[fromIndex] || revisionInfo.createNew(fromIndex); From ee3f3b80603f96f76f6d830464d59ef1e36dcd06 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 21 Dec 2014 23:42:56 +0000 Subject: [PATCH 2/2] move clean css back to fix minification on TS --- src/node/utils/Minify.js | 5 ++--- src/package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 132d63dae..e6b19542c 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -23,7 +23,7 @@ var ERR = require("async-stacktrace"); var settings = require('./Settings'); var async = require('async'); var fs = require('fs'); -var CleanCSS = require('clean-css'); +var cleanCSS = require('clean-css'); var jsp = require("uglify-js").parser; var pro = require("uglify-js").uglify; var path = require('path'); @@ -411,8 +411,7 @@ function compressJS(values) function compressCSS(values) { var complete = values.join("\n"); - var cleanCSS = new CleanCSS({}).minify(complete); - return cleanCSS; + return cleanCSS.process(complete); } exports.minify = minify; diff --git a/src/package.json b/src/package.json index 3d5f5e24e..03e892d59 100644 --- a/src/package.json +++ b/src/package.json @@ -20,7 +20,7 @@ "express" : ">3.1.0 <3.9.0", "async" : ">=0.9.0", "connect" : "2.7.x", - "clean-css" : ">=2.0.0", + "clean-css" : "0.3.2", "uglify-js" : ">=2.4.15", "formidable" : ">=1.0.15", "log4js" : ">=0.6.21",