Move to main.coffee and add select tag to ignore list

pull/4300/head
Maki Nishifuji 9 years ago
parent 80970f144e
commit a5f98e5b71
  1. 9
      packages/rocketchat-ui-master/master/main.coffee
  2. 12
      packages/rocketchat-ui/lib/fireEvent.js

@ -29,6 +29,15 @@ Template.body.onRendered ->
if subscription.alert or subscription.unread > 0
Meteor.call 'readMessages', subscription.rid
$(document.body).on 'keydown', (e) ->
target = e.target
if /input|textarea|select/i.test(target.tagName)
return
$inputMessage = $('textarea.input-message')
if 0 == $inputMessage.length
return
$inputMessage.focus()
$(document.body).on 'click', 'a', (e) ->
link = e.currentTarget
if link.origin is s.rtrim(Meteor.absoluteUrl(), '/') and /msg=([a-zA-Z0-9]+)/.test(link.search)

@ -33,15 +33,3 @@ window.addEventListener('message', (e) => {
break;
}
});
window.addEventListener('keydown', (e) => {
const target = e.target;
if (/input|textarea/i.test(target.tagName)) {
return;
}
const $inputMessage = $('textarea.input-message');
if (0 === $inputMessage.length) {
return;
}
$inputMessage.focus();
});

Loading…
Cancel
Save