From 25a076b7ea54c843da5e768f375898eba5428670 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 10 Jul 2012 04:45:50 -0400 Subject: [PATCH] fixed bug in object Minify, doit function, more processing function did not return final_code so changes was not saving, and clien side loaded keyBinding.js and cloudfunc.js full sized versions --- lib/server/minify | 2 +- server.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/server/minify b/lib/server/minify index 69756c6f..e3dc2e6f 160000 --- a/lib/server/minify +++ b/lib/server/minify @@ -1 +1 @@ -Subproject commit 69756c6f1587ca1ba709f3c00b79797c08c6606b +Subproject commit e3dc2e6f085172e5fea02cb767994a145219723c diff --git a/server.js b/server.js index 068d0ed2..10aa1d76 100644 --- a/server.js +++ b/server.js @@ -163,7 +163,7 @@ CloudServer.Minify={ 'git submodule update'); } this.MinFolder = '/' + lMinify.MinFolder; - + var lMinFolder=this.MinFolder; this.done.js=this._allowed.js? lMinify.jsScripts(['client.js', 'lib/cloudfunc.js', @@ -187,8 +187,9 @@ CloudServer.Minify={ (pFinalCode = pFinalCode .replace('cloudfunc.js','cloudfunc.min.js') .replace('keyBinding.js','keyBinding.min.js') - .replace('/lib/', this.MinFolder) - .replace('/lib/client/', this.MinFolder)).length); + .replace('/lib/', lMinFolder) + .replace('/lib/client/', lMinFolder)).length); + return pFinalCode; }}) :false;