Fix Enter Behavior

RocketChat · Feb 16, 2017 · 89c4d94 · 89c4d94
1 parent d203f4d
commit 89c4d94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/rocketchat-ui-account/account/accountPreferences.coffee b/packages/rocketchat-ui-account/account/accountPreferences.coffee
@@ -29,7 +29,7 @@ Template.accountPreferences.helpers
 
 	selected: (property, value, defaultValue) ->
 		if not Meteor.user()?.settings?.preferences?[property]
-			return defaultValue
+			return defaultValue is true
 		else
 			return Meteor.user()?.settings?.preferences?[property] == value
 

diff --git a/packages/rocketchat-ui/lib/chatMessages.coffee b/packages/rocketchat-ui/lib/chatMessages.coffee
@@ -337,7 +337,7 @@ class @ChatMessages
 		this.resize(input)
 
 		if k is 13
-			if sendOnEnter is 'normal' || (sendOnEnter is 'desktop' and Meteor.Device.isDesktop())
+			if not sendOnEnter? || sendOnEnter is 'normal' || (sendOnEnter is 'desktop' and Meteor.Device.isDesktop())
 				if not event.shiftKey and not event.ctrlKey and not event.altKey and not event.metaKey # Enter without shift/ctrl/alt
 					event.preventDefault()
 					event.stopPropagation()