r9673 - helma-ng/trunk/modules/helma
[email protected] Fri, 24 Apr 2009 19:38:35 +0200 (CEST)
| Newsgroups | gmane.comp.java.helma.cvs |
|---|---|
| Message-ID | <20090424173835.CA2013D0D6@mia> |
Author: hannes
Date: 2009-04-24 19:38:35 +0200 (Fri, 24 Apr 2009)
New Revision: 9673
Modified:
helma-ng/trunk/modules/helma/skin.js
Log:
Fix separator issue
Details at http://dev.helma.org/trac/helma/changeset/9673
Modified: helma-ng/trunk/modules/helma/skin.js
===================================================================
--- helma-ng/trunk/modules/helma/skin.js 2009-04-24 17:38:33 UTC (rev 9672)
+++ helma-ng/trunk/modules/helma/skin.js 2009-04-24 17:38:35 UTC (rev 9673)
@@ -206,7 +206,7 @@
return self.renderSubskin(skin, context);
},
- "echo": function(macro, context, separator) {
+ "echo": function(macro, context) {
var result = macro.parameters.map(function(elem) {
return getEvaluatedParameter(elem, context, 'echo');
});
@@ -215,7 +215,7 @@
wrapper = getEvaluatedParameter(wrapper, context);
result = result.map(function(part) {return wrapper[0] + part + wrapper[1]});
}
- var separator = macro.getParameter("separator") || separator;
+ var separator = macro.getParameter("separator");
if (separator != null) {
return result.join(getEvaluatedParameter(separator), context, 'for:separator');
}