nakarte

commit fdcd7cdfcde5bf115986d7d93c8d762ab7a0af10
parent 87fd8167812bdc4b891f4200c000c06fb2fcde65
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Thu,  1 Dec 2016 01:25:45 +0300

Revert "[track list] reversed control upside down; fixed looping table rows in tracks list"

This reverts commit 0d84ec2b258cfd00d8fc892af1c2acb734630050.

Diffstat:
M
src/lib/leaflet.control.track-list/track-list.css
 | 
8
++------
M
src/lib/leaflet.control.track-list/track-list.js
 | 
32
+++++++++++++++-----------------

2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/track-list.css b/src/lib/leaflet.control.track-list/track-list.css
@@ -14,18 +14,14 @@
 }
 
 .leaflet-control-tracklist .hint {
-    display: block;
+    display: inline-block;
     color: #999;
     font-size: 10px;
-    line-height: 10px;
-    margin-top: 6px;
-    padding-bottom: 0;
-    text-align: center;
+    padding-bottom: 2px;
 }
 
 .leaflet-control-tracklist .inputs-row {
     white-space: nowrap;
-    margin-top: 4px;
 }
 
 .leaflet-control-tracklist .button{
diff --git a/src/lib/leaflet.control.track-list/track-list.js b/src/lib/leaflet.control.track-list/track-list.js
@@ -72,18 +72,8 @@ L.Control.TrackList = L.Control.extend({
             }
 
             container.innerHTML = `
-                <div class="tracks-rows-wrapper" data-bind="style: {maxHeight: trackListHeight}">
-                <table class="tracks-rows"><tbody data-bind="foreach: {data: tracks, as: 'track'}">
-                    <tr data-bind="event: {contextmenu: $parent.showTrackMenu.bind($parent)}">
-                        <td><input type="checkbox" class="visibility-switch" data-bind="checked: track.visible"></td>
-                        <td><div class="color-sample" data-bind="style: {backgroundColor: $parent.colors[track.color()]}, click: $parent.onColorSelectorClicked.bind($parent)"></div></td>
-                        <td><div class="track-name-wrapper"><div class="track-name" data-bind="text: track.name, attr: {title: track.name}, click: $parent.setViewToTrack.bind($parent)"></div></div></td>
-                        <td><div class="button-length" data-bind="text: $parent.formatLength(track.length()), css: {'ticks-enabled': track.measureTicksShown}, click: $parent.switchMeasureTicksVisibility.bind($parent)"></div></td>
-                        <td><div class="button-add-track" title="Add track segment" data-bind="click: $parent.addSegmentAndEdit.bind($parent, track)"></div></td>
-                        <td><div class="button-add-point" title="Add point" data-bind="click: $parent.placeNewPoint.bind($parent, track)"></div></td>
-                        <td><a class="track-text-button" title="Actions" data-bind="click: $parent.showTrackMenu.bind($parent)">&hellip;</a></td>
-                    </tr>
-                </tbody></table>
+                <div class="hint">
+                    GPX Ozi GoogleEarth ZIP YandexMaps
                 </div>
                 <div class="inputs-row" data-bind="visible: !readingFiles()">
                     <a class="button add-track" title="New track" data-bind="click: function(){this.addNewTrack()}"></a
@@ -100,11 +90,19 @@ L.Control.TrackList = L.Control.extend({
                         },
                         visible: readingFiles"></div>
                 </div>
-
-                <div class="hint">
-                    GPX Ozi KML ZIP YandexMaps
+                <div class="tracks-rows-wrapper" data-bind="style: {maxHeight: trackListHeight}">
+                <table class="tracks-rows" data-bind="foreach: {data: tracks, as: 'track'}">
+                    <tr data-bind="event: {contextmenu: $parent.showTrackMenu.bind($parent)}">
+                        <td><input type="checkbox" class="visibility-switch" data-bind="checked: track.visible"></td>
+                        <td><div class="color-sample" data-bind="style: {backgroundColor: $parent.colors[track.color()]}, click: $parent.onColorSelectorClicked.bind($parent)"></div></td>
+                        <td><div class="track-name-wrapper"><div class="track-name" data-bind="text: track.name, attr: {title: track.name}, click: $parent.setViewToTrack.bind($parent)"></div></div></td>
+                        <td><div class="button-length" data-bind="text: $parent.formatLength(track.length()), css: {'ticks-enabled': track.measureTicksShown}, click: $parent.switchMeasureTicksVisibility.bind($parent)"></div></td>
+                        <td><div class="button-add-track" title="Add track segment" data-bind="click: $parent.addSegmentAndEdit.bind($parent, track)"></div></td>
+                        <td><div class="button-add-point" title="Add point" data-bind="click: $parent.placeNewPoint.bind($parent, track)"></div></td>
+                        <td><a class="track-text-button" title="Actions" data-bind="click: $parent.showTrackMenu.bind($parent)">&hellip;</a></td>
+                    </tr>
+                </table>
                 </div>
-
             `;
 
             ko.applyBindings(this, container);
@@ -132,7 +130,7 @@ L.Control.TrackList = L.Control.extend({
             maxHeight = (mapHeight
             - this._container.offsetTop // controls above
             - (this._container.parentNode.offsetHeight - this._container.offsetTop - this._container.offsetHeight) //controls below
-            - 90); // margin
+            - 85); // margin
             this.trackListHeight(maxHeight + 'px');
         },