From 3fc629f790a44bba0b47958957fb132660e9383f Mon Sep 17 00:00:00 2001
From: Joshua Smith <joshua-smith@verizon.net>
Date: Tue, 28 May 2013 14:56:02 -0400
Subject: [PATCH] Fix 68

---
 index.html     | 40 ++++++++++++++++++++++++++++++----------
 js/firetext.js | 21 +++++++++++++--------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index c83beeb..016b784 100755
--- a/index.html
+++ b/index.html
@@ -248,42 +248,62 @@ <h1><span id="currentFileName"></span><span id="currentFileType"></span></h1>
   <section role="dialog" id="format" class="skin-organic">
     <header>
       <button data-click="navBack"><span class="icon icon-close">close</span></button>
-      <h1>Format</h1>
+      <h1>Tools</h1>
     </header>
     <div role="main" class="header-only">
-      <article data-type="list" style="padding: 20px;">
+      <article data-type="list">
+        <h2>Elements</h2>
+        <ul>
+          <li class="listItem noLink">
+            <aside class="pack-end">
+              <label>
+                <button data-click="formatDoc" data-click-action="insertOrderedList" data-click-back="true">Insert</button>
+              </label>
+            </aside>
+            <p class="label">Ordered list</p>
+          </li>
+          <li class="listItem noLink">
+            <aside class="pack-end">
+              <label>
+                <button data-click="formatDoc" data-click-action="insertUnorderedList" data-click-back="true">Insert</button>
+              </label>
+            </aside>
+            <p class="label">Unordered list</p>
+          </li>
+        </ul>
+        <h2>Formatting</h2>
         <ul>
-          <li class="listItem">
+          <li class="listItem noLink">
             <aside class="pack-end">
               <label>
-                <input type="checkbox" data-type="switch" checked>
+                <input type="checkbox" data-type="switch">
                 <span></span>
               </label>
             </aside>
             <p class="label">Bold</p>
           </li>
-          <li class="listItem">
+          <li class="listItem noLink">
             <aside class="pack-end">
               <label>
-                <input type="checkbox" data-type="switch" checked>
+                <input type="checkbox" data-type="switch">
                 <span></span>
               </label>
             </aside>
             <p class="label">Italic</p>
           </li>
-          <li class="listItem">
+          <li class="listItem noLink">
             <aside class="pack-end">
               <label>
-                <input type="checkbox" data-type="switch" checked>
+                <input type="checkbox" data-type="switch">
                 <span></span>
               </label>
             </aside>
             <p class="label">Underline</p>
           </li>
-          <li class="listItem">
+          <li class="listItem noLink">
             <aside class="pack-end">
               <label>
-                <input type="checkbox" data-type="switch" checked>
+                <input type="checkbox" data-type="switch">
                 <span></span>
               </label>
             </aside>
diff --git a/js/firetext.js b/js/firetext.js
index 493d5bc..c60d1fe 100755
--- a/js/firetext.js
+++ b/js/firetext.js
@@ -848,14 +848,16 @@ document.addEventListener('mousedown', function(event) {
 
 function processActions(eventAttribute, target) {
   if (target && target.getAttribute) {
-    if (target.parentNode && target.parentNode.classList && target.parentNode.classList.contains('listItem')) {
-      target = target.parentNode;
-    } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.classList && target.parentNode.parentNode.classList.contains('listItem')) {
-      target = target.parentNode.parentNode;
-    } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.classList && target.parentNode.parentNode.parentNode.classList.contains('listItem')) {
-      target = target.parentNode.parentNode.parentNode;
-    } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.parentNode.classList && target.parentNode.parentNode.parentNode.parentNode.classList.contains('listItem')) {
-      target = target.parentNode.parentNode.parentNode.parentNode;
+    if (target.hasAttribute(eventAttribute) != true) {
+      if (target.parentNode && target.parentNode.classList && target.parentNode.classList.contains('listItem')) {
+        target = target.parentNode;
+      } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.classList && target.parentNode.parentNode.classList.contains('listItem')) {
+        target = target.parentNode.parentNode;
+      } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.classList && target.parentNode.parentNode.parentNode.classList.contains('listItem')) {
+        target = target.parentNode.parentNode.parentNode;
+      } else if (target.parentNode && target.parentNode.parentNode && target.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.parentNode && target.parentNode.parentNode.parentNode.parentNode.classList && target.parentNode.parentNode.parentNode.parentNode.classList.contains('listItem')) {
+        target = target.parentNode.parentNode.parentNode.parentNode;
+      }
     }
     var calledFunction = target.getAttribute(eventAttribute);
     if (calledFunction == 'loadToEditor') {
@@ -882,6 +884,9 @@ function processActions(eventAttribute, target) {
       saveFromEditor();
     } else if (calledFunction == 'formatDoc') {
       formatDoc(target.getAttribute(eventAttribute + '-action'));
+      if (target.getAttribute(eventAttribute + '-back') == 'true') {
+        navBack();
+      }
     } else if (calledFunction == 'createFromDialog') {
       createFromDialog();
     } else if (calledFunction == 'editDocs') {