Use base64 assets instead of one over github (#235)

mebjas · Jun 14, 2021 · 73d4922 · 73d4922
1 parent 9af2e1d
commit 73d4922
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### Version 2.0.10
+ - Migrate from assets hosted on Github to embedded base64 assets.
+
 ### Version 2.0.9
  - Added support for returning the type of code scanned (
      [feature request](https://github.com/mebjas/html5-qrcode/issues/224))

diff --git a/dist/html5-qrcode.min.js b/dist/html5-qrcode.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html5-qrcode",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "A cross platform HTML5 QR Code & bar code scanner",
   "main": "dist/html5-qrcode.min.js",
   "scripts": {

diff --git a/src/core.ts b/src/core.ts
@@ -82,16 +82,8 @@ export enum Html5QrcodeScanType {
  * Constants used in QR code library.
  */
 export class Html5QrcodeConstants {
-    static ASSET_FILE_SCAN: string
-        = "https://raw.githubusercontent.com/mebjas/html5-qrcode/master/assets"
-        + "/file-scan.gif";
-    static ASSET_CAMERA_SCAN: string
-        = "https://raw.githubusercontent.com/mebjas/html5-qrcode/master/assets"
-        + "/camera-scan.gif";
-
     static GITHUB_PROJECT_URL: string
         = "https://github.com/mebjas/html5-qrcode";
-
     static SCAN_DEFAULT_FPS = 2;
     static DEFAULT_DISABLE_FLIP = false;
 }

diff --git a/src/html5-qrcode-scanner.ts b/src/html5-qrcode-scanner.ts
@@ -16,7 +16,6 @@ import {
     Html5QrcodeResult,
     Html5QrcodeError,
     Html5QrcodeErrorFactory,
-    Html5QrcodeResultFactory,
     CameraDevice,
     BaseLoggger,
     Logger,
@@ -33,6 +32,11 @@ import {
     Html5QrcodeScannerStrings,
 } from "./strings";
 
+import {
+    ASSET_FILE_SCAN,
+    ASSET_CAMERA_SCAN
+} from "./image-assets";
+
 /**
  * Different states of QR Code Scanner.
  */
@@ -635,7 +639,7 @@ export class Html5QrcodeScanner {
         }
         this.cameraScanImage.width = 64;
         this.cameraScanImage.style.opacity = "0.3";
-        this.cameraScanImage.src = Html5QrcodeConstants.ASSET_CAMERA_SCAN;
+        this.cameraScanImage.src = ASSET_CAMERA_SCAN;
     }
 
     private insertFileScanImageToScanRegion() {
@@ -656,7 +660,7 @@ export class Html5QrcodeScanner {
         }
         this.fileScanImage.width = 64;
         this.fileScanImage.style.opacity = "0.3";
-        this.fileScanImage.src = Html5QrcodeConstants.ASSET_FILE_SCAN;
+        this.fileScanImage.src = ASSET_FILE_SCAN;
     }
 
     private clearScanRegion() {

diff --git a/src/image-assets.ts b/src/image-assets.ts