Fix to use bower version emojify.js

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

View file

@ -879,8 +879,6 @@ md.use(require('markdown-it-emoji'), {
shortcuts: false shortcuts: false
}); });
var emojify = require('emojify.js');
emojify.setConfig({ emojify.setConfig({
blacklist: { blacklist: {
elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'], elements: ['script', 'textarea', 'a', 'pre', 'code', 'svg'],

View file

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

View file

@ -16,6 +16,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <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/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.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="//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> <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>

View file

@ -113,7 +113,7 @@
<td>```javascript<br>var i = 0;<br>```</td> <td>```javascript<br>var i = 0;<br>```</td>
</tr> </tr>
<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> <td>:smile:</td>
</tr> </tr>
<tr> <tr>

View file

@ -98,6 +98,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <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/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.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="//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> <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>

View file

@ -100,6 +100,7 @@
<script type="text/javascript" src="<%- url %>/vendor/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <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/moment/min/moment-with-locales.js" defer></script>
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.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="//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> <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>

View file

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

View file

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