summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--public/js/extra.js2
-rw-r--r--public/js/index.js2
-rw-r--r--public/views/foot.ejs1
-rw-r--r--public/views/help-modal.ejs2
-rw-r--r--public/views/pretty.ejs1
-rw-r--r--public/views/slide.ejs1
6 files changed, 4 insertions, 5 deletions
diff --git a/public/js/extra.js b/public/js/extra.js
index 4e325446..1eae80f6 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 2e21a293..6625d2d1 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 e2af5b0e..a322b0af 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 fd8bfbff..08fee9c0 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 21632ec2..75650536 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 dedfc98d..9dbefa6f 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>