From 249f67bb19ad774888681fdf8b046765be254942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Sat, 24 Sep 2016 20:55:57 +0200
Subject: [PATCH] more editor.js refactoring (get_features)

---
 src/c3nav/editor/static/editor/js/editor.js | 23 +++++++++++++--------
 src/c3nav/editor/templates/editor/map.html  |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index 6db0a2d5..72c8c027 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -96,12 +96,7 @@ editor = {
 
             $('.leaflet-levels').on('click', 'a', function (e) {
                 e.preventDefault();
-                if (editor._creating !== null || editor._editing !== null) return;
-                editor.level_layers[editor._level].remove();
-                editor._level = $(this).attr('name');
-                editor.level_layers[editor._level].addTo(editor.map);
-                $('.leaflet-levels .current').removeClass('current');
-                $(this).addClass('current');
+                editor.set_current_level($(this).attr('name'));
             });
 
             var level;
@@ -116,6 +111,14 @@ editor = {
             editor.level_layers[editor._level].addTo(editor.map);
         });
     },
+    set_current_level: function(name) {
+        if (editor._creating !== null || editor._editing !== null) return;
+        editor.level_layers[editor._level].remove();
+        editor._level = $(this).attr('name');
+        editor.level_layers[editor._level].addTo(editor.map);
+        $('.leaflet-levels .current').removeClass('current');
+        $('.leaflet-levels a[name='+name+']').addClass('current');
+    },
 
     init_drawing: function () {
         // Add drawing new features
@@ -151,9 +154,11 @@ editor = {
 
         $('#mapeditdetail').on('click', '#btn_editing_cancel', editor.cancel_editing)
                            .on('submit', 'form', editor.submit_editing);
+
+        editor.get_features();
     },
 
-    reload_features: function (feature_type) {
+    get_features: function () {
         $('.start-drawing').prop('disabled', false);
         $('#mapeditcontrols').addClass('list');
     },
@@ -223,7 +228,7 @@ editor = {
             editor._creating = null;
             $('#mapeditcontrols').removeClass('detail');
             $('#mapeditdetail').html('');
-            editor.reload_features();
+            editor.get_features();
         }
     },
     submit_editing: function(e) {
@@ -240,7 +245,7 @@ editor = {
             } else {
                 editor._editing = null;
                 editor._creating = null;
-                editor.reload_features();
+                editor.get_features();
             }
         });
     }
diff --git a/src/c3nav/editor/templates/editor/map.html b/src/c3nav/editor/templates/editor/map.html
index 8667f9ed..2dcac640 100644
--- a/src/c3nav/editor/templates/editor/map.html
+++ b/src/c3nav/editor/templates/editor/map.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% block content %}
 <div id="map"></div>
-<div id="mapeditcontrols" class="list">
+<div id="mapeditcontrols">
     <div id="mapeditlist"></div>
     <div id="mapeditdetail"></div>
 </div>