From a53ca789ea50470f10faf6679345aeaaeec0466c Mon Sep 17 00:00:00 2001 From: Felipe Gasper Date: Mon, 16 Oct 2017 15:32:46 +0100 Subject: [PATCH] also exclude Terminado --- src/addons/zmodem/zmodem.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/addons/zmodem/zmodem.js b/src/addons/zmodem/zmodem.js index 603e98cc..95e56460 100644 --- a/src/addons/zmodem/zmodem.js +++ b/src/addons/zmodem/zmodem.js @@ -19,12 +19,10 @@ addon(window.Terminal); } })(function _zmodemAddon(Terminal) { - if (Terminal.prototype.attach) { - throw "The “zmodem” and “attach” addons are mutually incompatible."; - } - - function _makeSendWsWrapper(socket) { - return + for (let f of ["attach", "terminadoAttach"]) { + if (Terminal.prototype[f]) { + throw new Error(`The “zmodem” and “${f}” addons are mutually incompatible.`); + } } Object.assign(