* testing if qr-canvas is not null before calling decode function to …

…prevent errors in the browser logs, incrementing version number
dev-mansonthomas · Mar 19, 2018 · 46c072b · 46c072b
1 parent 135129c
commit 46c072b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "angular-qr-scanner-updated",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-uglify": "~0.9.1",
     "grunt-contrib-watch": "~0.6.1"
   },
   "dependencies": {
-    "angular": "~1.6.6",
+    "angular": "~1.6.8",
     "jsqrcode": "0.0.6"
   },
   "main": "qr-scanner-u.js"

diff --git a/qr-scanner-u.js b/qr-scanner-u.js
@@ -42,14 +42,17 @@ angular.module('qrScannerU', ["ng"]).directive('qrScannerU', ['$interval', '$win
           context.drawImage(video, 0, 0, 307,250);
           try
           {
-            qrcode.decode();
+            if(document.getElementById("qr-canvas")!=null)
+            {
+              qrcode.decode();
+            }
           }
           catch(e)
           {
             scope.ngError({error: e});
           }
         }
-      }
+      };
 
       var successCallback = function(stream)
       {
@@ -59,7 +62,7 @@ angular.module('qrScannerU', ["ng"]).directive('qrScannerU', ['$interval', '$win
         scope.video = video;
         video.play();
         stopScan = $interval(scan, 500);
-      }
+      };
 
       // Call the getUserMedia method with our callback functions
       if (navigator.getUserMedia)