Merge in Master
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/89f19a80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/89f19a80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/89f19a80 Branch: refs/heads/fix/dependendices-2016 Commit: 89f19a80a91d00db72ca2e9657583116428d12d9 Parents: bf3a90c Author: wisebaldone <[email protected]> Authored: Thu Dec 22 13:12:01 2016 +1000 Committer: wisebaldone <[email protected]> Committed: Thu Dec 22 13:12:01 2016 +1000 ---------------------------------------------------------------------- .../waveprotocol/wave/client/common/util/SignalEventImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/89f19a80/wave/src/main/java/org/waveprotocol/wave/client/common/util/SignalEventImpl.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/waveprotocol/wave/client/common/util/SignalEventImpl.java b/wave/src/main/java/org/waveprotocol/wave/client/common/util/SignalEventImpl.java index b43765e..debe810 100644 --- a/wave/src/main/java/org/waveprotocol/wave/client/common/util/SignalEventImpl.java +++ b/wave/src/main/java/org/waveprotocol/wave/client/common/util/SignalEventImpl.java @@ -92,10 +92,9 @@ public class SignalEventImpl implements SignalEvent { return KEY_EVENTS.contains(event.getType()); } - //TODO: check requirements if seperate logic is still needed. - private static final UserAgentType currentUserAgent = UserAgentType.GECKO; - // (UserAgent.isWebkit() ? UserAgentType.WEBKIT : ( - // UserAgent.isFirefox() ? UserAgentType.GECKO : UserAgentType.IE)); + private static final UserAgentType currentUserAgent = + (UserAgent.isWebkit() ? UserAgentType.WEBKIT : ( + UserAgent.isFirefox() ? UserAgentType.GECKO : UserAgentType.IE)); private static final OperatingSystem currentOs = (UserAgent.isWin() ? OperatingSystem.WINDOWS : ( UserAgent.isMac() ? OperatingSystem.MAC : OperatingSystem.LINUX));
