From e6cd15ff3df028562d74a0ef2acbd24dae76a56d Mon Sep 17 00:00:00 2001
From: Bia Esmero <besmero@clinic-it.com>
Date: Wed, 19 Dec 2012 18:55:44 +0800
Subject: [PATCH] Fix _callbacks.js, comments

---
 lib/paloma/paloma_generator.rb     |  3 ++-
 lib/paloma/templates/_callbacks.js |  1 +
 lib/paloma/templates/_local.js     |  8 +++++++-
 lib/paloma/templates/paloma.js     | 10 ++++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/paloma/paloma_generator.rb b/lib/paloma/paloma_generator.rb
index 55d60c3..959e834 100644
--- a/lib/paloma/paloma_generator.rb
+++ b/lib/paloma/paloma_generator.rb
@@ -71,7 +71,8 @@ module Paloma
       #_callbacks.js per folder(controller)
       has_callbacks = File.exists? callbacks
       unless has_callbacks
-        copy_file '_callbacks.js', callbacks
+        content = File.read(templates + '_callbacks.js').gsub('controller', "#{controller}")
+        File.open(callbacks, 'w'){ |f| f.write(content) }
         File.open(INDEX, 'a+'){|f| f << "\n//= require ./" + controller + '/_callbacks' }
       end
       
diff --git a/lib/paloma/templates/_callbacks.js b/lib/paloma/templates/_callbacks.js
index 2c03f2d..d7b86da 100644
--- a/lib/paloma/templates/_callbacks.js
+++ b/lib/paloma/templates/_callbacks.js
@@ -1 +1,2 @@
+//= require ./controller/_local
 //= require_tree .
diff --git a/lib/paloma/templates/_local.js b/lib/paloma/templates/_local.js
index c6ac785..62ee479 100644
--- a/lib/paloma/templates/_local.js
+++ b/lib/paloma/templates/_local.js
@@ -5,10 +5,16 @@ Paloma.controller = {
       under the controller folder.
     
     Example:
+      
+      variableName: value;
     
-      functionName = function(params){
+      functionName: function(params){
         alert('Paloma');
       };
+      
+    To use the variable and function:
+      Paloma.controller.variableName
+      Paloma.controller.functionName(params);
   */
   
 };
diff --git a/lib/paloma/templates/paloma.js b/lib/paloma/templates/paloma.js
index 81ac59e..1b2b1bd 100644
--- a/lib/paloma/templates/paloma.js
+++ b/lib/paloma/templates/paloma.js
@@ -3,14 +3,20 @@ window.Paloma = {callbacks:{}};
 Paloma.g = {
 
   /*
-    Put here global code which can be used by all callbacks, 
+    Put here global code that can be used by all callbacks, 
       regardless which folder they're from.
     
     Example:
+      
+      variableName: value;
     
-      functionName = function(params){
+      functionName: function(params){
         alert('Paloma');
       };
+   
+    To use the variable and function: 
+      Paloma.g.variableName
+      Paloma.g.functionName(params);
   */
 
 };