summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-02-01 10:33:16 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-02-01 10:36:57 +0000
commit3d0d3c4eac0d9885ecf85cce0ac6e76860c614d4 (patch)
tree9453475f94058d3b2e43b6f07f05d59d7737ff4c
parentbf57b58092d898900e7b5483b92b51c65a15460e (diff)
downloadwebtrees-3d0d3c4eac0d9885ecf85cce0ac6e76860c614d4.tar.gz
webtrees-3d0d3c4eac0d9885ecf85cce0ac6e76860c614d4.tar.bz2
webtrees-3d0d3c4eac0d9885ecf85cce0ac6e76860c614d4.zip
Typo
-rw-r--r--app/Http/Controllers/Admin/ControlPanelController.php3
-rw-r--r--app/Services/ModuleService.php1
-rw-r--r--resources/js/webtrees.js2
-rw-r--r--resources/views/lists/families-table.phtml2
-rw-r--r--resources/views/modules/pedigree-chart/chart.phtml2
-rw-r--r--tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php (renamed from tests/app/Http/Controllers/Admin/ComntrolPanelControllerTest.php)1
-rw-r--r--tests/app/Http/Controllers/Admin/LocationControllerTest.php2
7 files changed, 5 insertions, 8 deletions
diff --git a/app/Http/Controllers/Admin/ControlPanelController.php b/app/Http/Controllers/Admin/ControlPanelController.php
index aa341f55f4..4ae1dc9d65 100644
--- a/app/Http/Controllers/Admin/ControlPanelController.php
+++ b/app/Http/Controllers/Admin/ControlPanelController.php
@@ -62,8 +62,7 @@ class ControlPanelController extends AbstractAdminController
UpgradeService $upgrade_service,
ModuleService $module_service,
UserService $user_service
- ): Response
- {
+ ): Response {
$filesystem = new Filesystem(new Local(WT_ROOT));
$files_to_delete = $housekeeping_service->deleteOldWebtreesFiles($filesystem);
diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php
index 350d48f382..1389bc6ad3 100644
--- a/app/Services/ModuleService.php
+++ b/app/Services/ModuleService.php
@@ -564,5 +564,4 @@ class ModuleService
return $database_modules->diff($disk_modules);
}
-
}
diff --git a/resources/js/webtrees.js b/resources/js/webtrees.js
index 7d068447ec..baeffd3cdf 100644
--- a/resources/js/webtrees.js
+++ b/resources/js/webtrees.js
@@ -992,7 +992,7 @@ $(function () {
if (osk_focus_element !== null) {
var cursorPos = osk_focus_element.selectionStart;
var v = osk_focus_element.value;
- var textBefore = v.substring(0, cursorPos);
+ var textBefore = v.substring(0, cursorPos);
var textAfter = v.substring(cursorPos, v.length);
osk_focus_element.value = textBefore + key + textAfter;
if ($('.wt-osk-pin-button').hasClass('active') === false) {
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml
index 361c4790d2..b81193d147 100644
--- a/resources/views/lists/families-table.phtml
+++ b/resources/views/lists/families-table.phtml
@@ -45,7 +45,7 @@ $(this).toggleClass("ui-state-active");
$(".parents", $(this).closest("table").DataTable().rows().nodes()).slideToggle();
})
/* Hide/show statistics */
-.on("click", ".btn-toggle-statistics", function() {
+.on("click", ".btn-toggle-statistics", function() {
$(this).toggleClass("ui-state-active");
$("#family-charts-<?= e($table_id) ?>").slideToggle();
})
diff --git a/resources/views/modules/pedigree-chart/chart.phtml b/resources/views/modules/pedigree-chart/chart.phtml
index 58df2189c0..a7710b5777 100644
--- a/resources/views/modules/pedigree-chart/chart.phtml
+++ b/resources/views/modules/pedigree-chart/chart.phtml
@@ -46,7 +46,7 @@
.height(<?= json_encode($canvas_height) ?>);
// Set variables
- var p0, p1, p2, // Holds the ids of the boxes used in the join calculations
+ var p0, p1, p2, // Holds the ids of the boxes used in the join calculations
canvas = $("#pedigree_canvas"),
ctx = canvas[0].getContext("2d"),
nodes = $(".shadow").length,
diff --git a/tests/app/Http/Controllers/Admin/ComntrolPanelControllerTest.php b/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php
index 34ce0fdb93..7bba653cff 100644
--- a/tests/app/Http/Controllers/Admin/ComntrolPanelControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/ControlPanelControllerTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace Fisharebest\Webtrees\Http\Controllers\Admin;
-use Fisharebest\Webtrees\Tree;
use Symfony\Component\HttpFoundation\Response;
/**
diff --git a/tests/app/Http/Controllers/Admin/LocationControllerTest.php b/tests/app/Http/Controllers/Admin/LocationControllerTest.php
index d3ff92c37e..f5d45e85df 100644
--- a/tests/app/Http/Controllers/Admin/LocationControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/LocationControllerTest.php
@@ -107,7 +107,7 @@ class LocationControllerTest extends \Fisharebest\Webtrees\TestCase
*/
public function testImportLocationsAction(): void
{
- $csv = new UploadedFile(dirname(__DIR__, 4) . '/data/places.csv', 'places.csv', 'image/jpeg', UPLOAD_ERR_OK);
+ $csv = new UploadedFile(dirname(__DIR__, 4) . '/data/places.csv', 'places.csv', 'image/jpeg', UPLOAD_ERR_OK);
app()->instance(Request::class, new Request([], [], [], [], ['localfile' => $csv]));