From 679800bc09eb65fbe14aced281f92ec5f7c93579 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 15 Dec 2014 12:24:48 +1100
Subject: [PATCH] remove shortcut for now

---
 plugins/emoji/assets/javascripts/emoji-toolbar.js | 3 +--
 plugins/emoji/config/locales/client.en.yml        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/emoji/assets/javascripts/emoji-toolbar.js b/plugins/emoji/assets/javascripts/emoji-toolbar.js
index fceaa6d38..ed59f0b5c 100644
--- a/plugins/emoji/assets/javascripts/emoji-toolbar.js
+++ b/plugins/emoji/assets/javascripts/emoji-toolbar.js
@@ -157,6 +157,5 @@ var showSelector = function(){
 window.PagedownCustom.appendButtons.push({
   id: 'wmd-emoji-button',
   description: I18n.t("composer.emoji"),
-  execute: showSelector,
-  shortcut: ':'
+  execute: showSelector
 });
diff --git a/plugins/emoji/config/locales/client.en.yml b/plugins/emoji/config/locales/client.en.yml
index 2680fd70a..5984bc4e9 100644
--- a/plugins/emoji/config/locales/client.en.yml
+++ b/plugins/emoji/config/locales/client.en.yml
@@ -1,7 +1,7 @@
 en:
   js:
     composer:
-      emoji: "Emoji :smile: CTRL+:"
+      emoji: "Emoji :smile:"
 
     apple_international: "Apple/International"
     google: "Google"