aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjasper <jasper92341@hotmail.com>2019-02-09 04:13:52 -0800
committerjasper <jasper92341@hotmail.com>2019-02-09 04:13:52 -0800
commitf75ec48a8029a9c142bb09b3f76b14c956863ea3 (patch)
tree5faffe5eb9b4d180dbe89d7e2cae85db2e54cde0
parente90e7ce2dbcaa1e585d39028ffcdacc4fa76e817 (diff)
Switch into Lodash
-rw-r--r--package.json1
-rw-r--r--src/components/status/status.js7
2 files changed, 3 insertions, 5 deletions
diff --git a/package.json b/package.json
index 1bfee49c..90bf48cf 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
"babel-plugin-lodash": "^3.2.11",
"chromatism": "^3.0.0",
"diff": "^3.0.1",
- "entities": "^1.1.2",
"karma-mocha-reporter": "^2.2.1",
"localforage": "^1.5.0",
"node-sass": "^3.10.1",
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 68d02ce3..3e6247df 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -11,8 +11,7 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
import fileType from 'src/services/file_type/file_type.service'
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import { mentionMatchesUrl } from 'src/services/mention_matcher/mention_matcher.js'
-import { filter, find } from 'lodash'
-import entities from 'entities'
+import { filter, find, unescape } from 'lodash'
const Status = {
name: 'Status',
@@ -197,12 +196,12 @@ const Status = {
}
if (this.status.summary && this.localCollapseSubjectDefault) {
return false
- }
+ }
return true
},
replySubject () {
if (!this.status.summary) return ''
- const decodedSummary = entities.decodeHTML(this.status.summary)
+ const decodedSummary = unescape(this.status.summary)
const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
? this.$store.state.instance.subjectLineBehavior
: this.$store.state.config.subjectLineBehavior