r9911 - apps/gobi/trunk/code/Global
[email protected] Wed, 16 Sep 2009 16:58:22 +0200 (CEST)
| Newsgroups | gmane.comp.java.helma.cvs |
|---|---|
| Message-ID | <20090916145822.ED2953D0E3@mia> |
Author: hannes
Date: 2009-09-16 16:58:22 +0200 (Wed, 16 Sep 2009)
New Revision: 9911
Modified:
apps/gobi/trunk/code/Global/WikiMarkup.js
Log:
Adapt to different header syntax in gobimarkup/markdown
Details at http://dev.helma.org/trac/helma/changeset/9911
Modified: apps/gobi/trunk/code/Global/WikiMarkup.js
===================================================================
--- apps/gobi/trunk/code/Global/WikiMarkup.js 2009-09-16 13:35:21 UTC (rev 9910)
+++ apps/gobi/trunk/code/Global/WikiMarkup.js 2009-09-16 14:58:22 UTC (rev 9911)
@@ -26,7 +26,7 @@
src = this.renderLinks(page, src);
// headers
- src = WikiMarkup.renderHeaders(src, page, new java.lang.StringBuffer());
+ src = WikiMarkup.renderHeaders(src, page, new java.lang.StringBuffer(), '=');
// give choice over format method
if (param && param.format == "plain") {
@@ -48,7 +48,7 @@
return;
// create auto-toc from headers
- src = WikiMarkup.renderHeaders(src, page, new java.lang.StringBuffer());
+ src = WikiMarkup.renderHeaders(src, page, new java.lang.StringBuffer(), '#');
// set up wiki page search path
if (!page.isPersistent()) {
@@ -245,8 +245,8 @@
return res.pop();
},
- renderHeaders: function(src, page, buffer) {
- var re = new RegExp("^(={1,6})([^\r\n]+?)(={1,6})?$", "gm");
+ renderHeaders: function(src, page, buffer, c) {
+ var re = new RegExp("^(" + c + "{1,6})([^\r\n]+?)(" + c + "{1,6})?$", "gm");
var match;
var written = 0;
var chars = toJava(src).toCharArray();