2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

adjust keeping active node logic with modals

Browse source
This commit is contained in:
Laura Klünder 2017-07-26 16:10:56 +02:00
parent 7a2d0aa825
commit 072edfd84b
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/c3nav/editor/static/editor/js/editor.js
View file

@ -72,6 +72,7 @@ editor = {
// sidebar // sidebar
_last_non_modal_path: null, _last_non_modal_path: null,
_last_graph_path: null,
get_location_path: function () { get_location_path: function () {
return window.location.pathname + window.location.search; return window.location.pathname + window.location.search;
}, },
@ -140,11 +141,6 @@ editor = {
$('#navbar-collapse').find('.nav').html(nav.html()); $('#navbar-collapse').find('.nav').html(nav.html());
} }
var graph_editing = content.find('[data-graph-editing]');
if (graph_editing.length) {
editor._graph_editing = graph_editing.attr('data-graph-editing');
}
content.find('[data-toggle="tooltip"]').tooltip(); content.find('[data-toggle="tooltip"]').tooltip();
var modal_close = content.find('[data-modal-close]'); var modal_close = content.find('[data-modal-close]');
@ -163,7 +159,7 @@ editor = {
} }
var active_graph_node = content.find('[data-active-node]'); var active_graph_node = content.find('[data-active-node]');
if (!editor._active_graph_node_space_transfer) { if (!editor._active_graph_node_space_transfer && !editor._in_modal && editor._last_graph_path !== editor.get_location_path()) {
editor._active_graph_node = null; editor._active_graph_node = null;
editor._active_graph_node_space_transfer = null; editor._active_graph_node_space_transfer = null;
editor._active_graph_node_html = null; editor._active_graph_node_html = null;
@ -190,6 +186,14 @@ editor = {
content.find('#id_active_node').val(editor._active_graph_node); content.find('#id_active_node').val(editor._active_graph_node);
} }
var graph_editing = content.find('[data-graph-editing]');
if (graph_editing.length) {
editor._graph_editing = graph_editing.attr('data-graph-editing');
editor._last_graph_path = editor.get_location_path();
} else if (!editor._in_modal) {
editor._last_graph_path = null;
}
var geometry_url = content.find('[data-geometry-url]'); var geometry_url = content.find('[data-geometry-url]');
var $body = $('body'); var $body = $('body');
if (geometry_url.length) { if (geometry_url.length) {
@ -350,7 +354,7 @@ editor = {
if (remove_feature !== null) { if (remove_feature !== null) {
geometries.splice(remove_feature, 1); geometries.splice(remove_feature, 1);
} }
if (editor._graph_editing === null) { if (editor._last_graph_path === null) {
geometries = geometries.filter(function(val) { return val.properties.type !== 'graphnode' }) geometries = geometries.filter(function(val) { return val.properties.type !== 'graphnode' })
} }
editor._geometries_layer = L.geoJSON(geometries, { editor._geometries_layer = L.geoJSON(geometries, {