github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-22 01:36:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix to use bower version emojify.js

Browse source
This commit is contained in:
Wu Cheng-Han 2016-10-19 22:12:12 +08:00
parent 5640de8c77
commit d70d0318e5
8 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/extra.js
View file

@ -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'],

2
public/js/index.js
View file

@ -3733,8 +3733,6 @@ function matchInContainer(text) {
}
}
var emojify = require('emojify.js');
$(editor.getInputField())
.textcomplete([
{ // emoji strategy

1
public/views/foot.ejs
View file

@ -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>

2
public/views/help-modal.ejs
View file

@ -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>

1
public/views/pretty.ejs
View file

@ -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>

1
public/views/slide.ejs
View file

@ -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>

1
webpack.production.js
View file

@ -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",

1
webpackBaseConfig.js
View file

@ -8,7 +8,6 @@ module.exports = {
new webpack.ProvidePlugin({
Visibility: "visibilityjs",
Cookies: "js-cookie",
emojify: "emojify.js",
key: "keymaster",
$: "jquery",
jQuery: "jquery",