Commit 3376eb0f by Will Daly

Make wait_for_requirejs more tolerant of errors

parent 9dba84fe
...@@ -133,7 +133,15 @@ def wait_for_requirejs(dependencies=None): ...@@ -133,7 +133,15 @@ def wait_for_requirejs(dependencies=None):
world.wait(1) world.wait(1)
continue continue
elif result not in (None, True, False): elif result not in (None, True, False):
# we got a require.js error # We got a require.js error
# Sometimes requireJS will throw an error with requireType=require
# This doesn't seem to cause problems on the page, so we ignore it
if result['requireType'] == 'require':
world.wait(1)
continue
# Otherwise, fail and report the error
else:
msg = "Error loading dependencies: type={0} modules={1}".format( msg = "Error loading dependencies: type={0} modules={1}".format(
result['requireType'], result['requireModules']) result['requireType'], result['requireModules'])
err = RequireJSError(msg) err = RequireJSError(msg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment