From 7f9e58bccf72b800d8a64256e56a5239b8bf5151 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 11 Jan 2016 14:44:45 +0100 Subject: [PATCH] [backport] support ',' in foreign keyboards --- app/coffee/modules/common/tags.coffee | 36 ++++++++------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/app/coffee/modules/common/tags.coffee b/app/coffee/modules/common/tags.coffee index 2d3e4c19..ac420f6d 100644 --- a/app/coffee/modules/common/tags.coffee +++ b/app/coffee/modules/common/tags.coffee @@ -156,22 +156,14 @@ LbTagLineDirective = ($rs, $template, $compile) -> addValue(value) resetInput() - removeInputLastCharacter = (input) => - inputValue = input.val() - input.val inputValue.substring(0, inputValue.length - 1) - ## Events $el.on "keypress", "input", (event) -> - return if event.keyCode != ENTER_KEY - event.preventDefault() - - $el.on "keyup", "input", (event) -> target = angular.element(event.currentTarget) if event.keyCode == ENTER_KEY saveInputTag() - else if event.keyCode == COMMA_KEY - removeInputLastCharacter(target) + else if String.fromCharCode(event.keyCode) == ',' + event.preventDefault() saveInputTag() else if target.val().length @@ -320,34 +312,28 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template, $compi addValue(value) resetInput() - removeInputLastCharacter = (input) => - inputValue = input.val() - input.val inputValue.substring(0, inputValue.length - 1) - ## Events $el.on "keypress", "input", (event) -> - return if event.keyCode not in [ENTER_KEY, ESC_KEY] - event.preventDefault() - - $el.on "keyup", "input", (event) -> target = angular.element(event.currentTarget) if event.keyCode == ENTER_KEY saveInputTag() - else if event.keyCode == COMMA_KEY - removeInputLastCharacter(target) + else if String.fromCharCode(event.keyCode) == ',' + event.preventDefault() saveInputTag() - else if event.keyCode == ESC_KEY - resetInput() - hideInput() - hideSaveButton() - showAddTagButton() else if target.val().length showSaveButton() else hideSaveButton() + $el.on "keyup", "input", (event) -> + if event.keyCode == ESC_KEY + resetInput() + hideInput() + hideSaveButton() + showAddTagButton() + $el.on "click", ".save", (event) -> event.preventDefault() saveInputTag()