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

get graoh_editing in editor.js

Browse source
This commit is contained in:
Laura Klünder 2017-07-25 10:42:26 +02:00
parent eaab690da3
commit 6f6485b790
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,6 +239,7 @@ editor = {
_highlight_geometries: {}, _highlight_geometries: {},
_creating: false, _creating: false,
_next_zoom: true, _next_zoom: true,
_graph_editing: null,
init_geometries: function () { init_geometries: function () {
// init geometries and edit listeners // init geometries and edit listeners
editor._highlight_layer = L.layerGroup().addTo(editor.map); editor._highlight_layer = L.layerGroup().addTo(editor.map);
@ -450,6 +451,7 @@ editor = {
// dblclick callback for a geometry layer - edit this feature if the corresponding itemtable row exists // dblclick callback for a geometry layer - edit this feature if the corresponding itemtable row exists
if (editor._loading_geometry) return; if (editor._loading_geometry) return;
e.target.list_elem.find('td:last-child a').click(); e.target.list_elem.find('td:last-child a').click();
e.target.list_elem.find('td:last-child a').click();
editor.map.doubleClickZoom.disable(); editor.map.doubleClickZoom.disable();
}, },
_highlight_geometry: function(id) { _highlight_geometry: function(id) {
@ -484,6 +486,13 @@ editor = {
_check_start_editing: function() { _check_start_editing: function() {
// called on sidebar load. start editing or creating depending on how the sidebar may require it // called on sidebar load. start editing or creating depending on how the sidebar may require it
var sidebarcontent = $('#sidebar').find('.content'); var sidebarcontent = $('#sidebar').find('.content');
var graph_editing = sidebarcontent.find('[data-graph-editing]');
if (graph_editing.length) {
editor._graph_editing = JSON.parse(graph_editing.attr('data-graph-editing'));
return;
}
var geometry_field = sidebarcontent.find('input[name=geometry]'); var geometry_field = sidebarcontent.find('input[name=geometry]');
if (geometry_field.length) { if (geometry_field.length) {
var form = geometry_field.closest('form'); var form = geometry_field.closest('form');
@ -516,6 +525,7 @@ editor = {
editor._creating = false; editor._creating = false;
editor.map.editTools.stopDrawing(); editor.map.editTools.stopDrawing();
} }
editor._graph_editing = null;
if (editor._editing_layer !== null) { if (editor._editing_layer !== null) {
editor._editing_layer.disableEdit(); editor._editing_layer.disableEdit();
editor._editing_layer = null; editor._editing_layer = null;

2
src/c3nav/editor/templates/editor/graph.html
View file

@ -17,7 +17,7 @@
</small> </small>
</h3> </h3>
<a href="{% url 'editor.graph.settings' %}" class="btn btn-default btn-xs pull-right" data-graph-editing-settings="{{ graph_editing_settings }}">{% trans 'Settings' %}</a> <a href="{% url 'editor.graph.settings' %}" class="btn btn-default btn-xs pull-right" data-graph-editing="{{ graph_editing_settings }}">{% trans 'Settings' %}</a>
<p> <p>
<a href="{{ back_url }}">&laquo; {{ back_title }}</a> <a href="{{ back_url }}">&laquo; {{ back_title }}</a>
</p> </p>