[checkmk-commits] Dropped unused keybinding freature

Module: check_mk Branch: master Commit: d9e8e1845fe2e8bdec1c417c447a24e2eefe7d38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9e8e1845fe2e8… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed May 16 14:16:27 2018 +0200 Dropped unused keybinding freature Change-Id: I11fe7a17c8af4cd32283cc9a733dc122f98a0394 --- web/htdocs/htmllib.py | 38 +++-------------------------- web/htdocs/js/checkmk.js | 62 ------------------------------------------------ 2 files changed, 3 insertions(+), 97 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f211f6f..5abca2c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1432,7 +1432,6 @@ class html(HTMLGenerator, RequestHandler): self.browser_reload = 0 self.browser_redirect = '' self.link_target = None - self.keybindings_enabled = True self.myfile = None # Browser options @@ -1450,8 +1449,6 @@ class html(HTMLGenerator, RequestHandler): self.io_error = False self.mobile = False self.buffering = True - self.keybindings_enabled = True - self.keybindings = [] # Forms self.form_name = None @@ -2016,12 +2013,6 @@ class html(HTMLGenerator, RequestHandler): def body_end(self): if self.have_help: self.javascript("enable_help();") - if self.keybindings_enabled and self.keybindings: - self.javascript("var keybindings = %s;\n" - "document.body.onkeydown = keybindings_keydown;\n" - "document.body.onkeyup = keybindings_keyup;\n" - "document.body.onfocus = keybindings_focus;\n" % - json.dumps(self.keybindings)) if self.final_javascript_code: self.javascript(self.final_javascript_code) self.javascript("initialize_visibility_detection();") @@ -2703,15 +2694,13 @@ class html(HTMLGenerator, RequestHandler): self.context_buttons_open = False - def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=None, fkey=None, class_=None): + def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=None, class_=None): # TODO: REFACTOR id_ = id - self._context_button(title, url, icon=icon, hot=hot, id_=id_, bestof=bestof, hover_title=hover_title, fkey=fkey, class_=class_) - if fkey and self.keybindings_enabled: - self.add_keybinding([self.F1 + (fkey - 1)], "document.location='%s';" % self.escaper.escape_attribute(url)) + self._context_button(title, url, icon=icon, hot=hot, id_=id_, bestof=bestof, hover_title=hover_title, class_=class_) - def _context_button(self, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, fkey=None, class_=None): + def _context_button(self, title, url, icon=None, hot=False, id_=None, bestof=None, hover_title=None, class_=None): title = self.attrencode(title) display = "block" if bestof: @@ -2729,8 +2718,6 @@ class html(HTMLGenerator, RequestHandler): css_classes = [ "contextlink" ] if hot: css_classes.append("hot") - if fkey and self.keybindings_enabled: - css_classes.append("button") if class_: if type(class_) == list: css_classes += class_ @@ -2746,8 +2733,6 @@ class html(HTMLGenerator, RequestHandler): self.span(title) - if fkey and self.keybindings_enabled: - self.div("F%d" % fkey, class_="keysym") self.close_a() self.close_div() @@ -3019,23 +3004,6 @@ class html(HTMLGenerator, RequestHandler): # - # Keyboard control - # TODO: Can we move this specific feature to AQ? - # - - def add_keybinding(self, keylist, jscode): - self.keybindings.append([keylist, jscode]) - - - def add_keybindings(self, bindings): - self.keybindings += bindings - - - def disable_keybindings(self): - self.keybindings_enabled = False - - - # # FIXME: Legacy functions # diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4a52655..c18a388 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3047,68 +3047,6 @@ function sla_details_table_hover(tr, row_id, onoff) { } } - -//#. -//# .-Keybindings--------------------------------------------------------. -//# | _ __ _ _ _ _ | -//# | | |/ /___ _ _| |__ (_)_ __ __| (_)_ __ __ _ ___ | -//# | | ' // _ \ | | | '_ \| | '_ \ / _` | | '_ \ / _` / __| | -//# | | . \ __/ |_| | |_) | | | | | (_| | | | | | (_| \__ \ | -//# | |_|\_\___|\__, |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___/ | -//# | |___/ |___/ | -//# +--------------------------------------------------------------------+ -//# | | -//# '--------------------------------------------------------------------' - -// var keybindings will be defined dynamically by htmllib.py -var keybindings_pressedkeys = []; - -function keybindings_keydown(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - keybindings_pressedkeys.push(keyCode); - return keybindings_check(e); -} - -function keybindings_keyup(e) { - if (!e) e = window.event; - var keyCode = e.which || e.keyCode; - for (var i in keybindings_pressedkeys) { - if (keybindings_pressedkeys[i] == keyCode) { - keybindings_pressedkeys.splice(i, 1); - break; - } - } -} - -function keybindings_focus(e) { - keybindings_pressedkeys = []; -} - -function keybindings_check(e) { - for (var i in keybindings) { - var keylist = keybindings[i][0]; - if (keybindings_check_keylist(keylist)) { - if (e.stopPropagation) - e.stopPropagation(); - e.cancelBubble = true; - var jscode = keybindings[i][1]; - eval(jscode); - return false; - } - } - return true; -} - -function keybindings_check_keylist(keylist) -{ - for (var i in keylist) { - if (keybindings_pressedkeys.indexOf(keylist[i]) < 0) - return false; - } - return true; -} - //#. //# .-Popup Menu---------------------------------------------------------. //# | ____ __ __ |