Merge pull request #64 from simobasso/canvasid_default

fix angular-pdf: add default for canvasid
sayanee · Nov 18, 2015 · 6ecdcc3 · 6ecdcc3
2 parents ac147c4 + f86db3c
commit 6ecdcc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/dist/angular-pdf.js b/dist/angular-pdf.js
@@ -38,13 +38,8 @@
         var pdfDoc = null;
         var pageNum = (attrs.page ? attrs.page : 1);
         var scale = attrs.scale > 0 ? attrs.scale : 1;
-        var canvas;
-
-        if (attrs) {
-          canvas = document.getElementById(attrs.canvasid);
-        } else {
-          canvas = document.getElementById('pdf-canvas');
-        }
+        var canvasid = attrs.canvasid || 'pdf-canvas';
+        var canvas = document.getElementById(canvasid);
 
         var creds = attrs.usecredentials;
         var ctx = canvas.getContext('2d');

diff --git a/dist/angular-pdf.min.js b/dist/angular-pdf.min.js
diff --git a/example/js/directives/angular-pdf.js b/example/js/directives/angular-pdf.js
@@ -38,13 +38,8 @@
         var pdfDoc = null;
         var pageNum = (attrs.page ? attrs.page : 1);
         var scale = attrs.scale > 0 ? attrs.scale : 1;
-        var canvas;
-
-        if (attrs) {
-          canvas = document.getElementById(attrs.canvasid);
-        } else {
-          canvas = document.getElementById('pdf-canvas');
-        }
+        var canvasid = attrs.canvasid || 'pdf-canvas';
+        var canvas = document.getElementById(canvasid);
 
         var creds = attrs.usecredentials;
         var ctx = canvas.getContext('2d');