diff options
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/luci.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js index 07e8d8c887..c71865f96f 100644 --- a/modules/luci-base/htdocs/luci-static/resources/luci.js +++ b/modules/luci-base/htdocs/luci-static/resources/luci.js @@ -488,12 +488,22 @@ } /* Append shortened & beautified stacktrace to message */ - e.message += '\n' + stack.join('\n') + var trace = stack.join('\n') .replace(/(.*?)@(.+):(\d+):(\d+)/g, ' at $1 ($2:$3:$4)'); + if (e.message.indexOf(trace) == -1) + e.message += '\n' + trace; + if (window.console && console.debug) console.debug(e); + if (this.ui) + this.ui.showModal(_('Runtime error'), + E('pre', { 'class': 'alert-message error' }, e)); + else + L.dom.content(document.querySelector('#maincontent'), + E('pre', { 'class': 'alert-message error' }, e)); + throw e; }, @@ -610,7 +620,7 @@ }, _('To login…'))) ]); - L.error('AuthenticationError', 'Session expired'); + throw 'Session expired'; }); originalCBIInit(); |