From 9d14e8f40e4f1a575e9115b028696a2bfe3e8acf Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Thu, 14 Sep 2017 21:49:21 +0800
Subject: [PATCH 1/5] Update retort-picker.js.es6

---
 assets/javascripts/discourse/components/retort-picker.js.es6 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/javascripts/discourse/components/retort-picker.js.es6 b/assets/javascripts/discourse/components/retort-picker.js.es6
index bb0e995..7c9ecfb 100644
--- a/assets/javascripts/discourse/components/retort-picker.js.es6
+++ b/assets/javascripts/discourse/components/retort-picker.js.es6
@@ -4,6 +4,10 @@ import { emojiUrlFor } from 'discourse/lib/text'
 const siteSettings = Discourse.SiteSettings
 
 export default EmojiPicker.extend({
+  show() {
+    this.didInsertElement();
+    this._super();
+  },
 
   _scrollTo() {
     if (siteSettings.retort_limited_emoji_set) {

From 9f879e806d9f6871150db32ed56abe575470ce92 Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Thu, 14 Sep 2017 21:50:13 +0800
Subject: [PATCH 2/5] Update retort-picker.js.es6

---
 assets/javascripts/discourse/components/retort-picker.js.es6 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/javascripts/discourse/components/retort-picker.js.es6 b/assets/javascripts/discourse/components/retort-picker.js.es6
index 7c9ecfb..0aba3bf 100644
--- a/assets/javascripts/discourse/components/retort-picker.js.es6
+++ b/assets/javascripts/discourse/components/retort-picker.js.es6
@@ -9,6 +9,11 @@ export default EmojiPicker.extend({
     this._super();
   },
 
+  close() {
+    this._super();
+    this.willDestroyElement();
+  },
+  
   _scrollTo() {
     if (siteSettings.retort_limited_emoji_set) {
       return

From f10704d252771dc0758c569e42ae124704769d30 Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Thu, 14 Sep 2017 21:51:27 +0800
Subject: [PATCH 3/5] Update retort-picker.js.es6

---
 assets/javascripts/discourse/components/retort-picker.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/discourse/components/retort-picker.js.es6 b/assets/javascripts/discourse/components/retort-picker.js.es6
index 0aba3bf..6623a42 100644
--- a/assets/javascripts/discourse/components/retort-picker.js.es6
+++ b/assets/javascripts/discourse/components/retort-picker.js.es6
@@ -24,11 +24,11 @@ export default EmojiPicker.extend({
 
   _loadCategoriesEmojis() {
     if (siteSettings.retort_limited_emoji_set) {
-      const $picker = $('.emoji-picker')
+      const $picker = this.$('.emoji-picker')
       $picker.html("")
       siteSettings.retort_allowed_emojis.split('|').map((code) => {
         $picker.append(`<button type="button" title="${code}" class="emoji" />`)
-        $(`button.emoji[title="${code}"]`).css("background-image", `url("${emojiUrlFor(code)}")`)
+        this.$(`button.emoji[title="${code}"]`).css("background-image", `url("${emojiUrlFor(code)}")`)
       })
       this._bindEmojiClick($picker);
     } else {

From 1222c4442eb0dadce14d0a003444d9a513b5eaa2 Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Mon, 18 Sep 2017 23:03:46 +0800
Subject: [PATCH 4/5] Update retort-picker.js.es6

---
 .../discourse/components/retort-picker.js.es6          | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/assets/javascripts/discourse/components/retort-picker.js.es6 b/assets/javascripts/discourse/components/retort-picker.js.es6
index 6623a42..d4de712 100644
--- a/assets/javascripts/discourse/components/retort-picker.js.es6
+++ b/assets/javascripts/discourse/components/retort-picker.js.es6
@@ -4,16 +4,6 @@ import { emojiUrlFor } from 'discourse/lib/text'
 const siteSettings = Discourse.SiteSettings
 
 export default EmojiPicker.extend({
-  show() {
-    this.didInsertElement();
-    this._super();
-  },
-
-  close() {
-    this._super();
-    this.willDestroyElement();
-  },
-  
   _scrollTo() {
     if (siteSettings.retort_limited_emoji_set) {
       return

From 747bed4bab45afb77ad9ed667dea66f5fdf5b6db Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Mon, 25 Sep 2017 20:16:41 +0800
Subject: [PATCH 5/5] Update plugin.rb

---
 plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.rb b/plugin.rb
index 399e963..62e8c85 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -27,7 +27,7 @@ class Engine < ::Rails::Engine
   end
 
   class ::Retort::RetortsController < ApplicationController
-    before_filter :verify_post_and_user, only: :update
+    before_action :verify_post_and_user, only: :update
 
     def update
       retort.toggle_user(current_user)