]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commitdiff
projects / thirdparty / foundation / foundation-emails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c097e45)
Fixed extra wrapper classes being inserted. Cheerio counts each tag (open/close)...
authorJeanie Chung <jeanie.chung@gmail.com>
Wed, 28 Jan 2015 23:49:32 +0000 (15:49 -0800)
committerJeanie Chung <jeanie.chung@gmail.com>
Wed, 28 Jan 2015 23:49:32 +0000 (15:49 -0800)
html/index.html patch | blob | blame | history
html/sidebar-test.html [deleted file] patch | blob | blame | history
output/index.html patch | blob | blame | history
output/index.js patch | blob | blame | history
output/sidebar-test.html [deleted file] patch | blob | blame | history

diff --git a/html/index.html b/html/index.html
index ba8986a6a7cf03336139b011e71b891c2249f6f0..8f366a4209915eb2567ab2610ba437227c46ff27 100644 (file)
--- a/html/index.html
+++ b/html/index.html
@@ -14,7 +14,7 @@
       <td class="center" align="center" valign="top">
         <center>
           <container>
-            <row>asdfasdf</row>
+            <row>sdfasf</row>
             <row>
               <column class="teal" large='2'>
                 <p class="grey">I'm a p tag in a col</p>
diff --git a/html/sidebar-test.html b/html/sidebar-test.html
deleted file mode 100644 (file)
index c4b8eb2..0000000
--- a/html/sidebar-test.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <link rel="stylesheet" type="text/css" href="css/ink.css">
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript" src="js/inky-prime.js"></script>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="viewport" content="width=device-width"/>
-</head>
- 
-<body>
-  <table class="body">
-    <tr>
-      <td class="center" align="center" valign="top">
-        <center>
-        <container>
-          <row class="header">
-            
-              <column large='12'>
-                <img src="http://placehold.it/800x50">
-                <h1>SIDEBAR</h1>
-                <img src="http://placehold.it/800x50">
-              </column>
-            
-          </row>
-        </container>
-        <container>
-          <row>
-            <column large='8' small='12'>
-              <h2>Hello,<br> Han Fastolfe</h2>
-              <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</p>
-              <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
-              <panel>
-                <p>Phasellus dictum sapien a neque luctus cursus. Pellentesque sem dolor, fringilla et pharetra vitae. <a href="#">Click it! ยป</a></p>
-              </panel>
-            </column>
-            <column large='4' small='12'>
-              <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</p>
-              <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</p>
-              <button>
-                <a href='#'>Click Me!</a>
-              </button>
-            </column>
-            </row>
-            <row>
-              <column large='6'>
-                <panel>
-                  <h6>Header Thing</h6>
-                  <p>Subhead</p>
-                  <a href='#'>Link</a><br />
-                  <a href='#'>Link</a><br />
-                  <a href='#'>Link</a><br />
-                  <a href='#'>Link</a><br />
-                  <a href='#'>Link</a><br />
-                </panel>
-              </column>
-              <column large='6' small='12'>
-                <panel>
-                  <h6>Connect With Us</h6>
-                  <table class="tiny-button facebook">
-                    <tr>
-                      <td>
-                        <a href="#">Facebook</a>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <hr>
-
-                  <table class="tiny-button twitter">
-                    <tr>
-                      <td>
-                        <a href="#">Twitter</a>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <hr>
-
-                  <table class="tiny-button google-plus">
-                    <tr>
-                      <td>
-                        <a href="#">Google +</a>
-                      </td>
-                    </tr>
-                  </table>
-                  <br>
-                  <h6 style="margin-bottom:5px;">Contact Info:</h6>
-                  <p>Phone: <b>408.341.0600</b></p>
-                  <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                </panel>
-              </column>
-            </row>
-          </container>
-        </center>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
\ No newline at end of file
diff --git a/output/index.html b/output/index.html
index 04810b8ad3ea0e80443ee8588feb6379b899e3b0..1ef700ea850591b468274403b16bc3a4dd3221e9 100644 (file)
--- a/output/index.html
+++ b/output/index.html
@@ -15,10 +15,10 @@
         <center>
           <table class="container"><tbody><tr><td>
             <table class="row"><tbody><tr></tr></tbody></table>
