FIX: Quotes with new lines were broken

2013-08-21 22:36:02 -04:00
parent d7596840e5
commit a3757016d9
4 changed files with 86 additions and 47 deletions
@@ -107,46 +107,80 @@ Discourse.Dialect.on("register", function(event) {
    @return {Array} the JsonML containing the markup or undefined if nothing changed.
    @namespace Discourse.Dialect
  **/
-  dialect.inline["[quote="] = function bbcodeQuote(text, orig_match) {
-    var bbcodePattern = new RegExp("\\[quote=?([^\\[\\]]+)?\\]([\\s\\S]*?)\\[\\/quote\\]", "igm"),
-        m = bbcodePattern.exec(text);
+  dialect.block['quote'] = function bbcodeQuote(block, next) {
+    var m = new RegExp("\\[quote=?([^\\[\\]]+)?\\]([\\s\\S]*)", "igm").exec(block);
+    if (m) {
+      var paramsString = m[1].replace(/\"/g, ''),
+          params = {'class': 'quote'},
+          paramsSplit = paramsString.split(/\, */),
+          username = paramsSplit[0],
+          opts = dialect.options,
+          startPos = block.indexOf(m[0]),
+          leading,
+          quoteContents = [],
+          result = [];

-    if (!m) { return; }
-    var paramsString = m[1].replace(/\"/g, ''),
-        params = {'class': 'quote'},
-        paramsSplit = paramsString.split(/\, */),
-        username = paramsSplit[0],
-        opts = dialect.options;
+      if (startPos > 0) {
+        leading = block.slice(0, startPos);

-    paramsSplit.forEach(function(p,i) {
-      if (i > 0) {
-        var assignment = p.split(':');
-        if (assignment[0] && assignment[1]) {
-          params['data-' + assignment[0]] = assignment[1].trim();
+        var para = ['p'];
+        this.processInline(leading).forEach(function (l) {
+          para.push(l);
+        });
+
+        result.push(para);
+      }
+
+      paramsSplit.forEach(function(p,i) {
+        if (i > 0) {
+          var assignment = p.split(':');
+          if (assignment[0] && assignment[1]) {
+            params['data-' + assignment[0]] = assignment[1].trim();
+          }
+        }
+      });
+
+      var avatarImg;
+      if (opts.lookupAvatarByPostNumber) {
+        // client-side, we can retrieve the avatar from the post
+        var postNumber = parseInt(params['data-post'], 10);
+        avatarImg = opts.lookupAvatarByPostNumber(postNumber);
+      } else if (opts.lookupAvatar) {
+        // server-side, we need to lookup the avatar from the username
+        avatarImg = opts.lookupAvatar(username);
+      }
+
+      if (m[2]) { next.unshift(MD.mk_block(m[2])); }
+
+      while (next.length > 0) {
+        var b = next.shift(),
+            n = b.match(/([\s\S]*)\[\/quote\]([\s\S]*)/m);
+
+        if (n) {
+          if (n[2]) {
+            next.unshift(MD.mk_block(n[2]));
+          }
+          quoteContents.push(n[1]);
+          break;
+        } else {
+          quoteContents.push(b);
        }
      }
-    });

-    var avatarImg;
-    if (opts.lookupAvatarByPostNumber) {
-      // client-side, we can retrieve the avatar from the post
-      var postNumber = parseInt(params['data-post'], 10);
-      avatarImg = opts.lookupAvatarByPostNumber(postNumber);
-    } else if (opts.lookupAvatar) {
-      // server-side, we need to lookup the avatar from the username
-      avatarImg = opts.lookupAvatar(username);
+      var contents = this.processInline(quoteContents.join("  \n  \n"));
+      contents.unshift('blockquote');
+
+
+      result.push(['p', ['aside', params,
+                   ['div', {'class': 'title'},
+                     ['div', {'class': 'quote-controls'}],
+                     avatarImg ? avatarImg + "\n" : "",
+                     I18n.t('user.said',{username: username})
+                   ],
+                   contents
+                ]]);
+      return result;
    }
-
-    var quote = ['aside', params,
-                    ['div', {'class': 'title'},
-                      ['div', {'class': 'quote-controls'}],
-                      avatarImg ? avatarImg + "\n" : "",
-                      I18n.t('user.said',{username: username})
-                    ],
-                    ['blockquote'].concat(this.processInline(m[2]))
-                 ];
-
-    return [m[0].length, quote];
  };

 });