[ ! ] Fixed Client Side JS Generation

pnegri · Feb 24, 2012 · 18e98c3 · 18e98c3
1 parent 7527aed
commit 18e98c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/arcabouco_modules/objectpool.coffee b/lib/arcabouco_modules/objectpool.coffee
@@ -75,7 +75,9 @@ class ArcaboucoObjectPool
       if file_stats
         file_mtime = file_stats.mtime.getTime()
 
-      baseFilename = Common.Path.basename( pieceFilename, '.coffee' ) + '-' + file_mtime
+      baseFilename = Common.Path.basename( pieceFilename ) + '-' + file_mtime
+      baseFilename = baseFilename.replace(".coffee","")
+      baseFilename = baseFilename.replace(".js","")
       target_filename = "#{outputDir}/#{pieceFilenamePrefix}#{baseFilename}.js"
 
       file_exists = false
@@ -87,7 +89,10 @@ class ArcaboucoObjectPool
         file_exists = false
 
       unless file_exists
-        exec "coffee --compile -p #{pieceFilename} > #{target_filename}.js", [], buildReady
+        if pieceFilename.indexOf(".js")
+          exec "cp #{pieceFilename} #{target_filename}"
+        else if pieceFilename.indexOf(".coffee")
+          exec "coffee --compile -p #{pieceFilename} > #{target_filename}.js", [], buildReady
         c = c+1
 
       application.Content.putContentFor 'head',

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name" : "arcabouco-js",
   "description" : "scalable microframework in node.js",
-  "version" : "0.8.5",
+  "version" : "0.8.6",
   "author" : "Patrick Negri <patrick@iugu.com.br>",
   "homepage": "http://github.com/pnegri/arcabouco-js",
   "contributors" : [],