diff --git a/cms/static/coffee/src/main.coffee b/cms/static/coffee/src/main.coffee index 083a005c71..efcd869113 100644 --- a/cms/static/coffee/src/main.coffee +++ b/cms/static/coffee/src/main.coffee @@ -16,6 +16,8 @@ $ -> dataType: 'json' $(document).ajaxError (event, jqXHR, ajaxSettings, thrownError) -> + if ajaxSettings.notifyOnError is false + return msg = new CMS.Models.ErrorMessage( "title": gettext("Studio's having trouble saving your work") "message": jqXHR.responseText || gettext("This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.") diff --git a/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee b/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee index e840cd2a77..bf3ec1e102 100644 --- a/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee +++ b/common/lib/xmodule/xmodule/js/src/video/display/video_caption.coffee @@ -27,16 +27,19 @@ class @VideoCaption extends Subview @fetchCaption() fetchCaption: -> - $.getWithPrefix @captionURL(), (captions) => - @captions = captions.text - @start = captions.start + $.ajaxWithPrefix + url: @captionURL() + notifyOnError: false + success: (captions) => + @captions = captions.text + @start = captions.start - @loaded = true + @loaded = true - if onTouchBasedDevice() - $('.subtitles li').html "Caption will be displayed when you start playing the video." - else - @renderCaption() + if onTouchBasedDevice() + $('.subtitles li').html "Caption will be displayed when you start playing the video." + else + @renderCaption() renderCaption: -> container = $('