From d70d0318e5acb7ad2994689741cfee976e754792 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Wed, 19 Oct 2016 22:12:12 +0800
Subject: [PATCH] Fix to use bower version emojify.js
---
public/js/extra.js | 2 --
public/js/index.js | 2 --
public/views/foot.ejs | 1 +
public/views/help-modal.ejs | 2 +-
public/views/pretty.ejs | 1 +
public/views/slide.ejs | 1 +
webpack.production.js | 1 -
webpackBaseConfig.js | 1 -
8 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/public/js/extra.js b/public/js/extra.js
index 4e3254463..1eae80f68 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -879,8 +879,6 @@ md.use(require('markdown-it-emoji'), {
shortcuts: false
});
-var emojify = require('emojify.js');
-
emojify.setConfig({
blacklist: {
elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'],
diff --git a/public/js/index.js b/public/js/index.js
index 2e21a2936..6625d2d1f 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -3733,8 +3733,6 @@ function matchInContainer(text) {
}
}
-var emojify = require('emojify.js');
-
$(editor.getInputField())
.textcomplete([
{ // emoji strategy
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index e2af5b0e0..a322b0afd 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -16,6 +16,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
+<script src="<%- url %>/vendor/emojify.js/dist/js/emojify.min.js" defer></script>
<% } %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
diff --git a/public/views/help-modal.ejs b/public/views/help-modal.ejs
index fd8bfbffc..08fee9c00 100644
--- a/public/views/help-modal.ejs
+++ b/public/views/help-modal.ejs
@@ -113,7 +113,7 @@
<td>```javascript<br>var i = 0;<br>```</td>
</tr>
<tr>
- <td><img align="absmiddle" alt=":smile:" class="emoji" src="./vendor/emojify/images/smile.png" title=":smile:"></img></td>
+ <td><img align="absmiddle" alt=":smile:" class="emoji" src="./vendor/emojify.js/dist/images/basic/smile.png" title=":smile:"></img></td>
<td>:smile:</td>
</tr>
<tr>
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 21632ec29..756505369 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -98,6 +98,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
+<script src="<%- url %>/vendor/emojify.js/dist/js/emojify.min.js" defer></script>
<% } %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index dedfc98d8..9dbefa6f2 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -100,6 +100,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
+ <script src="<%- url %>/vendor/emojify.js/dist/js/emojify.min.js" defer></script>
<% } %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
diff --git a/webpack.production.js b/webpack.production.js
index 95b90b974..f857c53c1 100644
--- a/webpack.production.js
+++ b/webpack.production.js
@@ -9,7 +9,6 @@ module.exports = Object.assign({}, baseConfig, {
new webpack.ProvidePlugin({
Visibility: "visibilityjs",
Cookies: "js-cookie",
- emojify: "emojify.js",
key: "keymaster",
$: "jquery",
jQuery: "jquery",
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index a39f8384b..b9e61b674 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -8,7 +8,6 @@ module.exports = {
new webpack.ProvidePlugin({
Visibility: "visibilityjs",
Cookies: "js-cookie",
- emojify: "emojify.js",
key: "keymaster",
$: "jquery",
jQuery: "jquery",