IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various Javascript related fixes.

Browse Source
This commit is contained in:
James Cole 2016-11-25 16:54:13 +01:00
parent b34e4cd31b
commit 6c9990e0be
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/ff/categories/index.js
View File

@ -11,7 +11,7 @@ $(function () {
} }
} }
if (typeof categoryID !== 'undefined' && typeof categoryDate !== undefined) { if (typeof categoryID !== 'undefined' && typeof categoryDate !== 'undefined') {
columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period'); columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period');
} }

2
public/js/ff/categories/show.js
View File

@ -11,7 +11,7 @@ $(function () {
} }
} }
if (typeof categoryID !== 'undefined' && typeof categoryDate !== undefined) { if (typeof categoryID !== 'undefined' && typeof categoryDate !== 'undefined') {
columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period'); columnChart('chart/category/' + categoryID + '/period/' + categoryDate, 'period-specific-period');
} }

8
public/js/ff/charts.js
View File

@ -6,7 +6,7 @@
* of the MIT license. See the LICENSE file for details. * of the MIT license. See the LICENSE file for details.
*/ */
/* globals $, Chart, currencySymbol,mon_decimal_point ,accounting, mon_thousands_sep, frac_digits */ /* globals $, Chart, currencySymbol,mon_decimal_point ,accounting, mon_thousands_sep, frac_digits, noDataForChart */
var allCharts = {}; var allCharts = {};
@ -155,8 +155,10 @@ function drawAChart(URI, container, chartType, options, colorData) {
// remove the chart container + parent // remove the chart container + parent
var holder = $('#' + container).parent().parent(); var holder = $('#' + container).parent().parent();
if (holder.hasClass('box')) { if (holder.hasClass('box')) {
// remove box // find box-body:
holder.remove(); var boxBody = holder.find('.box-body');
boxBody.empty().append($('<p>').append($('<em>').text(noDataForChart)));
//holder.remove();
} }
return; return;
} }

2
resources/views/accounts/index.twig
View File

@ -39,7 +39,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var what = '{{ what }}'; var what = '{{ what|escape }}';
</script> </script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script> <script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
{% endblock %} {% endblock %}

2
resources/views/accounts/show_with_date.twig
View File

@ -91,7 +91,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var accountID = {{ account.id }}; var accountID = {{ account.id }};
var dateString = "{{ date }}"; var dateString = "{{ date|escape }}";
// uri's for charts: // uri's for charts:
var incomeByCategoryUri = '{{ route('chart.account.incomeByCategory', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; var incomeByCategoryUri = '{{ route('chart.account.incomeByCategory', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';

2
resources/views/export/index.twig
View File

@ -98,7 +98,7 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var jobKey = "{{ job.key }}"; var jobKey = "{{ job.key|escape }}";
</script> </script>
<script type="text/javascript" src="js/ff/export/index.js"></script> <script type="text/javascript" src="js/ff/export/index.js"></script>
{% endblock %} {% endblock %}

16
resources/views/layout/default.twig
View File

@ -180,23 +180,23 @@
currentPeriod: "{{ dpCurrent }}", currentPeriod: "{{ dpCurrent }}",
previousPeriod: "{{ dpPrevious }}", previousPeriod: "{{ dpPrevious }}",
nextPeriod: "{{ dpNext }}", nextPeriod: "{{ dpNext }}",
everything: '{{ 'everything'|_ }}', everything: '{{ 'everything'|_|escape }}',
customRangeLabel: '{{ 'customRange'|_ }}', customRangeLabel: '{{ 'customRange'|_|escape }}',
applyLabel: '{{ 'apply'|_ }}', applyLabel: '{{ 'apply'|_|escape }}',
cancelLabel: '{{ 'cancel'|_ }}', cancelLabel: '{{ 'cancel'|_|escape }}',
fromLabel: '{{ 'from'|_ }}', fromLabel: '{{ 'from'|_|escape }}',
toLabel: '{{ 'to'|_ }}', toLabel: '{{ 'to'|_|escape }}',
ranges: {{ dpRanges|json_encode|raw }} ranges: {{ dpRanges|json_encode|raw }}
}; };
var token = "{{ csrf_token() }}"; var token = "{{ csrf_token() }}";
var language = "{{ language }}"; var language = "{{ language|escape }}";
var currencyCode = '{{ getCurrencyCode()|escape('js') }}'; var currencyCode = '{{ getCurrencyCode()|escape('js') }}';
var currencySymbol = '{{ getCurrencySymbol()|escape('js') }}'; var currencySymbol = '{{ getCurrencySymbol()|escape('js') }}';
var mon_decimal_point = "{{ localeconv.mon_decimal_point|escape('js') }}"; var mon_decimal_point = "{{ localeconv.mon_decimal_point|escape('js') }}";
var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}"; var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}";
var frac_digits = {{ localeconv.frac_digits }}; var frac_digits = {{ localeconv.frac_digits }};
var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape }}';
var showFullList = '{{ trans('firefly.show_full_list') }}'; var showFullList = '{{ trans('firefly.show_full_list') }}';
var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}'; var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}';