From a233a14f4a61ba653849498cc56073b8c3dc17e5 Mon Sep 17 00:00:00 2001
From: Katie Fenn <masqurinwizard@googlemail.com>
Date: Sun, 14 Dec 2014 16:37:49 +0000
Subject: [PATCH] Fixed editor tag field handling of comma key on international
 keyboards

fixes #4356
- Added new keyPress event handler to identify keys by character instead of key
- Removed code for handling comma key from keyDown event handler
---
 core/client/views/post-tags-input.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/client/views/post-tags-input.js b/core/client/views/post-tags-input.js
index 3585a21129..f483c0608c 100644
--- a/core/client/views/post-tags-input.js
+++ b/core/client/views/post-tags-input.js
@@ -15,8 +15,7 @@ var PostTagsInputView = Ember.View.extend({
         ESCAPE: 27,
         UP: 38,
         DOWN: 40,
-        NUMPAD_ENTER: 108,
-        COMMA: 188
+        NUMPAD_ENTER: 108
     },
 
     didInsertElement: function () {
@@ -52,6 +51,23 @@ var PostTagsInputView = Ember.View.extend({
             this.get('parentView').set('hasFocus', false);
         },
 
+        keyPress: function (event) {
+            // listen to keypress event to handle comma key on international keyboard
+            var controller = this.get('parentView.controller'),
+                isComma = ','.localeCompare(String.fromCharCode(event.keyCode || event.charCode)) === 0;
+
+            // use localeCompare in case of international keyboard layout
+            if (isComma) {
+                event.preventDefault();
+
+                if (controller.get('selectedSuggestion')) {
+                    controller.send('addSelectedSuggestion');
+                } else {
+                    controller.send('addNewTag');
+                }
+            }
+        },
+
         keyDown: function (event) {
             var controller = this.get('parentView.controller'),
                 keys = this.get('parentView.keys'),
@@ -71,11 +87,6 @@ var PostTagsInputView = Ember.View.extend({
                 case keys.TAB:
                 case keys.ENTER:
                 case keys.NUMPAD_ENTER:
-                case keys.COMMA:
-                    if (event.keyCode === keys.COMMA && event.shiftKey) {
-                        break;
-                    }
-
                     if (controller.get('selectedSuggestion')) {
                         event.preventDefault();
                         controller.send('addSelectedSuggestion');