Bug fix on scanner#clear() (#84)

mebjas · Jul 18, 2020 · 665041b · 665041b
1 parent 100678c
commit 665041b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### Version 1.1.8
+ + Bug fix on `Html5QrcodeScanner#clear()`
+
 ### Version 1.1.7
  + `Html5QrcodeScanner#clear()` returns a `Promise`.
 

diff --git a/html5-qrcode.js b/html5-qrcode.js
@@ -945,13 +945,14 @@ class Html5QrcodeScanner {
             const mainContainer = document.getElementById(this.elementId);
             if (mainContainer) {
                 mainContainer.innerHTML = "";
+                this.__resetBasicLayout(mainContainer);
             }
         }
 
         if (this.html5Qrcode) {
             return new Promise((resolve, reject) => {
-                if (this.html5Qrcode._isScanning()) {
-                    this.html5Qrcode.stop().then(_ => {
+                if ($this.html5Qrcode._isScanning) {
+                    $this.html5Qrcode.stop().then(_ => {
                         $this.html5Qrcode.clear();
                         emptyHtmlContainer();
                         resolve();
@@ -989,7 +990,11 @@ class Html5QrcodeScanner {
         parent.appendChild(qrCodeDashboard);
 
         this.__setupInitialDashboard(qrCodeDashboard);
-    }
+	}
+
+	__resetBasicLayout(parent) {
+        parent.style.border = "none";
+	}
 
     __setupInitialDashboard(dashboard) {
         this.__createSection(dashboard);

diff --git a/minified/html5-qrcode.min.js b/minified/html5-qrcode.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html5-qrcode",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "a cross platform HTML5 QR Code scanner",
   "main": "html5-qrcode.js",
   "scripts": {

diff --git a/transpiled/html5-qrcode.js b/transpiled/html5-qrcode.js
@@ -1030,13 +1030,15 @@ var Html5QrcodeScanner = /*#__PURE__*/function () {
 
         if (mainContainer) {
           mainContainer.innerHTML = "";
+
+          _this4.__resetBasicLayout(mainContainer);
         }
       };
 
       if (this.html5Qrcode) {
         return new Promise(function (resolve, reject) {
-          if (_this4.html5Qrcode._isScanning()) {
-            _this4.html5Qrcode.stop().then(function (_) {
+          if ($this.html5Qrcode._isScanning) {
+            $this.html5Qrcode.stop().then(function (_) {
               $this.html5Qrcode.clear();
               emptyHtmlContainer();
               resolve();
@@ -1083,6 +1085,11 @@ var Html5QrcodeScanner = /*#__PURE__*/function () {
 
       this.__setupInitialDashboard(qrCodeDashboard);
     }
+  }, {
+    key: "__resetBasicLayout",
+    value: function __resetBasicLayout(parent) {
+      parent.style.border = "none";
+    }
   }, {
     key: "__setupInitialDashboard",
     value: function __setupInitialDashboard(dashboard) {