Merge pull request #6 from astridx/master-dev

Location
astridx · Oct 4, 2020 · 45119d7 · 45119d7
2 parents a926cd7 + e8ebbfa
commit 45119d7
Show file tree

Hide file tree

Showing 9 changed files with 1,168 additions and 302 deletions.
diff --git a/dist/current b/dist/current
@@ -1 +1 @@
-/home/astrid/git/joomla-development/pkg_aggpxtrack/dist/aggpxtrack-1.1.5
+/home/astrid/git/joomla-development/pkg_aggpxtrack/dist/aggpxtrack-1.1.6
diff --git a/dist/tmp/cbuild/administrator/components/com_aggpxtrack/aggpxtrack.xml b/dist/tmp/cbuild/administrator/components/com_aggpxtrack/aggpxtrack.xml
@@ -2,12 +2,12 @@
 <extension version="3.5" type="component" method="upgrade">
     <name>com_aggpxtrack</name>
 	<author>Astrid Günther</author>
-	<creationDate>2020-09-03</creationDate>
+	<creationDate>2020-09-05</creationDate>
 	<copyright>(C) 2020 Astrid Günther. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.astrid-guenther.de</authorUrl>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
     <description>COM_AGGPXTRACK_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 

diff --git a/dist/zips/com_aggpxtrack.zip b/dist/zips/com_aggpxtrack.zip
diff --git a/dist/zips/plg_fields_aggpxtrack.zip b/dist/zips/plg_fields_aggpxtrack.zip
diff --git a/dist/zips/plg_installer_aggpxtrackinstaller.zip b/dist/zips/plg_installer_aggpxtrackinstaller.zip
diff --git a/jorobo.ini b/jorobo.ini
@@ -1,5 +1,5 @@
 extension = aggpxtrack
-version = 1.1.5
+version = 1.1.6
 source = src
 target = package
 

diff --git a/src/media/plg_fields_aggpxtrack/js/aggpxtrack.js b/src/media/plg_fields_aggpxtrack/js/aggpxtrack.js
@@ -298,6 +298,8 @@ document.addEventListener('DOMContentLoaded', function () {
 			L.control.locate({
 				position: currentposition_position,
 				initialZoomLevel: currentposition_initialZoomLevel,
+				keepCurrentZoomLevel: true,
+				setView: 'always',
 				strings: {
 					'title': Joomla.JText._('PLG_AGGPXTRACK_CURRENTPOSITION_STRING'),
 				},
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/astrid/git/joomla-development/pkg_aggpxtrack/dist/aggpxtrack-1.1.5
		/home/astrid/git/joomla-development/pkg_aggpxtrack/dist/aggpxtrack-1.1.6