Merge pull request #8408 from edx/release

Release
2015-06-08 11:00:20 -05:00
parent a02b242e5e f91764abbe
commit d0f7a08cc4
1 changed files with 3 additions and 6 deletions
--- a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
+++ b/common/lib/xmodule/xmodule/js/src/video/01_initialize.js
@@ -522,12 +522,9 @@ function (VideoPlayer, i18n) {

            this.youtubeXhr
                .always(function (json, status) {
-                    var err = $.isPlainObject(json.error) ||
-                                (
-                                    status !== 'success' &&
-                                    status !== 'notmodified'
-                                );
-                    if (err) {
+                    // It will work for both if statusCode is 200 or 410.
+                    var didSucceed = (json.error && json.error.code === 410) || status === 'success' || status === 'notmodified';
+                    if (!didSucceed) {
                        console.log(
                            '[Video info]: YouTube returned an error for ' +
                            'video with id "' + id + '".'