Merge pull request #4480 from 66eli77/0.15.x

fix for #4430
learningequality · Sep 24, 2015 · a3bf8db · a3bf8db
2 parents fd6076a + 8c9d2f0
commit a3bf8db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/kalite/updates/static/js/updates/bundle_modules/update_videos.js b/kalite/updates/static/js/updates/bundle_modules/update_videos.js
@@ -198,7 +198,7 @@ $(function() {
         // Do the request
         api.doRequest(window.Urls.start_video_download(), {youtube_ids: youtube_ids})
             .success(function() {
-                base.updatesStart("videodownload", 5000, video_callbacks);
+                base.updatesStart("videodownload", 2000, video_callbacks);
             })
             .fail(function(resp) {
                 $("#download-videos").removeAttr("disabled");

diff --git a/kalite/updates/static/js/updates/updates/base.js b/kalite/updates/static/js/updates/updates/base.js
@@ -226,7 +226,9 @@ function updatesReset(process_name) {
 
     // Do callbacks
     if (process_callbacks[process_name] && "reset" in process_callbacks[process_name]) {
-        process_callbacks[process_name]["reset"](progress_log);
+        if (typeof progress_log != 'undefined') {
+            process_callbacks[process_name]["reset"](progress_log);
+        }
     }
 
     // Clean up UI