X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmkws-handlebars.js;h=58c95a18b30e28e15c759ccf5078ae242ce517d5;hb=084846fd874a094a8c5e70bee766d07e5b69e1b1;hp=0d601b682baf54cb71dc48bb546d285806cedfbf;hpb=8caae5a94f83821aa94a8c8f9308aca8d4061d10;p=mkws-moved-to-github.git

diff --git a/src/mkws-handlebars.js b/src/mkws-handlebars.js
index 0d601b6..58c95a1 100644
--- a/src/mkws-handlebars.js
+++ b/src/mkws-handlebars.js
@@ -1,37 +1,36 @@
 // Handlebars helpers
-Handlebars.registerHelper('json', function(obj) {
+Handlebars.registerHelper('mkws-json', function(obj) {
     return $.toJSON(obj);
 });
 
 
-Handlebars.registerHelper('paragraphs', function(obj) {
+Handlebars.registerHelper('mkws-paragraphs', function(obj) {
     var acc = [];
     for (var i = 0; i < obj.length; i++) {
-        // I don't know why, but we need the \n, otherwise Handlebars elides paragraphs
-        acc.push('<p>', obj[i], '</p>', "\n");
+        acc.push('<p>', obj[i], '</p>');
     }
     return acc.join('');
 });
 
 
-Handlebars.registerHelper('translate', function(s) {
+Handlebars.registerHelper('mkws-translate', function(s) {
     return mkws.M(s);
 });
 
 
-// We need {{attr '@name'}} because Handlebars can't parse {{@name}}
-Handlebars.registerHelper('attr', function(attrName) {
+// We need {{mkws-attr '@name'}} because Handlebars can't parse {{@name}}
+Handlebars.registerHelper('mkws-attr', function(attrName) {
     return this[attrName];
 });
 
 
 /*
- * Use as follows: {{#if-any NAME1 having="NAME2"}}
+ * Use as follows: {{#mkws-if-any NAME1 having="NAME2"}}
  * Applicable when NAME1 is the name of an array
  * The guarded code runs only if at least one element of the NAME1
  * array has a subelement called NAME2.
  */
-Handlebars.registerHelper('if-any', function(items, options) {
+Handlebars.registerHelper('mkws-if-any', function(items, options) {
     var having = options.hash.having;
     for (var i in items) {
 	var item = items[i]
@@ -43,7 +42,7 @@ Handlebars.registerHelper('if-any', function(items, options) {
 });
 
 
-Handlebars.registerHelper('first', function(items, options) {
+Handlebars.registerHelper('mkws-first', function(items, options) {
     var having = options.hash.having;
     for (var i in items) {
 	var item = items[i]
@@ -55,7 +54,7 @@ Handlebars.registerHelper('first', function(items, options) {
 });
 
 
-Handlebars.registerHelper('commaList', function(items, options) {
+Handlebars.registerHelper('mkws-commaList', function(items, options) {
     var out = "";
 
     for (var i in items) {
@@ -67,6 +66,6 @@ Handlebars.registerHelper('commaList', function(items, options) {
 });
 
 
-Handlebars.registerHelper('index1', function(obj) {
+Handlebars.registerHelper('mkws-index1', function(obj) {
     return obj.data.index + 1;
 });