MOBILE-1554 prefetch: Fix bug in prefetch download error

Author: dpalou

www/addons/mod_book/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_book')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModBookPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModBook, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModBook, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_book')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModBookPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModBook, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModBook, module, size, true);
                     }
                 };
 

www/addons/mod_folder/services/handlers.js

@@ -73,7 +73,7 @@ angular.module('mm.addons.mod_folder')
 
                     // Check size and show confirmation if needed.
                     var size = $mmaModFolderPrefetchHandler.getDownloadSize(module);
-                    $mmCourseHelper.prefetchModule($mmaModFolder, module, size, false);
+                    $mmCourseHelper.prefetchModule($scope, $mmaModFolder, module, size, false);
                 }
 
                 downloadBtn = {

www/addons/mod_imscp/services/handlers.js

@@ -74,7 +74,7 @@ angular.module('mm.addons.mod_imscp')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModImscpPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModImscp, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModImscp, module, size, false);
                     }
                 };
 
@@ -86,7 +86,7 @@ angular.module('mm.addons.mod_imscp')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModImscpPrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModImscp, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModImscp, module, size, true);
                     }
                 };
 

www/addons/mod_page/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_page')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModPagePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModPage, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModPage, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_page')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModPagePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModPage, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModPage, module, size, true);
                     }
                 };
 

www/addons/mod_resource/services/handlers.js

@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_resource')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModResourcePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModResource, module, size, false);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModResource, module, size, false);
                     }
                 };
 
@@ -80,7 +80,7 @@ angular.module('mm.addons.mod_resource')
                         e.preventDefault();
                         e.stopPropagation();
                         var size = $mmaModResourcePrefetchHandler.getDownloadSize(module);
-                        $mmCourseHelper.prefetchModule($mmaModResource, module, size, true);
+                        $mmCourseHelper.prefetchModule($scope, $mmaModResource, module, size, true);
                     }
                 };
 

www/core/components/course/services/helper.js

@@ -314,13 +314,14 @@ angular.module('mm.core.course')
      * @module mm.core.course
      * @ngdoc method
      * @name $mmCourseHelper#prefetchModule
+     * @param  {Object} scope    Scope.
      * @param  {Object} service  Service implementing 'invalidateContent' and 'prefetchContent'.
      * @param  {Object} module   Module to download.
      * @param  {Number} size     Size of the module.
      * @param  {Boolean} refresh True if refreshing, false otherwise.
      * @return {Promise}         Promise resolved when downloaded.
      */
-    self.prefetchModule = function(service, module, size, refresh) {
+    self.prefetchModule = function(scope, service, module, size, refresh) {
         // Show confirmation if needed.
         return $mmUtil.confirmDownloadSize(size).then(function() {
             // Invalidate content if refreshing and download the data.
@@ -329,7 +330,7 @@ angular.module('mm.core.course')
                 // Ignore errors.
             }).then(function() {
                 return service.prefetchContent(module).catch(function() {
-                    if (!$scope.$$destroyed) {
+                    if (!scope.$$destroyed) {
                         $mmUtil.showErrorModal('mm.core.errordownloading', true);
                     }
                 });