X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Fstatic%2Fmctx.gui.js;h=319805560906450b472252462fff3c9f41dd7fe0;hb=fc0dc3b827eeff91373db42a78a098200cbf8fa6;hp=48737b5932395324837ddd2413c9a377cce4e815;hpb=7d87636877a19411594b6662aa8f05c77d70dc04;p=matches%2FMCTX3420.git diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js index 48737b5..3198055 100644 --- a/testing/MCTXWeb/public_html/static/mctx.gui.js +++ b/testing/MCTXWeb/public_html/static/mctx.gui.js @@ -71,7 +71,14 @@ function debugLog () { alert(arguments[i]); } } else { - console.log.apply(this, arguments); + try { + console.log.apply(this, arguments); + } catch (e) { + //Chromie + for (var i = 0; i < arguments.length; i++) { + console.log(arguments[i]); + } + } } } } @@ -265,11 +272,16 @@ $.fn.setErrorLog = function () { var url = mctx.api + "errorlog"; var outdiv = this; + if ($(this).length <= 0) { + //No error log, so do nothing. + return; + } + var updater = function () { $.ajax({url : url}).done(function (data) { outdiv.text(data); outdiv.scrollTop( - outdiv[0].scrollHeight - outdiv.height() + outdiv[0].scrollHeight - outdiv.height() ); setTimeout(updater, 3000); }).fail(function (jqXHR) {