From 9b4f5710e62d3c6cb51c08ab51430d8f30e11c9a Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 21 Jul 2017 16:09:27 -0400
Subject: [PATCH] api cleanup for before / after rules

---
 .../engines/discourse-markdown/bbcode-block.js.es6        | 4 ++--
 .../pretty-text/engines/discourse-markdown/quotes.js.es6  | 5 +++--
 .../assets/javascripts/lib/discourse-markdown/poll.js.es6 | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
index 1f12a4a1e63..cd1620bcaed 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
@@ -192,7 +192,7 @@ function applyBBCode(state, startLine, endLine, silent, md) {
   } else {
 
     if (rule.before) {
-      rule.before.call(this, state, info.attrs, md, state.src.slice(initial, initial + info.length + 1));
+      rule.before.call(this, state, info, state.src.slice(initial, initial + info.length + 1));
     }
 
     let wrapTag;
@@ -235,7 +235,7 @@ function applyBBCode(state, startLine, endLine, silent, md) {
     }
 
     if (rule.after) {
-      rule.after.call(this, state, lastToken, md, state.src.slice(start-2, start + closeTag.length - 1));
+      rule.after.call(this, state, lastToken, state.src.slice(start-2, start + closeTag.length - 1));
     }
   }
 
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
index 5788ba8b377..06de98068f7 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -3,9 +3,10 @@ import { performEmojiUnescape } from 'pretty-text/emoji';
 const rule = {
   tag: 'quote',
 
-  before: function(state, attrs, md) {
+  before: function(state, tagInfo) {
 
-    let options = md.options.discourse;
+    const attrs = tagInfo.attrs;
+    let options = state.md.options.discourse;
 
     let quoteInfo = attrs['_default'];
     let username, postNumber, topicId, avatarImg, full;
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index 20b0dee7c3b..1a4ee5060ce 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -95,14 +95,14 @@ function invalidPoll(state, tag) {
 const rule = {
   tag: 'poll',
 
-  before: function(state, attrs, md, raw){
+  before: function(state, tagInfo, raw){
     let token = state.push('text', '', 0);
     token.content = raw;
-    token.bbcode_attrs = attrs;
+    token.bbcode_attrs = tagInfo.attrs;
     token.bbcode_type = 'poll_open';
   },
 
-  after: function(state, openToken, md, raw) {
+  after: function(state, openToken, raw) {
 
     let items = getListItems(state.tokens, openToken);
     if (!items) {
@@ -153,7 +153,7 @@ const rule = {
     if (attrs["type"] === "number") {
       // default values
       if (isNaN(min)) { min = 1; }
-      if (isNaN(max)) { max = md.options.discourse.pollMaximumOptions; }
+      if (isNaN(max)) { max = state.md.options.discourse.pollMaximumOptions; }
       if (isNaN(step)) { step = 1; }
 
       if (items.length > 0) {