-            <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper teal"><table class="columns grey large-2 "><tr><td>I&apos;m a p tag in a col</td><td class="expander"></td></tr></table><table class="columns  large-2 "><tr><td><table class="button "><tbody><tr><td>I&quot;M A BUTTON</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-2 "><tr><td class="panel ">panel</td><td class="expander"></td></tr></table></td><td class="wrapper "></td><td class="wrapper blue"><table class="columns  large-10 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-10 "><tr><td><table class="button "><tbody><tr><td>ANOTHER BOTON</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns grey large-10 "><tr><td class="panel grey">
-                <a href="#">asdlfkjadsf</a></td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
-            <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper teal"><table class="columns grey large-6 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td><table class="button "><tbody><tr><td>Lsdlkfjsdf</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td class="panel ">asdlfkjadsf</td><td class="expander"></td></tr></table></td><td class="wrapper "></td><td class="wrapper blue"><table class="columns  large-6 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td><table class="button "><tbody><tr><td>Lsdlkfjsdf</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td class="panel ">asdlfkjadsf</td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
-            <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper teal"><table class="columns  large-12 "><tr><td>I&apos;m a header!</td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
+            <table class="row"><tbody><tr><td class="wrapper teal"><table class="columns grey large-2 "><tr><td>I&apos;m a p tag in a col</td><td class="expander"></td></tr></table><table class="columns  large-2 "><tr><td><table class="button "><tbody><tr><td>I&quot;M A BUTTON</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-2 "><tr><td class="panel ">panel</td><td class="expander"></td></tr></table></td><td class="wrapper blue"><table class="columns  large-10 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-10 "><tr><td><table class="button "><tbody><tr><td>ANOTHER BOTON</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns grey large-10 "><tr><td class="panel grey">
+                <a href="#">asdlfkjadsf</a></td><td class="expander"></td></tr></table></td></tr></tbody></table>
+            <table class="row"><tbody><tr><td class="wrapper teal"><table class="columns grey large-6 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td><table class="button "><tbody><tr><td>Lsdlkfjsdf</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td class="panel ">asdlfkjadsf</td><td class="expander"></td></tr></table></td><td class="wrapper blue"><table class="columns  large-6 "><tr><td>I&apos;m even</td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td><table class="button "><tbody><tr><td>Lsdlkfjsdf</td></tr></tbody></table></td><td class="expander"></td></tr></table><table class="columns  large-6 "><tr><td class="panel ">asdlfkjadsf</td><td class="expander"></td></tr></table></td></tr></tbody></table>
+            <table class="row"><tbody><tr><td class="wrapper teal"><table class="columns  large-12 "><tr><td>I&apos;m a header!</td><td class="expander"></td></tr></table></td></tr></tbody></table>
           </td></tr></tbody></table>
         </center>
       </td>
diff --git a/output/index.js b/output/index.js
index 9dc1f46519620382e6c4dfa773d191b13787fc22..e3e8fc2b55fb8711af69fc479be5d9cb991f293b 100644 (file)
--- a/output/index.js
+++ b/output/index.js
@@ -65,8 +65,12 @@ module.exports = function (body) {
         return colHTML;
       };
 
-
       // create tables with wrapper class for each column
