Minor fixes

offtherailz · offtherailz · commit 5af52ee10183 · 2019-04-17T17:27:01.000+02:00
- Moved the timeline above the widgets to avoid timelines settings panel to overlap pinned widgets
 - Show tooltip only when collapsed
diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -278,7 +278,7 @@
             "TOCItemsSettings",
             "Tutorial", "MapFooter", {
                 "name": "Measure"
-            }, "Print", "ShapeFile", "Timeline", "Playback", {
+            }, "Print", "ShapeFile", {
                 "name": "Settings",
                 "cfg": {
                     "wrap": true
@@ -348,6 +348,8 @@
                 }
             },
             "OmniBar", "Login", "Save", "SaveAs", "BurgerMenu", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "WidgetsBuilder", "Widgets", "WidgetsTray",
+            "Timeline",
+            "Playback",
             "FeedbackMask",
             "StyleEditor"
         ],
diff --git a/web/client/plugins/timeline/TimelineToggle.jsx b/web/client/plugins/timeline/TimelineToggle.jsx
@@ -29,8 +29,11 @@ const withPopover = require('../../components/data/featuregrid/enhancers/withPop
  */
 const togglePopover = props$ =>
     props$
+        // only the first time collapsed property is set to true
         .distinctUntilKeyChanged('collapsed')
+        .filter(({ collapsed }) => collapsed)
         .take(1)
+        // show popover for 5 seconds
         .switchMap(({ collapseHintPopoverOptions }) =>
             Rx.Observable.timer(5000)
             .startWith({
@@ -94,7 +97,7 @@ module.exports = compose(
         onClick: ({ collapsed, setCollapsed: handler }) => () => handler(!collapsed)
     }),
     withProps(({collapsed}) => ({
-        bsStyle: collapsed ? "primary" : "success active",
+        bsStyle: collapsed ? "primary" : "success",
         tooltipId: collapsed ? "timeline.show" : "timeline.hide"
         })
     )
