Skip to content

Commit 9d12141

Browse files
committed
Merge pull request janantala#27 from janantala/canary
fix: render img element
2 parents 9edbc59 + c50760b commit 9d12141

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ <h3>Usage:</h3>
203203
</p>
204204

205205
<p>
206-
<qr text="qrcodeString" type-number="typeNumber" correction-level="correctionLevel" size="size" input-mode="inputMode" image="true"></qr>
206+
<qr text="qrcodeString" type-number="typeNumber" correction-level="correctionLevel" size="size" input-mode="inputMode" image="image"></qr>
207207
</p>
208208

209209
<p>
@@ -277,7 +277,7 @@ <h3>Optional attributes:</h3>
277277

278278
</div>
279279

280-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.13/angular.min.js"></script>
280+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.14/angular.min.js"></script>
281281
<script src="../lib/qrcode.js"></script>
282282
<script src="../src/angular-qr.js"></script>
283283

src/angular-qr.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
return {
7979
restrict: 'E',
80-
template: '<canvas ng-hide="image"></canvas><image ng-if="image" ng-src="{{canvasImage}}"/>',
80+
template: '<canvas ng-hide="image"></canvas><img ng-if="image" ng-src="{{canvasImage}}"/>',
8181
scope: {
8282
typeNumber: '=',
8383
correctionLevel: '=',
@@ -101,7 +101,7 @@
101101
scope.CORRECTION = scope.getCorrection();
102102
scope.SIZE = scope.getSize();
103103
scope.INPUT_MODE = scope.getInputMode(scope.TEXT);
104-
scope.canvasImage = 'http://lorempixel.com/500/500/';
104+
scope.canvasImage = '';
105105

106106
var draw = function(context, qr, modules, tile){
107107
for (var row = 0; row < modules; row++) {
@@ -130,7 +130,7 @@
130130

131131
if (canvas2D) {
132132
draw(context, qr, modules, tile);
133-
scope.canvasImage = canvas.toDataURL();
133+
scope.canvasImage = canvas.toDataURL() || '';
134134
}
135135
};
136136

0 commit comments

Comments
 (0)