luci-base: luci.js: make require() failures catcheable

Refactor L.require() to use L.raise() instead of L.error() to signal
class loading failures. This allows callers to handle class loading
errors in a graceful manner.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 6332790c77b726408f786b56f32a94b27570eef4..853bbfc05d5de5c2d954b3ece976e31b14d5300c 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -658,7 +658,7 @@
                        if (classes[name] != null) {
                                /* Circular dependency */
                                if (from.indexOf(name) != -1)
-                                       L.error('DependencyError',
+                                       L.raise('DependencyError',
                                                'Circular dependency: class "%s" depends on "%s"',
                                                name, from.join('" which depends on "'));
 
@@ -670,7 +670,7 @@
 
                        var compileClass = function(res) {
                                if (!res.ok)
-                                       L.error('NetworkError',
+                                       L.raise('NetworkError',
                                                'HTTP error %d while loading class file "%s"', res.status, url);
 
                                var source = res.text(),
@@ -721,7 +721,7 @@
                                                                .format(args, source, res.url));
                                        }
                                        catch (error) {
-                                               L.error('SyntaxError', '%s\n  in %s:%s',
+                                               L.raise('SyntaxError', '%s\n  in %s:%s',
                                                        error.message, res.url, error.lineNumber || '?');
                                        }
 
@@ -751,9 +751,7 @@
                        };
 
                        /* Request class file */
-                       classes[name] = Request.get(url, { cache: true })
-                               .then(compileClass)
-                               .catch(L.error);
+                       classes[name] = Request.get(url, { cache: true }).then(compileClass);
 
                        return classes[name];
                },