Re-generate dist and docs

9sharp · Sep 24, 2014 · 05f3022 · 05f3022
1 parent e488e28
commit 05f3022
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 111 deletions.
diff --git a/dist/qrcoder.min.js b/dist/qrcoder.min.js
diff --git a/dist/qrcoder.min.map b/dist/qrcoder.min.map
diff --git 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
@@ -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;
-}
+}
diff --git a/docs/qrcoder.html b/docs/qrcoder.html
@@ -10,116 +10,28 @@
 <body>
   <div id="container">
     <div id="background"></div>
-
+    
     <ul class="sections">
-
+        
           <li id="title">
               <div class="annotation">
                   <h1>qrcoder.js</h1>
               </div>
           </li>
-
+
+
+
         <li id="section-1">
             <div class="annotation">
-
+              
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-
+              
             </div>
-
+            
             <div class="content"><div class='highlight'><pre><span class="hljs-comment">/*jslint node: true */</span>
 
-<<<<<<< HEAD
-<span class="hljs-keyword">var</span> qrcoder = <span class="hljs-built_in">module</span>.exports = {};</pre></div></div>
-
-        </li>
-
-        <li id="section-2">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-2">&#182;</a>
-              </div>
-              <p>ImageData ref: <a href="https://developer.mozilla.org/en-US/docs/Web/API/ImageData">https://developer.mozilla.org/en-US/docs/Web/API/ImageData</a></p>
-
-            </div>
-
-        </li>
-
-        <li id="section-3">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-3">&#182;</a>
-              </div>
-              <p>invert color. for development only.</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">invImage</span><span class="hljs-params">(imageData)</span> </span>{
-	<span class="hljs-keyword">var</span> data = imageData.data;
-	<span class="hljs-keyword">for</span> (<span class="hljs-keyword">var</span> i = <span class="hljs-number">0</span>; i &lt; data.length; i += <span class="hljs-number">4</span>) {</pre></div></div>
-
-        </li>
-
-        <li id="section-4">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-4">&#182;</a>
-              </div>
-              <p>red</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre>		data[i] = <span class="hljs-number">255</span> - data[i];</pre></div></div>
-
-        </li>
-
-        <li id="section-5">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-5">&#182;</a>
-              </div>
-              <p>green</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre>		data[i + <span class="hljs-number">1</span>] = <span class="hljs-number">255</span> - data[i + <span class="hljs-number">1</span>];</pre></div></div>
-
-        </li>
-
-        <li id="section-6">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-6">&#182;</a>
-              </div>
-              <p>blue</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre>		data[i + <span class="hljs-number">2</span>] = <span class="hljs-number">255</span> - data[i + <span class="hljs-number">2</span>];</pre></div></div>
-
-        </li>
-
-        <li id="section-7">
-            <div class="annotation">
-
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-7">&#182;</a>
-              </div>
-              <p>alpha
-No changes to alpha. Leave it here as document of imagedata.</p>
-
-            </div>
-
-            <div class="content"><div class='highlight'><pre>		data[i + <span class="hljs-number">3</span>] = data[i + <span class="hljs-number">3</span>];
-	}
-	<span class="hljs-keyword">return</span> imageData;
-=======
 <span class="hljs-keyword">var</span> qrcoder = {};
 <span class="hljs-keyword">var</span> isNodeMode = <span class="hljs-literal">false</span>;
 
@@ -130,7 +42,6 @@ <h1>qrcoder.js</h1>
 <span class="hljs-keyword">if</span> (isNodeMode === <span class="hljs-literal">true</span>) {
     qrcoder = <span class="hljs-built_in">module</span>.exports = {};
     <span class="hljs-keyword">var</span> qr = <span class="hljs-built_in">require</span>(<span class="hljs-string">'qr-js'</span>);
->>>>>>> Fake decode image for evaluation
 }
 
 <span class="hljs-comment">/**
@@ -177,9 +88,9 @@ <h1>qrcoder.js</h1>
             <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">var</span> imageStr = qrStr;
     <span class="hljs-keyword">return</span> imageStr;
 };</pre></div></div>
-
+            
         </li>
-
+        
     </ul>
   </div>
 </body>