kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Various Javascript fixes.

Browse Source
This commit is contained in:
James Cole
2017-01-02 12:09:46 +01:00
parent 811026dc4a
commit 9352ee3e25
15 changed files with 31 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/tags/create.twig
View File

@@ -80,7 +80,9 @@
var zoomLevel = 6;
{% endif %}
var apiKey = "{{ apiKey }}";
</script>
<script src="https://maps.googleapis.com/maps/api/js?v=3"></script>
<script src="js/ff/tags/create.js"></script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
<script src="js/ff/tags/create-edit.js"></script>
{% endblock %}

17
resources/views/tags/edit.twig
View File

@@ -59,12 +59,13 @@
{% block scripts %}
<script type="text/javascript">
{% if Input.old('latitude') %}
var latitude = "{{ Input.old('latitude') }}";
var latitude = {{ Input.old('latitude') }};
{% else %}
var latitude = "52.3167";
var latitude = {{ tag.latitude }};
{% endif %}
{% if Input.old('latitude') and Input.old('longitude') and Input.old('zoomLevel') %}
{% if (Input.old('latitude') and Input.old('longitude') and Input.old('zoomLevel'))
or (tag.latitude and tag.longitude and tag.zoomLevel) %}
var doPlaceMarker = true;
{% else %}
var doPlaceMarker = false;
@@ -73,16 +74,18 @@
{% if Input.old('longitude') %}
var longitude = "{{ Input.old('longitude') }}";
{% else %}
var longitude = "5.5500";
var longitude = {{ tag.longitude }};
{% endif %}
{% if Input.old('zoomLevel') %}
var zoomLevel = {{ Input.old('zoomLevel') }};
{% else %}
var zoomLevel = 6;
var zoomLevel = {{ tag.zoomLevel }};
{% endif %}
var apiKey = "{{ apiKey }}";
</script>
<script src="https://maps.googleapis.com/maps/api/js?v=3"></script>
<script src="js/ff/tags/edit.js"></script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
<script src="js/ff/tags/create-edit.js"></script>
{% endblock %}