Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind

Revert "Enable search keybinding globally in editor"

GitOrigin-RevId: 423bebb48a237c8bda935bb6cb70c5cf953b7015

services/web/public/src/ide/editor/directives/aceEditor.js

@@ -19,8 +19,6 @@ define([
   'ide/editor/directives/aceEditor/track-changes/TrackChangesManager',
   'ide/editor/directives/aceEditor/track-changes/TrackChangesAdapter',
   'ide/editor/directives/aceEditor/metadata/MetadataManager',
-  'ide/editor/directives/aceEditor/global-key-binding/GlobalKeybindingManager',
-  'ide/editor/directives/aceEditor/global-key-binding/GlobalKeybindingAdapter',
   'ide/metadata/services/metadata',
   'ide/graphics/services/graphics',
   'ide/preamble/services/preamble',
@@ -40,9 +38,7 @@ define([
   CursorPositionAdapter,
   TrackChangesManager,
   TrackChangesAdapter,
-  MetadataManager,
+  MetadataManager
-  GlobalKeybindingManager,
-  GlobalKeybindingAdapter
 ) {
   let syntaxValidationEnabled
   const { EditSession } = ace.require('ace/edit_session')
@@ -201,11 +197,8 @@ define([
           preamble,
           files
         )
-        /* eslint-enable no-unused-vars */
 
-        const keybindingManager = new GlobalKeybindingManager(
+        /* eslint-enable no-unused-vars */
-          new GlobalKeybindingAdapter(editor)
-        )
 
         scope.$watch('onSave', function(callback) {
           if (callback != null) {
@@ -751,7 +744,6 @@ define([
           triggerEditorInitEvent()
           initSpellCheck()
           initTrackChanges()
-          keybindingManager.init()
 
           resetScrollMargins()
 
@@ -802,7 +794,6 @@ define([
         var detachFromAce = function(sharejs_doc) {
           tearDownSpellCheck()
           tearDownTrackChanges()
-          keybindingManager.tearDown()
           sharejs_doc.detachFromAce()
           sharejs_doc.off('remoteop.recordRemote')
 

services/web/public/src/ide/editor/directives/aceEditor/global-key-binding/GlobalKeybindingAdapter.js

@@ -1,17 +0,0 @@
-define(['ace/ace', 'ace/ext-searchbox'], function() {
-  const SearchBox = ace.require('ace/ext/searchbox')
-
-  class GlobalKeybindingAdapter {
-    constructor(editor) {
-      this.editor = editor
-    }
-
-    handleF(e) {
-      e.preventDefault()
-      SearchBox.Search(this.editor, true)
-      return false
-    }
-  }
-
-  return GlobalKeybindingAdapter
-})

services/web/public/src/ide/editor/directives/aceEditor/global-key-binding/GlobalKeybindingManager.js

@@ -1,29 +0,0 @@
-define([], function() {
-  const F_KEY = 70
-
-  class GlobalKeyBindingManager {
-    constructor(adapter) {
-      this.adapter = adapter
-      this.handleKey = this.handleKey.bind(this)
-    }
-
-    handleKey(e) {
-      if (e.metaKey || e.ctrlKey) {
-        switch (e.keyCode) {
-          case F_KEY:
-            return this.adapter.handleF(e)
-        }
-      }
-    }
-
-    init() {
-      $(document).on('keydown', this.handleKey)
-    }
-
-    tearDown() {
-      $(document).off('keydown', this.handleKey)
-    }
-  }
-
-  return GlobalKeyBindingManager
-})