attempt to refactor.

kazuhikoarase · Feb 15, 2019 · 633a0d3 · 633a0d3
1 parent 086252a
commit 633a0d3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/js/README.md b/js/README.md
@@ -82,6 +82,15 @@ Helper functions for HTML.
 | margin   | <code>number</code> | default: cellSize * 4 |
 | alt      | <code>string</code> | (optional)            |
 
+#### createSvgTag(opts) => <code>string</code>
+
+| Param         | Type                 | Description           |
+| ------------- | -------------------- | --------------------- |
+| opts          | <code>object</code>  | default: {}           |
+| opts.cellSize | <code>number</code>  | default: 2            |
+| opts.margin   | <code>number</code>  | default: cellSize * 4 |
+| opts.scalable | <code>boolean</code> | default: false        |
+
 #### renderTo2dContext(context, cellSize) => <code>void</code>
 
 --

diff --git a/js/qrcode.d.ts b/js/qrcode.d.ts
@@ -41,7 +41,9 @@ interface QRCode {
   getModuleCount() : number;
   isDark(row: number, col: number) : boolean;
   createImgTag(cellSize?: number, margin?: number) : string;
-  createSvgTag(cellSize?: number, margin?: number, displaySize?: any) : string;
+  createSvgTag(cellSize?: number, margin?: number) : string;
+  createSvgTag(opts? : { cellSize?: number, margin?: number,
+      scalable?: boolean }) : string;
   createDataURL(cellSize?: number, margin?: number) : string;
   createTableTag(cellSize?: number, margin?: number) : string;
   createASCII(cellSize?: number, margin?: number) : string;

diff --git a/js/qrcode.js b/js/qrcode.js
@@ -492,7 +492,16 @@ var qrcode = function() {
       return qrHtml;
     };
 
-    _this.createSvgTag = function(cellSize, margin, displaySize) {
+    _this.createSvgTag = function(cellSize, margin) {
+
+      var opts = {};
+      if (typeof arguments[0] == 'object') {
+        // Called by options.
+        opts = arguments[0];
+        // overwrite cellSize and margin.
+        cellSize = opts.cellSize;
+        margin = opts.margin;
+      }
 
       cellSize = cellSize || 2;
       margin = (typeof margin == 'undefined')? cellSize * 4 : margin;
@@ -502,10 +511,8 @@ var qrcode = function() {
       rect = 'l' + cellSize + ',0 0,' + cellSize +
         ' -' + cellSize + ',0 0,-' + cellSize + 'z ';
 
-      displaySize = (typeof displaySize == 'undefined') ? size : (typeof displaySize == "number") ? displaySize : -1;
-
       qrSvg += '<svg version="1.1" xmlns="http://www.w3.org/2000/svg"';
-      qrSvg += displaySize > 0 ? ' width="' + displaySize + 'px" height="' + displaySize + 'px"' : '';
+      qrSvg += !opts.scalable ? ' width="' + size + 'px" height="' + size + 'px"' : '';
       qrSvg += ' viewBox="0 0 ' + size + ' ' + size + '" ';
       qrSvg += ' preserveAspectRatio="xMinYMin meet">';
       qrSvg += '<rect width="100%" height="100%" fill="white" cx="0" cy="0"/>';