Fix dropdown/navbar markup

Author: astrangeruser

src/om_widgets/dropdown.cljs

@@ -113,7 +113,7 @@
     om/IRenderState
     (render-state [_ {:keys [title items icon badge channel] :as state}]
       (html
-       [:div (build-dropdown-js-options state)
+       [:li (build-dropdown-js-options state)
         [:a (-> {:class "dropdown-toggle"}
                 (th/when-> (string? title)
                   (merge {:title title})))
@@ -139,10 +139,10 @@
     (will-mount [_] (channel-processing cursor owner))
 
     om/IRenderState
-    (render-state [_ {:keys [title as-link? icon badge items channel] :as state}]
+    (render-state [_ {:keys [title as-link? icon badge items channel class-name] :as state}]
       (let [title (str (when icon "  ") title " ")]
         (html
-          [:div (build-dropdown-js-options state)
+          [:li (build-dropdown-js-options state)
            (if as-link?
              [:a.btn-link
               (when icon [:span {:class icon}])

src/om_widgets/navbar.cljs

@@ -28,43 +28,50 @@
     om/IRenderState
     (render-state [_ {:keys [channel on-selection active-path]}]
       (html
-        [:li {:class [(when (= (get-in cursor [active-path])
-                               (:id entry))
-                        "active")]}
 
          (if (:items entry)
            (dropdown cursor (->> {:id (:id entry)
                                   :type :menu
                                   :icon (:icon entry)
                                   :title (:text entry)
+                                  :className (if (= (get-in cursor [active-path])
+                                                    (:id entry))
+                                               "active"
+                                               "")
                                   :on-selection (fn [v]
                                                   (on-selection v)
                                                   (when (om/get-state owner :collapsed?)
                                                     (put! channel :toggle-menu)))
                                   :items (:items entry)}
                                  (th/when->> (:className entry)
                                    (merge {:className (:className entry)}))))
-           [:a (->> {}
-                    (th/when->> (:className entry)
-                      (merge {:className (:className entry)}))
-                    (th/when->> (:url entry)
-                      (merge {:href (:url entry)}))
-                    (th/when->> on-selection
-                      (merge {:onClick (fn [e]
-                                         (on-selection (:id @entry))
-                                         (when (om/get-state owner :collapsed?)
-                                           (put! channel :toggle-menu)))})))
-
-            (when (or (:iconClassName entry) (:icon entry))
-              [:span {:class (or (:iconClassName entry)
-                                 (u/glyph (:icon entry)))}])
-
-            (if (fn? (:text entry))
-              ((:text entry))
-              [:span (:text entry)])
-
-            (when (:badge entry)
-              [:span.badge (:badge entry)])])]))))
+
+
+           [:li {:class [(when (= (get-in cursor [active-path])
+                                  (:id entry))
+                           "active")]}
+            [:a (->> {}
+                     (th/when->> (:className entry)
+                                 (merge {:className (:className entry)}))
+                     (th/when->> (:url entry)
+                                 (merge {:href (:url entry)}))
+                     (th/when->> on-selection
+                                 (merge {:onClick (fn [e]
+                                                    (on-selection (:id @entry))
+                                                    (when (om/get-state owner :collapsed?)
+                                                      (put! channel :toggle-menu)))})))
+
+             (when (or (:iconClassName entry) (:icon entry))
+               [:span {:class (or (:iconClassName entry)
+                                  (u/glyph (:icon entry)))}])
+
+             (if (fn? (:text entry))
+               ((:text entry))
+               [:span (:text entry)])
+
+             (when (:badge entry)
+               [:span.badge (:badge entry)])]])))))
+
 
 (defn- navbar-nav
   [{:keys [cursor entries]} owner]