Use same CDN as Flarum for images

Solve part of #1
clarkwinkelmann · Feb 1, 2017 · 5314f18 · 5314f18
1 parent 6f59162
commit 5314f18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/js/forum/dist/extension.js b/js/forum/dist/extension.js
@@ -1254,10 +1254,12 @@ System.register("clarkwinkelmann/emojionearea/components/EmojiAreaButton", ["fla
 
                         $('<div />').emojioneArea({
                             container: $container,
-                            standalone: true,
-                            hideSource: false,
-                            autocomplete: false,
-                            events: {
+                            standalone: true, // Popup only mode
+                            hideSource: false, // Do not hide the target element
+                            autocomplete: false, // Do not try to provide autocomplete - not sure if useful in standalone mode but safer
+                            sprite: false, // Not used by the actual picker, but loads an additional CSS file if enabled
+                            useInternalCDN: false, // Use the same CDN as Flarum so images are not fetched twice
+                            events: { // Listen for clicks to sync with Flarum editor
                                 emojibtn_click: function emojibtn_click(button, event) {
                                     var shortcode = button.data('name');
                                     editor.insertAtCursor(shortcode);

diff --git a/js/forum/src/components/EmojiAreaButton.js b/js/forum/src/components/EmojiAreaButton.js
@@ -28,10 +28,12 @@ export default class EmojiAreaButton extends Component {
 
         $('<div />').emojioneArea({
             container: $container,
-            standalone: true,
-            hideSource: false,
-            autocomplete: false,
-            events: {
+            standalone: true, // Popup only mode
+            hideSource: false, // Do not hide the target element
+            autocomplete: false, // Do not try to provide autocomplete - not sure if useful in standalone mode but safer
+            sprite: false, // Not used by the actual picker, but loads an additional CSS file if enabled
+            useInternalCDN: false, // Use the same CDN as Flarum so images are not fetched twice
+            events: { // Listen for clicks to sync with Flarum editor
                 emojibtn_click: function (button, event) {
                     var shortcode = button.data('name');
                     editor.insertAtCursor(shortcode);