From c140d92b5f6b8586a1b14cfd1ed24614c99b2290 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Thu, 21 Mar 2019 20:02:26 +0000
Subject: [PATCH] Renamed ambiguous "self" variables to "context"

---
 .../galleryComponents/captureCard.vue                |  8 ++++----
 .../paneSettingsComponents/microscopeSettings.vue    |  5 ++---
 src/components/panelDisplay.vue                      | 12 ++++++------
 src/main.js                                          |  8 ++++----
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/paneDisplayComponents/galleryComponents/captureCard.vue b/src/components/paneDisplayComponents/galleryComponents/captureCard.vue
index 0c0f8943..ce3fc066 100644
--- a/src/components/paneDisplayComponents/galleryComponents/captureCard.vue
+++ b/src/components/paneDisplayComponents/galleryComponents/captureCard.vue
@@ -109,9 +109,9 @@ export default {
     },
 
     delCaptureConfirm: function(tag_string) {
-      var self = this;
+      var context = this
       UIkit.modal.confirm('Permanantly delete capture?').then(function() {
-        self.delCaptureRequest()
+        context.delCaptureRequest()
       }, function () {
         console.log('Rejected.')
       });
@@ -142,9 +142,9 @@ export default {
     },
 
     delTagConfirm: function(tag_string) {
-      var self = this;
+      var context = this;
       UIkit.modal.confirm(`Remove tag '${tag_string}'?`).then(function() {
-        self.delTagRequest(tag_string)
+        context.delTagRequest(tag_string)
       }, function () {
         console.log('Rejected.')
       });
diff --git a/src/components/paneSettingsComponents/microscopeSettings.vue b/src/components/paneSettingsComponents/microscopeSettings.vue
index 2004608e..76703568 100644
--- a/src/components/paneSettingsComponents/microscopeSettings.vue
+++ b/src/components/paneSettingsComponents/microscopeSettings.vue
@@ -73,11 +73,10 @@ export default {
     },
 
     recalibrateConfirm: function() {
-      self = this;
-
+      context = this
       this.modalConfirm('Start recalibration? This may take a while, and the microscope will be locked during this time.')
         .then(function() {
-          self.recalibrateRequest()
+          context.recalibrateRequest()
         }, function () {
           console.log('Rejected recalibration.')
         })
diff --git a/src/components/panelDisplay.vue b/src/components/panelDisplay.vue
index aa5b511f..14789957 100644
--- a/src/components/panelDisplay.vue
+++ b/src/components/panelDisplay.vue
@@ -29,22 +29,22 @@ export default {
 
   mounted() {
     // Attach methods to UIkit events for tab switching
-    var self=this;
+    var context = this;
     // Gallery tab
     UIkit.util.on('#galleryDisplayTab', 'shown', function(event, area) {
       console.log("Gallery tab entered")
-      if (self.$store.state.settings.trackWindow == true) {
-        self.$root.$emit('globalTogglePreview', false)
+      if (context.$store.state.settings.trackWindow == true) {
+        context.$root.$emit('globalTogglePreview', false)
       }
-      self.$root.$emit('globalUpdateCaptureList');
+      context.$root.$emit('globalUpdateCaptureList');
     });
 
     // Stream tab
     UIkit.util.on('#streamDisplayTab', 'shown', function(event, area) {
       console.log("Stream tab entered")
       UIkit.update()
-      if (self.$store.state.settings.trackWindow == true) {
-        self.$root.$emit('globalTogglePreview', true)
+      if (context.$store.state.settings.trackWindow == true) {
+        context.$root.$emit('globalTogglePreview', true)
       }
     });
 
diff --git a/src/main.js b/src/main.js
index d66b000b..03764017 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,10 +9,10 @@ Vue.config.productionTip = false
 Vue.mixin({
   methods: {
     modalConfirm: function(modalText) {
-      var self = this;
+      var context = this;
 
       // Stop GPU preview to show modal
-      self.$root.$emit('globalTogglePreview', false)
+      context.$root.$emit('globalTogglePreview', false)
   
       var showModal = function(resolve, reject) {
         UIkit.modal.confirm(modalText)
@@ -24,9 +24,9 @@ Vue.mixin({
         .finally(function() {
           // Reenable the GPU preview, if it was active before the modal
           console.log("Re-enabling GPU preview")
-          if (self.$store.state.settings.autoGpuPreview) {
+          if (context.$store.state.settings.autoGpuPreview) {
             console.log("Re-enabling preview")
-            self.$root.$emit('globalTogglePreview', true)
+            context.$root.$emit('globalTogglePreview', true)
           }
         })
       }