From ff9b935e98921ada4769a2b88993413d5fc8fc64 Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Mon, 12 Jun 2017 18:01:04 +0900
Subject: [PATCH 1/3] iss #619 Add an entity to fix the rendering bug

---
 browser/lib/htmlTextHelper.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/lib/htmlTextHelper.js b/browser/lib/htmlTextHelper.js
index 49952fbd..be9968b8 100644
--- a/browser/lib/htmlTextHelper.js
+++ b/browser/lib/htmlTextHelper.js
@@ -13,7 +13,8 @@ export function decodeEntities (text) {
     ['amp', '&'],
     ['lt', '<'],
     ['gt', '>'],
-    ['#63', '\\?']
+    ['#63', '\\?'],
+    ['#36', '\\$'],
   ]
 
   for (var i = 0, max = entities.length; i < max; ++i) {
@@ -28,7 +29,8 @@ export function encodeEntities (text) {
     ['\'', 'apos'],
     ['<', 'lt'],
     ['>', 'gt'],
-    ['\\?', '#63']
+    ['\\?', '#63'],
+    ['\\$', '#36']
   ]
 
   entities.forEach((entity) => {

From afb13af7a180b9568e53a2439b4607162b0e4497 Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Mon, 12 Jun 2017 18:05:32 +0900
Subject: [PATCH 2/3] iss #619 Add a test for teh helper methods

---
 tests/lib/html-text-helper-test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib/html-text-helper-test.js b/tests/lib/html-text-helper-test.js
index a476c0dd..8036e3bf 100644
--- a/tests/lib/html-text-helper-test.js
+++ b/tests/lib/html-text-helper-test.js
@@ -12,7 +12,8 @@ test('htmlTextHelper#decodeEntities should return encoded text (string)', t => {
     ['var test = &apos;test&apos;', 'var test = \'test\''],
     ['&lt;a href=&apos;https://boostnote.io&apos;&gt;Boostnote', '<a href=\'https://boostnote.io\'>Boostnote'],
     ['&lt;\\\\?php\n var = &apos;hoge&apos;;', '<\\\\?php\n var = \'hoge\';'],
-    ['&amp;', '&']
+    ['&amp;', '&'],
+    ['a&#36;&apos;', 'a\\$\'']
   ]
 
   testCases.forEach(testCase => {
@@ -27,7 +28,8 @@ test('htmlTextHelper#decodeEntities() should return decoded text (string)', t =>
     ['<a href=', '&lt;a href='],
     ['var test = \'test\'', 'var test = &apos;test&apos;'],
     ['<a href=\'https://boostnote.io\'>Boostnote', '&lt;a href=&apos;https://boostnote.io&apos;&gt;Boostnote'],
-    ['<?php\n var = \'hoge\';', '&lt;&#63;php\n var = &apos;hoge&apos;;']
+    ['<?php\n var = \'hoge\';', '&lt;&#63;php\n var = &apos;hoge&apos;;'],
+    ['a$\'','a&#36;&apos;']
   ]
 
   testCases.forEach(testCase => {

From 244a06eea6a96d538ee767029e2df63382ea332e Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Mon, 12 Jun 2017 18:12:11 +0900
Subject: [PATCH 3/3] Fix some pointed by lint

---
 browser/lib/htmlTextHelper.js      | 2 +-
 tests/lib/html-text-helper-test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/lib/htmlTextHelper.js b/browser/lib/htmlTextHelper.js
index be9968b8..ccc545e3 100644
--- a/browser/lib/htmlTextHelper.js
+++ b/browser/lib/htmlTextHelper.js
@@ -14,7 +14,7 @@ export function decodeEntities (text) {
     ['lt', '<'],
     ['gt', '>'],
     ['#63', '\\?'],
-    ['#36', '\\$'],
+    ['#36', '\\$']
   ]
 
   for (var i = 0, max = entities.length; i < max; ++i) {
diff --git a/tests/lib/html-text-helper-test.js b/tests/lib/html-text-helper-test.js
index 8036e3bf..538b8757 100644
--- a/tests/lib/html-text-helper-test.js
+++ b/tests/lib/html-text-helper-test.js
@@ -29,7 +29,7 @@ test('htmlTextHelper#decodeEntities() should return decoded text (string)', t =>
     ['var test = \'test\'', 'var test = &apos;test&apos;'],
     ['<a href=\'https://boostnote.io\'>Boostnote', '&lt;a href=&apos;https://boostnote.io&apos;&gt;Boostnote'],
     ['<?php\n var = \'hoge\';', '&lt;&#63;php\n var = &apos;hoge&apos;;'],
-    ['a$\'','a&#36;&apos;']
+    ['a$\'', 'a&#36;&apos;']
   ]
 
   testCases.forEach(testCase => {