+        
+      // weird math thing to do with cheerio including closing tags and stuff
+      // so it throws off the number of objects being counted as elements
+      var colCount = Math.round((obj.length - 1 / 2));
+
       $(obj).each(function(k,v) {
         var wrapperHTML = '';
         var colSize     = '';
@@ -78,10 +82,13 @@ module.exports = function (body) {
         }
 
         // if wrapper is last or the only one, put last class
-        if (k === obj.length - 1) {
-          wrapperHTML += '<td class="wrapper ' + colClass + ' last">';
-        } else {
-          wrapperHTML += '<td class="wrapper ' + colClass + '">';
+
+        if (!obj[k].data) {
+          if (k === colCount) {
+            wrapperHTML += '<td class="wrapper ' + colClass + ' last">';
+          } else {
+            wrapperHTML += '<td class="wrapper ' + colClass + '">';
+          }
         }
 
         // check for sizes
@@ -119,7 +126,7 @@ module.exports = function (body) {
 
     });
 
-    file.contents = new Buffer($.html());
+    file.contents = new Buffer($.html({normalizeWhitespace: true}));
     this.emit('data', file);
   };
 
diff --git a/output/sidebar-test.html b/output/sidebar-test.html
deleted file mode 100644 (file)
index d98e723..0000000
--- a/output/sidebar-test.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <link rel="stylesheet" type="text/css" href="css/ink.css">
-  <script type="text/javascript" src="js/jquery.js"></script>
-  <script type="text/javascript" src="js/inky-prime.js"></script>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <meta name="viewport" content="width=device-width">
-</head>
- 
-<body>
-  <table class="body">
-    <tr>
-      <td class="center" align="center" valign="top">
-        <center>
-        <table class="container"><tbody><tr><td>
-          <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper "><table class="columns  large-12 "><tr><td></td><td class="expander"></td></tr></table><table class="columns  large-12 "><tr><td>SIDEBAR</td><td class="expander"></td></tr></table><table class="columns  large-12 "><tr><td></td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
-        </td></tr></tbody></table>
-        <table class="container"><tbody><tr><td>
-          <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper "><table class="columns  small-12 large-8 "><tr><td>Hello,<br> Han Fastolfe</td><td class="expander"></td></tr></table><table class="columns  small-12 large-8 "><tr><td>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</td><td class="expander"></td></tr></table><table class="columns  small-12 large-8 "><tr><td>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</td><td class="expander"></td></tr></table><table class="columns  small-12 large-8 "><tr><td class="panel ">
-                <p>Phasellus dictum sapien a neque luctus cursus. Pellentesque sem dolor, fringilla et pharetra vitae. <a href="#">Click it! &#xBB;</a></p>
-              </td><td class="expander"></td></tr></table></td><td class="wrapper "></td><td class="wrapper "><table class="columns  small-12 large-4 "><tr><td>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et.</td><td class="expander"></td></tr></table><table class="columns  small-12 large-4 "><tr><td>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et. Lorem ipsum dolor sit amet.</td><td class="expander"></td></tr></table><table class="columns  small-12 large-4 "><tr><td><table class="button "><tbody><tr><td>
-                <a href="#">Click Me!</a>
-              </td></tr></tbody></table></td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
-            <table class="row"><tbody><tr><td class="wrapper "></td><td class="wrapper "><table class="columns  large-6 "><tr><td class="panel ">
-                  <h6>Header Thing</h6>
-                  <p>Subhead</p>
-                  <a href="#">Link</a><br>
-                  <a href="#">Link</a><br>
-                  <a href="#">Link</a><br>
-                  <a href="#">Link</a><br>
-                  <a href="#">Link</a><br>
-                </td><td class="expander"></td></tr></table></td><td class="wrapper "></td><td class="wrapper "><table class="columns  small-12 large-6 "><tr><td class="panel ">
-                  <h6>Connect With Us</h6>
-                  <table class="tiny-button facebook">
-                    <tr>
-                      <td>
-                        <a href="#">Facebook</a>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <hr>
-
-                  <table class="tiny-button twitter">
-                    <tr>
-                      <td>
-                        <a href="#">Twitter</a>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <hr>
-
-                  <table class="tiny-button google-plus">
-                    <tr>
-                      <td>
-                        <a href="#">Google +</a>
-                      </td>
-                    </tr>
-                  </table>
-                  <br>
-                  <h6 style="margin-bottom:5px;">Contact Info:</h6>
-                  <p>Phone: <b>408.341.0600</b></p>
-                  <p>Email: <a href="mailto:hseldon@trantor.com">hseldon@trantor.com</a></p>
-                </td><td class="expander"></td></tr></table></td><td class="wrapper  last"></td></tr></tbody></table>
-          </td></tr></tbody></table>
-        </center>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
\ No newline at end of file
Mirror of https://github.com/foundation/foundation-emails.git