Merge pull request #364 from frozeus/patch

Fix QrCode Size and upgrade QrCode lib.
2024-09-20 04:38:51 -04:00 · 2014-11-22 21:27:10 +01:00 · 2014-11-22 21:27:10 +01:00 · 7f641d6d0b
commit 7f641d6d0b
parent 4575e0679c ad27b21f65
3 changed files with 3 additions and 4 deletions
--- a/src/_h5ai/client/js/inc/ext/qrcode.js
+++ b/src/_h5ai/client/js/inc/ext/qrcode.js
@ -12,8 +12,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve

        $qrcode.empty().qrcode({
            render: modernizr.canvas ? 'canvas' : 'div',
-            width: settings.size,
-            height: settings.size,
+            size: settings.size,
            color: '#333',
            bgColor: '#fff',
            radius: 0.5,
--- a/src/_h5ai/client/js/lib/jquery.qrcode-0.10.1.min.js
+++ b/src/_h5ai/client/js/lib/jquery.qrcode-0.10.1.min.js
--- a/src/_h5ai/client/js/lib/jquery.qrcode-0.11.0.min.js
+++ b/src/_h5ai/client/js/lib/jquery.qrcode-0.11.0.min.js