remove angle brackets from selection.

fix system notifications.
mdnsk · Dec 29, 2017 · bbd60e3 · bbd60e3
1 parent 8d81ad1
commit bbd60e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/entry/content-render.js b/src/entry/content-render.js
@@ -6,7 +6,8 @@ import {
   PROXY_CONTENT_CLOSE_POPUP,
   PROXY_CONTENT_RESIZE_POPUP,
   PROXY_CONTENT_GET_DATA,
-  CONTENT_OPEN_POPUP
+  CONTENT_OPEN_POPUP,
+  BACKGROUND_SHOW_NOTIFICATION
 } from '../messages';
 
 const popup = new Popup();
@@ -30,7 +31,9 @@ chrome.runtime.onMessage.addListener(message => {
   else if (message.id === CONTENT_OPEN_POPUP || message.id === PROXY_CONTENT_OPEN_POPUP) {
 
     if (checkSelectionLength(message.text)) {
-      data = message;
+      data = Object.assign({}, message, {
+        text: removeHtmlTags(message.text)
+      });
 
       if (message.id === PROXY_CONTENT_OPEN_POPUP && message.frameIndex > -1) {
         searchFrame(window.frames[message.frameIndex], frame => {
@@ -90,7 +93,7 @@ function checkSelectionLength (text) {
 
   if (text.length > maxLength) {
     chrome.runtime.sendMessage({
-      id: 'show-notification',
+      id: BACKGROUND_SHOW_NOTIFICATION,
       text: 'The selection is too long! It must be less than '+maxLength+' characters.'
     });
 
@@ -99,3 +102,7 @@ function checkSelectionLength (text) {
 
   return true;
 }
+
+function removeHtmlTags (text) {
+  return text.replace(/[<>]/g, '');
+}
diff --git a/src/vue/Translate.vue b/src/vue/Translate.vue
@@ -51,6 +51,7 @@
   import api from '../leoApi';
   import history from '../history';
   import options from '../options';
+  import { BACKGROUND_SHOW_NOTIFICATION } from '../messages';
 
   export default {
     props: {
@@ -98,7 +99,7 @@
         api.addWordToDictionary(this.text, translation, this.pageUrl, this.pageTitle, this.context).then(data => {
           if (data.error_msg === '') {
             chrome.runtime.sendMessage({
-              id: 'vue-show-notification',
+              id: BACKGROUND_SHOW_NOTIFICATION,
               text: 'The "' + this.text + '" word has been added!'
             });