Changeset 35805 for main/trunk/model-interfaces-dev

Timestamp:

2021-12-13T13:36:30+13:00 (2 years ago)

Author:

cstephen

Message:

Use arrow function shorthand to capture scope, removing need for const that = this

Location:

main/trunk/model-interfaces-dev/atea/ocr/src/components

Files:

• EditPage.vue (modified) (3 diffs)
• MainPage.vue (modified) (5 diffs)
• ModalDialog.vue (modified) (2 diffs)
• OcrImageDisplay.vue (modified) (4 diffs)
• Snackbar.vue (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/ocr/src/components/EditPage.vue

@@ -213 +213 @@
             }
 
-            const that = this;
-
             ModalController.open(
                 this.translations.get("DiscardEditsModal_Title"),
@@ -222 +220 @@
                     this.translations.get("DiscardEditsModal_ButtonCancel")
                 ],
-                async function(buttonName) {
-                    if (buttonName === that.translations.get("DiscardEditsModal_ButtonContinue")) {
-                        that.closeAndDiscard(true);
+                (buttonName) => {
+                    if (buttonName === this.translations.get("DiscardEditsModal_ButtonContinue")) {
+                        this.closeAndDiscard(true);
                     }
                 }
@@ -233 +231 @@
 
             const buffer = Buffer.from(this.imageBuffer);
-            const that = this;
 
             const modifiedBuffer = await Jimp.read(buffer)
                 .then(async image => {
-                    if (that.invert) {
+                    if (this.invert) {
                         image.invert();
                     }
 
-                    if (that.rotation !== 0) {
-                        image.rotate(-that.rotation);
+                    if (this.rotation !== 0) {
+                        image.rotate(-this.rotation);
                     }
 

main/trunk/model-interfaces-dev/atea/ocr/src/components/MainPage.vue

@@ -79 +79 @@
                 }
 
-                const that = this;
                 this.ocrInProgress = true;
-                const longTimeout = setTimeout(function() {
-                    SnackController.addSnack(that.translations.get("MainPage_DelayedOcrMessage"), 8000);
-                }, 10000);
+
+                const longTimeout = setTimeout(() => {
+                    SnackController.addSnack(this.translations.get("MainPage_DelayedOcrMessage"), 8000);
+                }, 10000)
 
                 const arrayView = new Uint8Array(this.imageBuffer);
@@ -118 +118 @@
         },
         confirmOcr() {
-            const that = this;
-
             ModalController.open(
                 this.translations.get("OCREditedModal_Title"),
@@ -127 +125 @@
                     this.translations.get("OCREditedModal_ButtonCancel")
                 ],
-                async function(buttonName) {
-                    if (buttonName === that.translations.get("OCREditedModal_ButtonContinue")) {
-                        that.ocrTextEdited = false;
-                        await that.doOcr();
+                async (buttonName) => {
+                    if (buttonName === this.translations.get("OCREditedModal_ButtonContinue")) {
+                        this.ocrTextEdited = false;
+                        await this.doOcr();
                     }
                 }
@@ -153 +151 @@
         reset(hard) {
             if (!hard) {
-                const that = this;
-
                 ModalController.open(
                     this.translations.get("NewImageModal_Title"),
@@ -162 +158 @@
                         this.translations.get("NewImageModal_ButtonCancel")
                     ],
-                    function(buttonName) {
-                        if (buttonName === that.translations.get("NewImageModal_ButtonContinue")) {
-                            that.reset(true);
+                    (buttonName) => {
+                        if (buttonName === this.translations.get("NewImageModal_ButtonContinue")) {
+                            this.reset(true);
                         }
                     }

main/trunk/model-interfaces-dev/atea/ocr/src/components/ModalDialog.vue

@@ -109 +109 @@
         this.waitingOnClose = true;
         const item = this.queue.shift();
-        const that = this;
 
         this.modal.show(
@@ -115 +114 @@
             item.description,
             item.buttons,
-            function(buttonName, id) {
-                that.waitingOnClose = false;
-                that.showModals();
+            (buttonName, id) => {
+                this.waitingOnClose = false;
+                this.showModals();
                 item.callback(buttonName, id);
             },

main/trunk/model-interfaces-dev/atea/ocr/src/components/OcrImageDisplay.vue

@@ -53 +53 @@
             e.preventDefault();
 
-            const that = this;
             /** @type {DOMRect} */
-            const magContainerBounds = that.$refs.magContainer.getBoundingClientRect();
+            const magContainerBounds = this.$refs.magContainer.getBoundingClientRect();
             /** @type {HTMLDivElement} */
             const magnifier = this.$refs.magnifier;
@@ -124 +123 @@
     watch: {
         imageUrl() {
-            const that = this;
-            setTimeout(function() {
-                that.updateMagnifier(that.$refs.ocrImage);
+            setTimeout(() => {
+                this.updateMagnifier(this.$refs.ocrImage);
             }, 100);
         },
@@ -134 +132 @@
             }
 
-            const that = this;
-            setTimeout(function() {
-                that.updateMagnifier(that.$refs.thresholdedImage);
+            setTimeout(() => {
+                this.updateMagnifier(this.$refs.thresholdedImage);
             }, 100);
         },
         showThresholdedImage(newValue) {
-            const that = this;
-            setTimeout(function() {
+            setTimeout(() => {
                 if (newValue) {
-                    that.updateMagnifier(that.$refs.thresholdedImage);
+                    this.updateMagnifier(this.$refs.thresholdedImage);
                 }
                 else {
-                    that.updateMagnifier(that.$refs.ocrImage);
+                    this.updateMagnifier(this.$refs.ocrImage);
                 }
             }, 100);
@@ -160 +156 @@
     },
     mounted() {
-        const that = this;
-        setTimeout(function() {
-            that.updateMagnifier(that.$refs.ocrImage);
+        setTimeout(() => {
+            this.updateMagnifier(this.$refs.ocrImage);
         }, 100);
     }

main/trunk/model-interfaces-dev/atea/ocr/src/components/Snackbar.vue

@@ -40 +40 @@
         setContent(content, timeout = 3000) {
             this.content = content;
-            const that = this;
 
-            setTimeout(function() {
-                that.content = null;
+            setTimeout(() => {
+                this.content = null;
             }, timeout);
         }