From d27176c0b3969baa896c7e61a448de4600f273f4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 22 Dec 2018 06:21:06 +0100 Subject: [PATCH] Fix #1828 --- public/v1/js/ff/accounts/create.js | 1 + public/v1/js/ff/accounts/edit.js | 1 + public/v1/js/ff/bills/create.js | 1 + public/v1/js/ff/bills/edit.js | 1 + public/v1/js/ff/budgets/create.js | 24 ++++++++++++++++++ public/v1/js/ff/budgets/edit.js | 24 ++++++++++++++++++ public/v1/js/ff/categories/create.js | 24 ++++++++++++++++++ public/v1/js/ff/categories/edit.js | 24 ++++++++++++++++++ public/v1/js/ff/piggy-banks/create.js | 1 + public/v1/js/ff/piggy-banks/edit.js | 1 + public/v1/js/ff/recurring/create.js | 1 + public/v1/js/ff/recurring/edit.js | 1 + public/v1/js/ff/rule-groups/create.js | 25 +++++++++++++++++++ public/v1/js/ff/rule-groups/edit.js | 25 +++++++++++++++++++ public/v1/js/ff/rules/create-edit.js | 2 +- public/v1/js/ff/tags/create-edit.js | 1 + resources/views/v1/budgets/create.twig | 3 +++ resources/views/v1/budgets/edit.twig | 3 +++ resources/views/v1/categories/create.twig | 4 ++- resources/views/v1/categories/edit.twig | 3 +++ .../views/v1/rules/rule-group/create.twig | 3 +++ resources/views/v1/rules/rule-group/edit.twig | 3 +++ 22 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 public/v1/js/ff/budgets/create.js create mode 100644 public/v1/js/ff/budgets/edit.js create mode 100644 public/v1/js/ff/categories/create.js create mode 100644 public/v1/js/ff/categories/edit.js create mode 100644 public/v1/js/ff/rule-groups/create.js create mode 100644 public/v1/js/ff/rule-groups/edit.js diff --git a/public/v1/js/ff/accounts/create.js b/public/v1/js/ff/accounts/create.js index bff8a0c275..073fc4e58e 100644 --- a/public/v1/js/ff/accounts/create.js +++ b/public/v1/js/ff/accounts/create.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/accounts/edit.js b/public/v1/js/ff/accounts/edit.js index fbd367bf18..3a7f24db81 100644 --- a/public/v1/js/ff/accounts/edit.js +++ b/public/v1/js/ff/accounts/edit.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/bills/create.js b/public/v1/js/ff/bills/create.js index 2e679a5de7..3fe5910c90 100644 --- a/public/v1/js/ff/bills/create.js +++ b/public/v1/js/ff/bills/create.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/bills/edit.js b/public/v1/js/ff/bills/edit.js index eacac841c7..73999727ca 100644 --- a/public/v1/js/ff/bills/edit.js +++ b/public/v1/js/ff/bills/edit.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/budgets/create.js b/public/v1/js/ff/budgets/create.js new file mode 100644 index 0000000000..9881ca0859 --- /dev/null +++ b/public/v1/js/ff/budgets/create.js @@ -0,0 +1,24 @@ +/* + * create.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + +$(function () { + "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); +}); \ No newline at end of file diff --git a/public/v1/js/ff/budgets/edit.js b/public/v1/js/ff/budgets/edit.js new file mode 100644 index 0000000000..ba06d72c65 --- /dev/null +++ b/public/v1/js/ff/budgets/edit.js @@ -0,0 +1,24 @@ +/* + * edit.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + +$(function () { + "use strict"; + $(".content-wrapper form input[type='text']:enabled:visible:first").first().focus(); +}); \ No newline at end of file diff --git a/public/v1/js/ff/categories/create.js b/public/v1/js/ff/categories/create.js new file mode 100644 index 0000000000..4ccf6d1394 --- /dev/null +++ b/public/v1/js/ff/categories/create.js @@ -0,0 +1,24 @@ +/* + * create.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + +$(function () { + "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); +}); diff --git a/public/v1/js/ff/categories/edit.js b/public/v1/js/ff/categories/edit.js new file mode 100644 index 0000000000..ba06d72c65 --- /dev/null +++ b/public/v1/js/ff/categories/edit.js @@ -0,0 +1,24 @@ +/* + * edit.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + +$(function () { + "use strict"; + $(".content-wrapper form input[type='text']:enabled:visible:first").first().focus(); +}); \ No newline at end of file diff --git a/public/v1/js/ff/piggy-banks/create.js b/public/v1/js/ff/piggy-banks/create.js index 2e679a5de7..3fe5910c90 100644 --- a/public/v1/js/ff/piggy-banks/create.js +++ b/public/v1/js/ff/piggy-banks/create.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/piggy-banks/edit.js b/public/v1/js/ff/piggy-banks/edit.js index eacac841c7..73999727ca 100644 --- a/public/v1/js/ff/piggy-banks/edit.js +++ b/public/v1/js/ff/piggy-banks/edit.js @@ -22,6 +22,7 @@ $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/recurring/create.js b/public/v1/js/ff/recurring/create.js index 8665021ce7..281c3bbc84 100644 --- a/public/v1/js/ff/recurring/create.js +++ b/public/v1/js/ff/recurring/create.js @@ -24,6 +24,7 @@ var calendar; $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/recurring/edit.js b/public/v1/js/ff/recurring/edit.js index 26a85e59da..c2c18a2ade 100644 --- a/public/v1/js/ff/recurring/edit.js +++ b/public/v1/js/ff/recurring/edit.js @@ -24,6 +24,7 @@ var calendar; $(document).ready(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/public/v1/js/ff/rule-groups/create.js b/public/v1/js/ff/rule-groups/create.js new file mode 100644 index 0000000000..9decdbf81e --- /dev/null +++ b/public/v1/js/ff/rule-groups/create.js @@ -0,0 +1,25 @@ +/* + * create.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + + +$(document).ready(function () { + "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); +}); diff --git a/public/v1/js/ff/rule-groups/edit.js b/public/v1/js/ff/rule-groups/edit.js new file mode 100644 index 0000000000..cd1371efe4 --- /dev/null +++ b/public/v1/js/ff/rule-groups/edit.js @@ -0,0 +1,25 @@ +/* + * edit.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + + +$(document).ready(function () { + "use strict"; + $(".content-wrapper form input[type='text']:enabled:visible:first").first().focus(); +}); diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.js index 8bdd9f9588..05a7a46e6a 100644 --- a/public/v1/js/ff/rules/create-edit.js +++ b/public/v1/js/ff/rules/create-edit.js @@ -22,7 +22,7 @@ $(function () { "use strict"; - + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (triggerCount > 0) { console.log('trigger count is larger than zero, call onAddNewTrigger.'); onAddNewTrigger(); diff --git a/public/v1/js/ff/tags/create-edit.js b/public/v1/js/ff/tags/create-edit.js index 4ac008906a..eb2fe18095 100644 --- a/public/v1/js/ff/tags/create-edit.js +++ b/public/v1/js/ff/tags/create-edit.js @@ -21,6 +21,7 @@ $(function () { "use strict"; + $(".content-wrapper form input:enabled:visible:first").first().focus().select(); if (!Modernizr.inputtypes.date) { $('input[type="date"]').datepicker( { diff --git a/resources/views/v1/budgets/create.twig b/resources/views/v1/budgets/create.twig index 3d6b429805..93a1e618f7 100644 --- a/resources/views/v1/budgets/create.twig +++ b/resources/views/v1/budgets/create.twig @@ -42,3 +42,6 @@ {% endblock %} +{% block scripts %} + +{% endblock %} \ No newline at end of file diff --git a/resources/views/v1/budgets/edit.twig b/resources/views/v1/budgets/edit.twig index 4c2f03c6be..7e17274c58 100644 --- a/resources/views/v1/budgets/edit.twig +++ b/resources/views/v1/budgets/edit.twig @@ -40,3 +40,6 @@ {{ Form.close|raw }} {% endblock %} +{% block scripts %} + +{% endblock %} diff --git a/resources/views/v1/categories/create.twig b/resources/views/v1/categories/create.twig index eda7c8f04c..4ebc15071b 100644 --- a/resources/views/v1/categories/create.twig +++ b/resources/views/v1/categories/create.twig @@ -40,4 +40,6 @@ {% endblock %} - +{% block scripts %} + +{% endblock %} \ No newline at end of file diff --git a/resources/views/v1/categories/edit.twig b/resources/views/v1/categories/edit.twig index 9c912d9eeb..dfc1949bcb 100644 --- a/resources/views/v1/categories/edit.twig +++ b/resources/views/v1/categories/edit.twig @@ -40,3 +40,6 @@ {{ Form.close|raw }} {% endblock %} +{% block scripts %} + +{% endblock %} diff --git a/resources/views/v1/rules/rule-group/create.twig b/resources/views/v1/rules/rule-group/create.twig index 01edaae1d1..e00d2999b3 100644 --- a/resources/views/v1/rules/rule-group/create.twig +++ b/resources/views/v1/rules/rule-group/create.twig @@ -48,3 +48,6 @@ {% endblock %} +{% block scripts %} + +{% endblock %} \ No newline at end of file diff --git a/resources/views/v1/rules/rule-group/edit.twig b/resources/views/v1/rules/rule-group/edit.twig index 6869167a79..27ec9cf84b 100644 --- a/resources/views/v1/rules/rule-group/edit.twig +++ b/resources/views/v1/rules/rule-group/edit.twig @@ -52,3 +52,6 @@ {{ Form.close|raw }} {% endblock %} +{% block scripts %} + +{% endblock %} \ No newline at end of file