From 05f3022aa10f5722f17862f651121f6e3d8d857c Mon Sep 17 00:00:00 2001 From: Chenguang Zhang Date: Wed, 24 Sep 2014 12:02:42 +0800 Subject: [PATCH] Re-generate dist and docs --- dist/qrcoder.min.js | 7 +- dist/qrcoder.min.map | 6 +- docs/docco.css | 5 ++ docs/public/stylesheets/normalize.css | 3 +- docs/qrcoder.html | 109 +++----------------------- 5 files changed, 19 insertions(+), 111 deletions(-) diff --git a/dist/qrcoder.min.js b/dist/qrcoder.min.js index f0c9cf8..b4103c8 100644 --- a/dist/qrcoder.min.js +++ b/dist/qrcoder.min.js @@ -1,9 +1,4 @@ /*! qrcoder v0.1.0 | (c) 2014| MIT License */ -<<<<<<< HEAD -function invImage(a){for(var b=a.data,c=0;c>>>>>> Fake decode image for evaluation +//# sourceMappingURL=qrcoder.min.map \ No newline at end of file diff --git a/dist/qrcoder.min.map b/dist/qrcoder.min.map index 4eecf83..0258d63 100644 --- a/dist/qrcoder.min.map +++ b/dist/qrcoder.min.map @@ -1,5 +1 @@ -<<<<<<< HEAD -{"version":3,"file":"qrcoder.min.js","sources":["../src/qrcoder.js"],"names":["invImage","imageData","data","i","length","qrcoder","module","exports","encodeQR","decodeQR"],"mappings":";;AAOA,QAASA,UAASC,GAEjB,IAAK,GADDC,GAAOD,EAAUC,KACZC,EAAI,EAAGA,EAAID,EAAKE,OAAQD,GAAK,EAErCD,EAAKC,GAAK,IAAMD,EAAKC,GAErBD,EAAKC,EAAI,GAAK,IAAMD,EAAKC,EAAI,GAE7BD,EAAKC,EAAI,GAAK,IAAMD,EAAKC,EAAI,GAG7BD,EAAKC,EAAI,GAAKD,EAAKC,EAAI,EAExB,OAAOF,GAlBR,GAAII,SAAUC,OAAOC,UA4BrBF,SAAQG,SAAW,SAASP,GAC3B,MAAOD,UAASC,IAUjBI,QAAQI,SAAW,SAASR,GAC3B,MAAOD,UAASC"} -======= -{"version":3,"file":"qrcoder.min.js","sources":["../src/qrcoder.js"],"names":["qrcoder","isNodeMode","module","exports","qr","require","encodeQR","imageStr","qrStr","image","size","level","value","src","decodeQR"],"mappings":";;AAEA,GAAIA,YACAC,YAAa,CAMjB,IAJsB,mBAAXC,UACPD,YAAa,GAGbA,cAAe,EAAM,CACrBD,QAAUE,OAAOC,UACjB,IAAIC,IAAKC,QAAQ,SAWrBL,QAAQM,SAAW,SAASC,GACxB,GAAIC,GAAQJ,GAAGK,OACXC,KAAM,EACNC,MAAO,IACPC,MAAOL,IACRM,GACH,OAAOL,IAWXR,QAAQc,SAAW,SAASN,GAGxB,GAAID,GAAWC,CACf,OAAOD"} ->>>>>>> Fake decode image for evaluation +{"version":3,"file":"qrcoder.min.js","sources":["../src/qrcoder.js"],"names":["qrcoder","isNodeMode","module","exports","qr","require","encodeQR","imageStr","qrStr","image","size","level","value","src","decodeQR"],"mappings":";;AAEA,GAAIA,YACAC,YAAa,CAMjB,IAJsB,mBAAXC,UACPD,YAAa,GAGbA,cAAe,EAAM,CACrBD,QAAUE,OAAOC,UACjB,IAAIC,IAAKC,QAAQ,SAWrBL,QAAQM,SAAW,SAASC,GACxB,GAAIC,GAAQJ,GAAGK,OACXC,KAAM,EACNC,MAAO,IACPC,MAAOL,IACRM,GACH,OAAOL,IAWXR,QAAQc,SAAW,SAASN,GAGxB,GAAID,GAAWC,CACf,OAAOD"} \ No newline at end of file diff --git a/docs/docco.css b/docs/docco.css index 5e6909e..a2899ac 100644 --- a/docs/docco.css +++ b/docs/docco.css @@ -104,6 +104,7 @@ pre, tt, code { background: transparent; } + blockquote { border-left: 5px solid #ccc; margin: 0; @@ -137,6 +138,7 @@ ul.sections > li > div { box-sizing: border-box; /* css3 */ } + /*---------------------- Jump Page -----------------------------*/ #jump_to, #jump_page { margin: 0; @@ -249,6 +251,7 @@ ul.sections > li > div { margin: 0 0 15px; } + #jump_to { padding: 5px 10px; } @@ -269,6 +272,8 @@ ul.sections > li > div { display: none; } + + #background { position: absolute; top: 0; bottom: 0; diff --git a/docs/public/stylesheets/normalize.css b/docs/public/stylesheets/normalize.css index 3e77d9d..73abb76 100644 --- a/docs/public/stylesheets/normalize.css +++ b/docs/public/stylesheets/normalize.css @@ -142,6 +142,7 @@ mark { color: #000; } + /* * Corrects font family set oddly in Safari 5 and Chrome. */ @@ -371,4 +372,4 @@ textarea { table { border-collapse: collapse; border-spacing: 0; -} +} \ No newline at end of file diff --git a/docs/qrcoder.html b/docs/qrcoder.html index 0e18f69..86f9fe2 100644 --- a/docs/qrcoder.html +++ b/docs/qrcoder.html @@ -10,116 +10,28 @@
- +
    - +

  • qrcoder.js

    • - + + +
  • - +
    - +
    - + 
    /*jslint node: true */
 
-<<<<<<< HEAD
-var qrcoder = module.exports = {};
    - -
    • - -
  • -
    - -
    - -
    -

    ImageData ref: https://developer.mozilla.org/en-US/docs/Web/API/ImageData

    - -
    - -
    • - -
  • -
    - -
    - -
    -

    invert color. for development only.

    - -
    - - 
    function invImage(imageData) {
-	var data = imageData.data;
-	for (var i = 0; i < data.length; i += 4) {
    - -
    • - -
  • -
    - -
    - -
    -

    red

    - -
    - - 
    		data[i] = 255 - data[i];
    - -
    • - -
  • -
    - -
    - -
    -

    green

    - -
    - - 
    		data[i + 1] = 255 - data[i + 1];
    - -
    • - -
  • -
    - -
    - -
    -

    blue

    - -
    - - 
    		data[i + 2] = 255 - data[i + 2];
    - -
    • - -
  • -
    - -
    - -
    -

    alpha -No changes to alpha. Leave it here as document of imagedata.

    - -
    - - 
    		data[i + 3] = data[i + 3];
-	}
-	return imageData;
-=======
 var qrcoder = {};
 var isNodeMode = false;
 
@@ -130,7 +42,6 @@ 
    qrcoder.js
    
 if (isNodeMode === true) {
     qrcoder = module.exports = {};
     var qr = require('qr-js');
->>>>>>> Fake decode image for evaluation
 }
 
 /**
@@ -177,9 +88,9 @@ 
    qrcoder.js
    
             
        var imageStr = qrStr;
     return imageStr;
 };
    
-
+
    • - +