Merge pull request #23 from Mindroute/master

Upgraded build environment, improved modules and custom button icon
contentco · Apr 7, 2018 · 2ff9f4e · 2ff9f4e
2 parents ab33ef5 + 53fd087
commit 2ff9f4e
Show file tree

Hide file tree

Showing 21 changed files with 11,349 additions and 4,726 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,10 @@
+.DS_Store
+.classpath
+.project
+.idea/
+.vscode/
+
 node_modules
 *.log
-
-.DS_Store
+package-lock.json
+logs/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,10 @@
 
 To build __quill-emoji__, run the following command:
 
-```npm run build```
+```sh
+yarn
+yarn build
+```
 
 ## Testing
 

diff --git a/README.md b/README.md
@@ -13,8 +13,7 @@ To add an emoji via emoji code, type ``:`` followed by the first few letters, an
 ## Installation
 
 ```sh
-bower install quill-emoji
-npm install quill-emoji
+yarn add quill-emoji
 ```
 
 ## Usage

diff --git a/bower.json b/bower.json
diff --git a/demo/index.html b/demo/index.html
@@ -1,76 +1,54 @@
 <html>
-    <head>
-        <meta charset="utf-8">
-        <link href="https://cdn.quilljs.com/1.2.2/quill.snow.css" rel="stylesheet">
-        <link rel="stylesheet" type="text/css" href="../dist/quill-emoji.css">
-        <style type="text/css">
-          .ap{
-            font-size: 0px;
-          }
-          .emoji{
-            height:20px;
-            margin-bottom: -5px;
-          }
-        </style>
-    </head>
-    <body>
-
-        <div class="container" style="position:relative;">
-            <h2>Editor</h2>
-            <div id="quill-editor" style="max-height: 300px;"></div>
-        </div>
-
-        <div class="container">
-            <h2>Debug</h2>
-            <div style="margin:20px 0px; display:flex;">
-                <textarea id="output_delta"
-                    style="width:100%; min-height:300px; border: 1px solid lightgray; flex-basis:50%;"></textarea>
 
-                <textarea id="output_html"
-                    style="width:100%; min-height:300px; border: 1px solid lightgray; flex-basis:50%;"></textarea>
-            </div>
-        </div>
-        <script src="../node_modules/quill/dist/quill.js"></script>
-        <script src="../node_modules/fuse.js/src/fuse.js"></script>
-        <script src="../dist/quill-emoji.js"></script>
-
-        <!--<script src="../src/module-textarea-emoji.js"></script>
-        <script src="../src/emojiList.js"></script>
-        <script src="../src/module-emoji.js"></script>-->
-        <script type="text/javascript">
-          var toolbarOptions = {
-            container: [
-              ['bold', 'italic', 'underline', 'strike'],
-              ['blockquote', 'code-block'],
-              [{ 'header': 1 }, { 'header': 2 }], 
-              [{ 'list': 'ordered' }, { 'list': 'bullet' }],
-              [{ 'script': 'sub' }, { 'script': 'super' }], 
-              [{ 'indent': '-1' }, { 'indent': '+1' }], 
-              [{ 'direction': 'rtl' }],
-              [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-              [{ 'color': [] }, { 'background': [] }], 
-              [{ 'font': [] }],
-              [{ 'align': [] }],
-              ['clean'],     
-              ['emoji'],
-              ['link', 'image', 'video']         
-            ],
-            handlers: {'emoji': function() {}}
-          }
-          var quill = new Quill('#quill-editor', {
-              modules: {
-                    toolbar: toolbarOptions,
-                    //toolbar_emoji: false,
-                    short_name_emoji: true,
-                    textarea_emoji:true
-              },
-              placeholder: 'Compose an epic...',
-              theme: 'snow',
-          });
-        var content = '<p><img class="emoji ap ap-yum" src="data:image/png;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="><img class="emoji ap ap-thinking_face" src="data:image/png;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA="></p><p></p>';
-        quill.pasteHTML(content);
-        setInterval( function() { document.getElementById("output_delta").value=JSON.stringify(quill.editor.getDelta()) }, 500);
-        setInterval( function() { document.getElementById("output_html").value=quill.root.innerHTML }, 500);
-        </script>
-    </body>
+  <head>
+    <meta charset="utf-8">
+    <link href="https://cdn.quilljs.com/1.3.5/quill.snow.css" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="../dist/quill-emoji.css">
+  </head>
+
+  <body>
+    <div class="container" style="position:relative;">
+      <h2>Editor</h2>
+      <div id="quill-editor" style="max-height: 300px;"></div>
+    </div>
+
+    <script src="https://cdn.quilljs.com/1.3.5/quill.js"></script>
+    <script src="../dist/quill-emoji.js"></script>
+
+    <script type="text/javascript">
+      var toolbarOptions = {
+        container: [
+          ['bold', 'italic', 'underline', 'strike'],
+          ['blockquote', 'code-block'],
+          [{ 'header': 1 }, { 'header': 2 }],
+          [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+          [{ 'script': 'sub' }, { 'script': 'super' }],
+          [{ 'indent': '-1' }, { 'indent': '+1' }],
+          [{ 'direction': 'rtl' }],
+          [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+          [{ 'color': [] }, { 'background': [] }],
+          [{ 'font': [] }],
+          [{ 'align': [] }],
+          ['clean'],
+          ['emoji'],
+          ['link', 'image', 'video']
+        ],
+        handlers: {
+          'emoji': function () {}
+        }
+      }
+
+      var quill = new Quill('#quill-editor', {
+        modules: {
+          "toolbar": toolbarOptions,
+          "emoji-toolbar": true,
+          "emoji-shortname": true,
+          "emoji-textarea": true
+        },
+        placeholder: 'Compose an epic...',
+        theme: 'snow',
+      });
+    </script>
+  </body>
+
 </html>
diff --git a/dist/.gitkeep b/dist/.gitkeep
diff --git a/dist/quill-emoji.css b/dist/quill-emoji.css
diff --git a/dist/quill-emoji.css.map b/dist/quill-emoji.css.map
diff --git a/dist/quill-emoji.js b/dist/quill-emoji.js