From 60b7a0c8b26ee8caff01bb6853600eb3c14c25cb Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 2 Feb 2018 09:02:07 -0500 Subject: [PATCH] double-esc to dismiss gcode editor --- js/kiri.js | 5 ++++- js/license.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/kiri.js b/js/kiri.js index ea13556b..0f6d155f 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -1920,7 +1920,10 @@ self.kiri.license = exports.LICENSE; } function showDialog(which, force) { - UC.hidePop(); + if (UC.isPopped()) { + UC.hidePop(); + return; + } ["catalog","devices","tools","settings"].forEach(function(dialog) { var style = UI[dialog].style; style.display = (dialog === which && (force || style.display !== 'flex') ? 'flex' : 'none'); diff --git a/js/license.js b/js/license.js index 88552bdc..752303db 100644 --- a/js/license.js +++ b/js/license.js @@ -1,7 +1,7 @@ var exports = { COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen - All Rights Reserved", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", - VERSION:"1.0.93" + VERSION:"1.0.94" }; if (!module) var module = {}; module.exports = exports;