From 54778d222b7f031237a986bddd5ec4ff96bd517d Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Fri, 15 Jun 2018 01:29:06 +0530
Subject: [PATCH 1/7] basic emoji autocomplete

---
 app/assets/javascripts/application.js |  1 +
 app/helpers/application_helper.rb     | 15 ++++++++++++++
 app/views/comments/_edit.html.erb     | 27 ++++++++++++++++++++++++
 app/views/comments/_form.html.erb     | 30 ++++++++++++++++++++++++++-
 config/initializers/assets.rb         |  4 +++-
 5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7d08ac2406..5d4820ed63 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -51,6 +51,7 @@
 //= require short-code-forms/dist/short-code-prompts.js
 //= require wikis.js
 //= require chart.js/dist/Chart.js
+//= require horsey.js
 //= require header_footer.js
 //  require turbolinks // Temporarily removed while fixing
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abf2e74b76..379923753b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -27,6 +27,21 @@ def emojify(content)
     end if content.present?
   end
 
+  def get_emoji_names
+    emojis = []
+    image_map = Hash.new
+    Emoji.all.each do |e|
+      val = ":#{e.name}:"
+      emojis<<{value: val ,text: e.name}
+      if e.raw
+        image_map[e.name] = e.raw
+      else
+        image_map[e.name] = %(<img class="autofruit" alt="#$1" src="#{image_path("emoji/#{e.image_filename}")}" style="vertical-align:middle" width="20" height="20" />)
+      end
+    end
+    return {emojis: emojis, image_map: image_map}
+  end
+
   def feature(title)
     features = Node.where(type: 'feature', title: title)
     if !features.empty?
diff --git a/app/views/comments/_edit.html.erb b/app/views/comments/_edit.html.erb
index 9576cf8e2a..b251108324 100644
--- a/app/views/comments/_edit.html.erb
+++ b/app/views/comments/_edit.html.erb
@@ -43,6 +43,7 @@
     </div>
   </div>
 
+  <%= javascript_include_tag "horsey" %>
   <script type="application/javascript">
     jQuery(document).ready(function() {
       $E.initialize();
@@ -120,6 +121,20 @@
         );
       }
     });
+
+    <% emoji_names = get_emoji_names %>
+    <% emojis = emoji_names[:emojis] %>
+    <% image_map = emoji_names[:image_map] %>
+    var image_map = <%= raw image_map.to_json %>
+        horsey(document.querySelector('textarea'), {
+            suggestions: (<%= raw emojis.to_json %>),
+            anchor: ':',
+            render: function (li, suggestion) {
+                var image = image_map[suggestion.text];
+                li.innerHTML = "<b>"+image+"</b><span>"+suggestion.text+"</span>";
+            },
+            limit: 6
+        });
   </script>
 
   <div class="well col-md-11" id="c<%= comment.id %>preview" style="background:white;display: none">
@@ -150,3 +165,15 @@
 </form>
 
 
+
+<style>
+  .sey-item b {
+    font-weight: 300;
+    font-size: 20px;
+  }
+
+  .sey-item span {
+    margin-bottom: 0;
+    margin-left: 4px;
+  }
+</style>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 7cf1da846e..68d00df183 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -48,6 +48,8 @@
 
   <div class="well col-md-11" id="preview" style="background:white;display: none">
   </div>
