Merge pull request #1551 from NARKOZ/front-end

add auto-completion for +1, -1 emoji

Merge pull request #1551 from NARKOZ/front-end
add auto-completion for +1, -1 emoji
Dmitriy Zaporozhets
2 parents c3efcf7a 6df515a5
Showing 1 changed file with 8 additions and 2 deletions Show diff stats
app/views/notes/_common_form.html.haml
@@ -39,6 +39,12 @@
 :javascript
   $(function(){
-    var names = #{@project.users.pluck(:name)};
-    $('.note-text').atWho('@', { data: names });
+    var names = #{@project.users.pluck(:name)}, emoji = ['+1', '-1'];
+    var emoji = $.map(emoji, function(value, i) {return {key:value + ':', name:value}});
+    $('#note_note').
+      atWho('@', { data: names }).
+      atWho(':', {
+        data: emoji,
+        tpl: "<li data-value='${key}'>${name} #{escape_javascript image_tag('emoji/${name}.png', :size => '20x20')}</li>"
+      });
   });
	@@ -39,6 +39,12 @@		@@ -39,6 +39,12 @@
39		39
40	:javascript	40	:javascript
41	$(function(){	41	$(function(){
42	- var names = #{@project.users.pluck(:name)};
43	- $('.note-text').atWho('@', { data: names });	42	+ var names = #{@project.users.pluck(:name)}, emoji = ['+1', '-1'];
		43	+ var emoji = $.map(emoji, function(value, i) {return {key:value + ':', name:value}});
		44	+ $('#note_note').
		45	+ atWho('@', { data: names }).
		46	+ atWho(':', {
		47	+ data: emoji,
		48	+ tpl: "<li data-value='${key}'>${name} #{escape_javascript image_tag('emoji/${name}.png', :size => '20x20')}</li>"
		49	+ });
44	});	50	});