Changed things like (if width width "250px") to (or width "250px")

day8 · May 25, 2017 · cec6cf7 · cec6cf7
1 parent ebb07ba
commit cec6cf7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/re_com/buttons.cljs b/src/re_com/buttons.cljs
@@ -55,7 +55,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
@@ -115,7 +115,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
@@ -175,7 +175,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
@@ -206,8 +206,8 @@
       [popover-tooltip
        :label     info
        :status    :info
-       :position  (if position position :right-below)
-       :width     (if width width "250px")
+       :position  (or position :right-below)
+       :width     (or width "250px")
        :showing?  showing?
        :on-cancel #(swap! showing? not)
        :anchor    [:div
@@ -269,7 +269,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
@@ -325,7 +325,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
@@ -376,7 +376,7 @@
          :child (if tooltip
                   [popover-tooltip
                    :label    tooltip
-                   :position (if tooltip-position tooltip-position :below-center)
+                   :position (or tooltip-position :below-center)
                    :showing? showing?
                    :anchor   the-button]
                   the-button)]))))
diff --git a/src/re_com/misc.cljs b/src/re_com/misc.cljs
@@ -106,7 +106,7 @@
                                         :input "text"
                                         :password "password"
                                         nil)
-                         :rows        (when (= input-type :textarea) (if rows rows 3))
+                         :rows        (when (= input-type :textarea) (or rows 3))
                          :style       (merge
                                         (flex-child-style "none")
                                         {:height        height
@@ -332,7 +332,7 @@
                              (flex-child-style "none")
                              {;:-webkit-appearance "slider-vertical"   ;; TODO: Make a :orientation (:horizontal/:vertical) option
                               ;:writing-mode       "bt-lr"             ;; Make IE slider vertical
-                              :width  (if width width "400px")
+                              :width  (or width "400px")
                               :cursor (if disabled? "not-allowed" "default")}
                              style)
                 :min       min

diff --git a/src/re_com/popover.cljs b/src/re_com/popover.cljs
@@ -55,9 +55,9 @@
         popover-left   (case pop-orient
                          :left           "initial" ;; TODO: Ultimately remove this (must have NO :left which is in Bootstrap .popover class)
                          :right          (px total-offset)
-                         (:above :below) (px (if pop-offset pop-offset (/ p-width 2)) :negative))
+                         (:above :below) (px (or pop-offset (/ p-width 2)) :negative))
         popover-top    (case pop-orient
-                         (:left :right)  (px (if pop-offset pop-offset (/ p-height 2)) :negative)
+                         (:left :right)  (px (or pop-offset (/ p-height 2)) :negative)
                          :above          "initial"
                          :below          (px total-offset))
         popover-right  (case pop-orient
@@ -157,7 +157,7 @@
                     :width            "100%"
                     :height           "100%"
                     :background-color "black"
-                    :opacity          (if opacity opacity 0.0)}
+                    :opacity          (or opacity 0.0)}
          :on-click (handler-fn (on-click))}])
 
 
@@ -288,9 +288,9 @@
                              (when pop-id (calc-popover-pos orientation @p-width @p-height @pop-offset arrow-length arrow-gap))
                              {:top "-10000px" :left "-10000px"})
 
-                           (if width  {:width  width})
-                           (if height {:height height})
-                           (if popover-color {:background-color popover-color})
+                           (when width  {:width  width})
+                           (when height {:height height})
+                           (when popover-color {:background-color popover-color})
                            (when tooltip-style?
                              {:border-radius "4px"
                               :box-shadow    "none"