+  <%= javascript_include_tag "horsey" %>
+  <link href="/lib/horsey/dist/horsey.min.css" rel="stylesheet">
 
   <script>
     jQuery(document).ready(function() {
@@ -64,11 +66,25 @@
   </script>
 
   <%= javascript_include_tag "dragdrop" %>
-  <script>    
+  <%= javascript_include_tag "horsey" %>
+  <script>
     $('#comment-form').bind('ajax:beforeSend', function(event){      
       $("#text-input").prop('disabled',true)
       $("#comment-form .btn-primary").button('loading',true);      
     });
+    <% emoji_names = get_emoji_names %>
+    <% emojis = emoji_names[:emojis] %>
+    <% image_map = emoji_names[:image_map] %>
+    var image_map = <%= raw image_map.to_json %>
+    horsey(document.querySelector('textarea'), {
+        suggestions: (<%= raw emojis.to_json %>),
+        anchor: ':',
+        render: function (li, suggestion) {
+            var image = image_map[suggestion.text];
+            li.innerHTML = "<b>"+image+"</b><span>"+suggestion.text+"</span>";
+        },
+        limit: 6
+    });
 
     $('#comment-form').bind('ajax:success', function(e, data, status, xhr){      
       $('#text-input').prop('disabled',false);      
@@ -125,3 +141,15 @@
   </p>
 
 </form>
+
+<style>
+  .sey-item b {
+    font-weight: 300;
+    font-size: 20px;
+  }
+
+  .sey-item span {
+    margin-bottom: 0;
+    margin-left: 4px;
+  }
+</style>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index cf56568336..744f941a34 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -46,6 +46,8 @@
   'style.css',
   'tags.css',
   'user_tags.css.scss',
-  'wiki.css'
+  'wiki.css',
+  'horsey.js',
+  'comment-autocomplete'
 ]
 

From 96dfbea3b64205bfe294d24a44393b4fb1fe3cf0 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Sat, 16 Jun 2018 12:05:46 +0530
Subject: [PATCH 2/7] minor changes

---
 app/helpers/application_helper.rb |  6 ++----
 app/views/comments/_edit.html.erb | 16 ----------------
 app/views/comments/_form.html.erb |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 379923753b..aaf4582700 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,12 +31,10 @@ def get_emoji_names
     emojis = []
     image_map = Hash.new
     Emoji.all.each do |e|
-      val = ":#{e.name}:"
-      emojis<<{value: val ,text: e.name}
       if e.raw
+        val = ":#{e.name}:"
+        emojis<<{value: val ,text: e.name}
         image_map[e.name] = e.raw
-      else
-        image_map[e.name] = %(<img class="autofruit" alt="#$1" src="#{image_path("emoji/#{e.image_filename}")}" style="vertical-align:middle" width="20" height="20" />)
       end
     end
     return {emojis: emojis, image_map: image_map}
diff --git a/app/views/comments/_edit.html.erb b/app/views/comments/_edit.html.erb
index b251108324..e450c105b7 100644
--- a/app/views/comments/_edit.html.erb
+++ b/app/views/comments/_edit.html.erb
@@ -42,8 +42,6 @@
 
     </div>
   </div>
-
-  <%= javascript_include_tag "horsey" %>
   <script type="application/javascript">
     jQuery(document).ready(function() {
       $E.initialize();
@@ -121,20 +119,6 @@
         );
       }
     });
-
-    <% emoji_names = get_emoji_names %>
-    <% emojis = emoji_names[:emojis] %>
-    <% image_map = emoji_names[:image_map] %>
-    var image_map = <%= raw image_map.to_json %>
-        horsey(document.querySelector('textarea'), {
-            suggestions: (<%= raw emojis.to_json %>),
-            anchor: ':',
-            render: function (li, suggestion) {
-                var image = image_map[suggestion.text];
-                li.innerHTML = "<b>"+image+"</b><span>"+suggestion.text+"</span>";
-            },
-            limit: 6
-        });
   </script>
 
   <div class="well col-md-11" id="c<%= comment.id %>preview" style="background:white;display: none">
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 68d00df183..c36c58c20b 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -76,7 +76,7 @@
     <% emojis = emoji_names[:emojis] %>
     <% image_map = emoji_names[:image_map] %>
     var image_map = <%= raw image_map.to_json %>
-    horsey(document.querySelector('textarea'), {
+    horsey(document.querySelector('textarea#text-input'), {
         suggestions: (<%= raw emojis.to_json %>),
         anchor: ':',
         render: function (li, suggestion) {

From 3b4f132e6818034cdceecb328a7c6ef87f357080 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Mon, 18 Jun 2018 00:14:38 +0530
Subject: [PATCH 3/7] minor tweaks

---
 app/assets/stylesheets/comments.css | 12 +++++++++++-
 app/views/comments/_form.html.erb   | 14 --------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 3619efa1a1..85a66c5931 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -12,4 +12,14 @@
 
 #question-comment-form {
     width: 90%;
-}
\ No newline at end of file
+}
+
+.sey-item b {
+  font-weight: 300;
+  font-size: 20px;
+}
+
+.sey-item span {
+  margin-bottom: 0;
+  margin-left: 4px;
+}
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index c36c58c20b..8bcd0b8fb3 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -48,7 +48,6 @@
 
   <div class="well col-md-11" id="preview" style="background:white;display: none">
   </div>
-  <%= javascript_include_tag "horsey" %>
   <link href="/lib/horsey/dist/horsey.min.css" rel="stylesheet">
 
   <script>
@@ -66,7 +65,6 @@
   </script>
 
   <%= javascript_include_tag "dragdrop" %>
-  <%= javascript_include_tag "horsey" %>
   <script>
     $('#comment-form').bind('ajax:beforeSend', function(event){      
       $("#text-input").prop('disabled',true)
@@ -141,15 +139,3 @@
   </p>
 
 </form>
-
-<style>
-  .sey-item b {
-    font-weight: 300;
-    font-size: 20px;
-  }
-
-  .sey-item span {
-    margin-bottom: 0;
-    margin-left: 4px;
-  }
-</style>

From c27344c4bc1de16ff0d1b21c1f8ef8ad05b6cae4 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Mon, 18 Jun 2018 00:20:08 +0530
Subject: [PATCH 4/7] code climate fixes

---
 app/helpers/application_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index aaf4582700..48d61c9f66 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -27,17 +27,17 @@ def emojify(content)
     end if content.present?
   end
 
-  def get_emoji_names
+  def emoji_names_list
     emojis = []
-    image_map = Hash.new
+    image_map = {}
     Emoji.all.each do |e|
       if e.raw
         val = ":#{e.name}:"
-        emojis<<{value: val ,text: e.name}
+        emojis<<{ value: val, text: e.name }
         image_map[e.name] = e.raw
       end
     end
-    return {emojis: emojis, image_map: image_map}
+    { emojis: emojis, image_map: image_map }
   end
 
   def feature(title)

From 506b31a7686bdddbcc9ccd8977e2a8c1f34230ce Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Mon, 18 Jun 2018 00:31:47 +0530
Subject: [PATCH 5/7] minor change

---
 app/views/comments/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 8bcd0b8fb3..f295e321f7 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -70,7 +70,7 @@
       $("#text-input").prop('disabled',true)
       $("#comment-form .btn-primary").button('loading',true);      
     });
-    <% emoji_names = get_emoji_names %>
+    <% emoji_names = emoji_names_list %>
     <% emojis = emoji_names[:emojis] %>
     <% image_map = emoji_names[:image_map] %>
     var image_map = <%= raw image_map.to_json %>

From 1a99dcf9c659edeed7c7b1f6dffd0a15acba1c48 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Mon, 18 Jun 2018 00:37:00 +0530
Subject: [PATCH 6/7] changes

---
 app/helpers/application_helper.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 48d61c9f66..3cbab154b5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,11 +31,10 @@ def emoji_names_list
     emojis = []
     image_map = {}
     Emoji.all.each do |e|
-      if e.raw
-        val = ":#{e.name}:"
-        emojis<<{ value: val, text: e.name }
-        image_map[e.name] = e.raw
-      end
+      next unless e.raw
+      val = ":#{e.name}:"
+      emojis<<{ value: val, text: e.name }
+      image_map[e.name] = e.raw
     end
     { emojis: emojis, image_map: image_map }
   end

From 5ebba54008bb7ac501b30a4b168193d64f329374 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Mon, 18 Jun 2018 22:34:35 +0530
Subject: [PATCH 7/7] remove unnecessary style

---
 app/views/comments/_edit.html.erb | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/views/comments/_edit.html.erb b/app/views/comments/_edit.html.erb
index e450c105b7..56a1cf6eba 100644
--- a/app/views/comments/_edit.html.erb
+++ b/app/views/comments/_edit.html.erb
@@ -147,17 +147,3 @@
     <%= t('comments._edit.email_notifications') %>
   </p>
 </form>
-
-
-
-<style>
-  .sey-item b {
-    font-weight: 300;
-    font-size: 20px;
-  }
-
-  .sey-item span {
-    margin-bottom: 0;
-    margin-left: 4px;
-  }
-</style>