Update javascript libraries
Signed-off-by: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>merge-requests/780/head
parent
4f63a4f4fd
commit
29a545c1d4
|
@ -9,6 +9,9 @@ const lintPathsJS = [
|
||||||
|
|
||||||
const lintPathsCSS = [
|
const lintPathsCSS = [
|
||||||
'network/static/css/*.scss',
|
'network/static/css/*.scss',
|
||||||
|
'network/static/css/common/*.scss',
|
||||||
|
'network/static/css/pages/*.scss',
|
||||||
|
'network/static/css/partials/*.scss',
|
||||||
'network/static/css/*.css'
|
'network/static/css/*.css'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -124,4 +124,3 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
// Temporary file with overrides until issue https://github.com/mapbox/mapbox-gl-js/issues/7896 is resolved
|
// Temporary file with overrides until issue https://github.com/mapbox/mapbox-gl-js/issues/7896 is resolved
|
||||||
|
|
||||||
|
/* stylelint-disable declaration-no-important */
|
||||||
|
|
||||||
.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-out {
|
.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-out {
|
||||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox='0%200%2020%2020'%20xmlns='http://www.w3.org/2000/svg'%3E%20%3Cpath%20style='fill:%23333333;'%20d='m%207,9%20c%20-0.554,0%20-1,0.446%20-1,1%200,0.554%200.446,1%201,1%20l%206,0%20c%200.554,0%201,-0.446%201,-1%200,-0.554%20-0.446,-1%20-1,-1%20z'/%3E%20%3C/svg%3E") !important;
|
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox='0%200%2020%2020'%20xmlns='http://www.w3.org/2000/svg'%3E%20%3Cpath%20style='fill:%23333333;'%20d='m%207,9%20c%20-0.554,0%20-1,0.446%20-1,1%200,0.554%200.446,1%201,1%20l%206,0%20c%200.554,0%201,-0.446%201,-1%200,-0.554%20-0.446,-1%20-1,-1%20z'/%3E%20%3C/svg%3E") !important;
|
||||||
}
|
}
|
||||||
|
@ -11,3 +13,5 @@
|
||||||
.mapboxgl-ctrl-icon.mapboxgl-ctrl-compass > .mapboxgl-ctrl-compass-arrow {
|
.mapboxgl-ctrl-icon.mapboxgl-ctrl-compass > .mapboxgl-ctrl-compass-arrow {
|
||||||
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox='0%200%2020%2020'%20xmlns='http://www.w3.org/2000/svg'%3E%20%3Cpolygon%20fill='%23333333'%20points='6,9%2010,1%2014,9'/%3E%20%3Cpolygon%20fill='%23CCCCCC'%20points='6,11%2010,19%2014,11%20'/%3E%20%3C/svg%3E") !important;
|
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox='0%200%2020%2020'%20xmlns='http://www.w3.org/2000/svg'%3E%20%3Cpolygon%20fill='%23333333'%20points='6,9%2010,1%2014,9'/%3E%20%3Cpolygon%20fill='%23CCCCCC'%20points='6,11%2010,19%2014,11%20'/%3E%20%3C/svg%3E") !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* stylelint-enable */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* global WaveSurfer URI calcPolarPlotSVG */
|
/* global WaveSurfer calcPolarPlotSVG */
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
@ -90,8 +90,8 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle Observation tabs
|
// Handle Observation tabs
|
||||||
var uri = new URI(location.href);
|
var uri = new URL(location.href);
|
||||||
var tab = uri.hash();
|
var tab = uri.hash;
|
||||||
$('.observation-tabs li a[href="' + tab + '"]').tab('show');
|
$('.observation-tabs li a[href="' + tab + '"]').tab('show');
|
||||||
|
|
||||||
// Delete confirmation
|
// Delete confirmation
|
||||||
|
|
|
@ -20,8 +20,12 @@ $(document).ready(function() {
|
||||||
value: utilization_value});
|
value: utilization_value});
|
||||||
|
|
||||||
var station_image = $('#station-image').data('existing');
|
var station_image = $('#station-image').data('existing');
|
||||||
$('#station-image').fileinput({
|
if(station_image === undefined){
|
||||||
initialPreview: station_image,
|
$('#station-image').fileinput();
|
||||||
initialPreviewAsData: true,
|
} else {
|
||||||
});
|
$('#station-image').fileinput({
|
||||||
|
initialPreview: station_image,
|
||||||
|
initialPreviewAsData: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -452,7 +452,6 @@
|
||||||
<script src="{% static 'lib/wavesurfer.js/dist/wavesurfer.min.js' %}"></script>
|
<script src="{% static 'lib/wavesurfer.js/dist/wavesurfer.min.js' %}"></script>
|
||||||
<script src="{% static 'lib/wavesurfer.js/dist/plugin/wavesurfer.spectrogram.min.js' %}"></script>
|
<script src="{% static 'lib/wavesurfer.js/dist/plugin/wavesurfer.spectrogram.min.js' %}"></script>
|
||||||
<script src="{% static 'lib/moment/min/moment.min.js' %}"></script>
|
<script src="{% static 'lib/moment/min/moment.min.js' %}"></script>
|
||||||
<script src="{% static 'lib/urijs/src/URI.min.js' %}"></script>
|
|
||||||
<script src="{% static 'lib/jquery.json-viewer/json-viewer/jquery.json-viewer.js' %}"></script>
|
<script src="{% static 'lib/jquery.json-viewer/json-viewer/jquery.json-viewer.js' %}"></script>
|
||||||
<script src="{% static 'lib/satellite.js/dist/satellite.min.js' %}"></script>
|
<script src="{% static 'lib/satellite.js/dist/satellite.min.js' %}"></script>
|
||||||
<script src="{% static 'js/utc.js' %}"></script>
|
<script src="{% static 'js/utc.js' %}"></script>
|
||||||
|
|
|
@ -86,7 +86,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<input id="station-image" type="file" name="image" data-existing="{{ MEDIA_URL }}{{ form.image.value }}">
|
<input id="station-image" type="file" name="image"
|
||||||
|
{% if form.image.value %} data-existing="{{ MEDIA_URL }}{{ form.image.value }}" {% endif %}>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -315,7 +315,6 @@
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|
||||||
{% block javascript %}
|
{% block javascript %}
|
||||||
<script src="{% static 'lib/urijs/src/URI.min.js' %}"></script>
|
|
||||||
<script src="{% static 'lib/mapbox-gl/dist/mapbox-gl.js' %}"></script>
|
<script src="{% static 'lib/mapbox-gl/dist/mapbox-gl.js' %}"></script>
|
||||||
<script src="{% static 'lib/moment/min/moment.min.js' %}"></script>
|
<script src="{% static 'lib/moment/min/moment.min.js' %}"></script>
|
||||||
<script src="{% static 'lib/bootstrap-slider/dist/bootstrap-slider.min.js' %}"></script>
|
<script src="{% static 'lib/bootstrap-slider/dist/bootstrap-slider.min.js' %}"></script>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
25
package.json
25
package.json
|
@ -9,26 +9,25 @@
|
||||||
"author": "SatNOGS",
|
"author": "SatNOGS",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp": "^4.0.1",
|
"gulp": "^4.0.2",
|
||||||
"gulp-eslint": "^5.0.0",
|
"gulp-eslint": "^6.0.0",
|
||||||
"gulp-stylelint": "^9.0.0",
|
"gulp-stylelint": "^9.0.0",
|
||||||
"stylelint": "^10.0.1"
|
"stylelint": "^11.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "^3.3.7",
|
"bootstrap": "^3.4.1",
|
||||||
"bootstrap-fileinput": "^4.5.2",
|
"bootstrap-fileinput": "^5.0.6",
|
||||||
"bootstrap-select": "1.13.8",
|
"bootstrap-select": "1.13.11",
|
||||||
"bootstrap-slider": "^10.0.0",
|
"bootstrap-slider": "^10.6.2",
|
||||||
"d3": "^3.5.17",
|
"d3": "^3.5.17",
|
||||||
"d3-timeline": "jiahuang/d3-timeline",
|
"d3-timeline": "jiahuang/d3-timeline",
|
||||||
"dnt-helper": "schalkneethling/dnt-helper",
|
"dnt-helper": "schalkneethling/dnt-helper",
|
||||||
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
|
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
|
||||||
"jquery": "^3.2.1",
|
"jquery": "^3.4.1",
|
||||||
"jquery.json-viewer": "^1.1.0",
|
"jquery.json-viewer": "^1.4.0",
|
||||||
"mapbox-gl": "^1.0.0",
|
"mapbox-gl": "^1.3.1",
|
||||||
"moment": "^2.18.1",
|
"moment": "^2.24.0",
|
||||||
"satellite.js": "^2.0.0",
|
"satellite.js": "^3.0.1",
|
||||||
"urijs": "^1.18.12",
|
|
||||||
"wavesurfer.js": "^1.4.0"
|
"wavesurfer.js": "^1.4.0"
|
||||||
},
|
},
|
||||||
"assets": [
|
"assets": [
|
||||||
|
|
Loading…
Reference in New Issue