MOBILE-1966 glossary: Check original data before leaving edition

Author: crazyserver

www/addons/mod/glossary/controllers/edit.js

@@ -30,6 +30,7 @@ angular.module('mm.addons.mod_glossary')
         cmid = $stateParams.cmid,
         glossaryId = $stateParams.glossaryid,
         glossary = $stateParams.glossary || {},
+        originalData = null,
         entry = $stateParams.entry || false;
 
     $scope.entry = {
@@ -52,6 +53,12 @@ angular.module('mm.addons.mod_glossary')
     if (entry) {
         $scope.entry.concept = entry.concept || '';
         $scope.entry.text = entry.definition || '';
+
+        originalData = {};
+        originalData.text = $scope.entry.text;
+        originalData.concept = $scope.entry.concept;
+        originalData.files = [];
+
         if (entry.options) {
             $scope.options.categories = entry.options.categories || null;
             $scope.options.aliases = entry.options.aliases || "";
@@ -64,6 +71,7 @@ angular.module('mm.addons.mod_glossary')
         if (entry.attachments && entry.attachments.offline) {
             $mmaModGlossaryHelper.getStoredFiles(glossaryId, entry.concept).then(function(files) {
                 $scope.attachments = files;
+                originalData.files = angular.copy(files);
             });
         }
     }
@@ -93,7 +101,7 @@ angular.module('mm.addons.mod_glossary')
     function cancel() {
         var promise;
 
-        if (!$mmaModGlossaryHelper.hasEntryDataChanged($scope.entry, $scope.attachments)) {
+        if (!$mmaModGlossaryHelper.hasEntryDataChanged($scope.entry, $scope.attachments, originalData)) {
            promise = $q.when();
         } else {
             // Show confirmation if some data has been modified.

www/addons/mod/glossary/services/helper.js

@@ -38,8 +38,6 @@ angular.module('mm.addons.mod_glossary')
      * @return {Promise}            Promise resolved when deleted.
      */
     self.deleteStoredFiles = function(glossaryId, entryName, siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmaModGlossaryOffline.getEntryFolder(glossaryId, entryName, siteId).then(function(folderPath) {
             return $mmFS.removeDir(folderPath);
         });
@@ -57,8 +55,6 @@ angular.module('mm.addons.mod_glossary')
      * @return {Promise}            Promise resolved with the files.
      */
     self.getStoredFiles = function(glossaryId, entryName, siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmaModGlossaryOffline.getEntryFolder(glossaryId, entryName, siteId).then(function(folderPath) {
             return $mmFileUploaderHelper.getStoredFiles(folderPath);
         });
@@ -70,12 +66,22 @@ angular.module('mm.addons.mod_glossary')
      * @module mm.addons.mod_glossary
      * @ngdoc method
      * @name $mmaModGlossaryHelper#hasEntryDataChanged
-     * @param  {Object}  entry     Current data.
-     * @param  {Object}  files     Files attached.
+     * @param  {Object}  entry       Current data.
+     * @param  {Object}  files       Files attached.
+     * @param  {Object}  original    Original content.
      * @return {Boolean}           True if data has changed, false otherwise.
      */
-    self.hasEntryDataChanged = function(entry, files) {
-        return entry.text || entry.concept || files.length > 0;
+    self.hasEntryDataChanged = function(entry, files, original) {
+        if (!original || typeof original.concept == 'undefined') {
+            // There is no original data.
+            return entry.text || entry.concept || files.length > 0;
+        }
+
+        if (original.text != entry.text || original.concept != entry.concept) {
+            return true;
+        }
+
+        return $mmFileUploaderHelper.areFileListDifferent(files, original.files);
     };
 
     /**
@@ -92,8 +98,6 @@ angular.module('mm.addons.mod_glossary')
      * @return {Promise}            Promise resolved if success, rejected otherwise.
      */
     self.storeFiles = function(glossaryId, entryName, files, siteId) {
-        siteId = siteId || $mmSite.getId();
-
         // Get the folder where to store the files.
         return $mmaModGlossaryOffline.getEntryFolder(glossaryId, entryName, siteId).then(function(folderPath) {
             return $mmFileUploader.storeFilesToUpload(folderPath, files);