From 5b79384521aa932881f1ebeb23e62f2ca18ce410 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Tue, 20 Sep 2016 01:17:18 +0900
Subject: [PATCH] Disable search in current team `CTRL+SHIFT+S`

Due to #293
Revert when DM search works properly https://mattermost.atlassian.net/browse/PLT-91
---
 CHANGELOG.md          | 1 -
 docs/setup.md         | 1 -
 src/main/menus/app.js | 8 --------
 3 files changed, 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86ca7504..a379c424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@ Release date: TBD
 - Disabled `eval()` function for security improvements.
 - Removed misleading shortcuts from tray menu, as they didn't work
 - Ctrl/Command+S puts cursor in search box to search in current team.
-- Shift+Ctrl/Command+S puts cursor in search box to search in current channel.
 - Add access to settings through tray menu
 - Removed unclear desktop notifications when failed to load tabs.
 - Reload automatically the failed tab when the computer becomes online.
diff --git a/docs/setup.md b/docs/setup.md
index b8b0b55a..9c88b48c 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -153,7 +153,6 @@ Below lists menu options (shortcut keys are listed in brackets, `Ctrl` becomes `
   - **Paste** (Ctrl+V) - Pastes text from clipboard
   - **Select All** (Ctrl+A) - Select all text in input box
   - **Search in Team** (Ctrl+S) - Puts cursor in search box to search in the current team
-  - **Search in Channel** (Shift+Ctrl+S) - Puts cursor in search box to search in current channel
 - **View**
   - **Reload** (Ctrl+R) - Reload page from the server
   - **Clear Cache and Reload** (Ctrl+Shift+R) - Clear cached content in application and reload page
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 8138d271..926fa4d8 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -77,14 +77,6 @@ var createTemplate = function(mainWindow, config) {
           focusedWindow.webContents.send('activate-search-box');
         }
       }
-    }, {
-      label: 'Search in Channel',
-      accelerator: 'Shift+CmdOrCtrl+S',
-      click: (item, focusedWindow) => {
-        if (focusedWindow) {
-          focusedWindow.webContents.send('activate-search-box-in-channel');
-        }
-      }
     }]
   });
   template.push({