From 3035d144c091d63970675d88f9efc5c1012180bf Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Wed, 6 Jul 2016 11:42:24 -0400 Subject: [PATCH] FEATURE: Add options to inject class / page into emoji toolbar (#4312) * Add options to inject class / page into emoji toolbar * Fix options page setter --- .../javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 | 8 +++++--- .../javascripts/discourse/templates/emoji-toolbar.raw.hbs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 index 47d77040dde..7691fb28ccd 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 @@ -132,7 +132,7 @@ function render(page, offset, options) { for(let i=offset; i icons.length + nextDisabled: (max + 1) > icons.length, + modalClass: options.modalClass }; $('.emoji-modal', options.appendTo).remove(); @@ -162,7 +163,8 @@ function showSelector(options) { $('.emoji-modal-wrapper').click(() => closeSelector()); if (Discourse.Site.currentProp('mobileView')) { PER_ROW = 9; } - const page = keyValueStore.getInt("emojiPage", 0); + const page = options.page ? _.findIndex(groups, (g) => { return g.name === options.page; }) + : keyValueStore.getInt("emojiPage", 0); const offset = keyValueStore.getInt("emojiOffset", 0); render(page, offset, options); diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs index c74684b1eba..b7e39bb37ba 100644 --- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs +++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs @@ -1,4 +1,4 @@ -
+
    {{#each toolbarItems as |item|}}
  • {{/each}}