From 3376eb0f46a7b824112f23c01390fa4904bdbc92 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Thu, 10 Oct 2013 09:59:54 -0400
Subject: [PATCH] Make wait_for_requirejs more tolerant of errors

---
 common/djangoapps/terrain/ui_helpers.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 95c8c134fb..f973bcb4ac 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -133,12 +133,20 @@ def wait_for_requirejs(dependencies=None):
             world.wait(1)
             continue
         elif result not in (None, True, False):
-            # we got a require.js error
-            msg = "Error loading dependencies: type={0} modules={1}".format(
-                result['requireType'], result['requireModules'])
-            err = RequireJSError(msg)
-            err.error = result
-            raise err
+            # 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(
+                    result['requireType'], result['requireModules'])
+                err = RequireJSError(msg)
+                err.error = result
+                raise err
         else:
             return result