From c037b07693e21d140509c2f959a5d0ab2d67e589 Mon Sep 17 00:00:00 2001
From: juliandescottes <julian.descottes@gmail.com>
Date: Wed, 2 Aug 2017 00:14:51 +0200
Subject: [PATCH] rename mergeData to backupsData in browse backups wizard

---
 src/js/controller/dialogs/backups/BrowseBackups.js        | 4 ++--
 src/js/controller/dialogs/backups/steps/SelectSession.js  | 2 +-
 src/js/controller/dialogs/backups/steps/SessionDetails.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/controller/dialogs/backups/BrowseBackups.js b/src/js/controller/dialogs/backups/BrowseBackups.js
index dbc76d07..daf83f2e 100644
--- a/src/js/controller/dialogs/backups/BrowseBackups.js
+++ b/src/js/controller/dialogs/backups/BrowseBackups.js
@@ -15,9 +15,9 @@
   ns.BrowseBackups = function (piskelController, args) {
     this.piskelController = piskelController;
 
-    // Merge data object used by steps to communicate and share their
+    // Backups data object used by steps to communicate and share their
     // results.
-    this.mergeData = {
+    this.backupsData = {
       sessions: [],
       selectedSession : null
     };
diff --git a/src/js/controller/dialogs/backups/steps/SelectSession.js b/src/js/controller/dialogs/backups/steps/SelectSession.js
index 2c3f3c0f..0e905c7b 100644
--- a/src/js/controller/dialogs/backups/steps/SelectSession.js
+++ b/src/js/controller/dialogs/backups/steps/SelectSession.js
@@ -74,7 +74,7 @@
 
     var action = evt.target.dataset.action;
     if (action == 'view') {
-      this.backupsController.mergeData.selectedSession = sessionId;
+      this.backupsController.backupsData.selectedSession = sessionId;
       this.backupsController.next();
     } else if (action == 'delete') {
       if (window.confirm('Are you sure you want to delete this session?')) {
diff --git a/src/js/controller/dialogs/backups/steps/SessionDetails.js b/src/js/controller/dialogs/backups/steps/SessionDetails.js
index e0857c7b..5c73ec31 100644
--- a/src/js/controller/dialogs/backups/steps/SessionDetails.js
+++ b/src/js/controller/dialogs/backups/steps/SessionDetails.js
@@ -22,7 +22,7 @@
   };
 
   ns.SessionDetails.prototype.onShow = function () {
-    var sessionId = this.backupsController.mergeData.selectedSession;
+    var sessionId = this.backupsController.backupsData.selectedSession;
     pskl.app.backupService.getSnapshotsBySessionId(sessionId).then(function (snapshots) {
       var html = '';
       if (snapshots.length === 0) {