-
\ No newline at end of file
diff --git a/fields/SubformMore/SubformmoreField.php b/fields/SubformMore/SubformmoreField.php
index 2e1af59..12b2e42 100644
--- a/fields/SubformMore/SubformmoreField.php
+++ b/fields/SubformMore/SubformmoreField.php
@@ -1,6 +1,8 @@
- true
]);
- return parent::getInput(); // TODO: Change the autogenerated stub
+ return parent::getInput();
}
-
}
\ No newline at end of file
diff --git a/fields/SubformMore/layouts/subformmore.php b/fields/SubformMore/layouts/subformmore.php
index 00e26da..71da06d 100644
--- a/fields/SubformMore/layouts/subformmore.php
+++ b/fields/SubformMore/layouts/subformmore.php
@@ -1,34 +1,38 @@
- 'auto', 'relative' => true));
+ HTMLHelper::_('jquery.ui', array('core', 'sortable'));
+ HTMLHelper::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
}
-// Build heading
$table_head = '';
-$count = count($tmpl->getFieldset('default'));
+$count = count($tmpl->getFieldset('default'));
-foreach ($tmpl->getFieldset('default') as $field) {
+foreach ($tmpl->getFieldset('default') as $field)
+{
$table_head .= '
' . strip_tags($field->label);
if ($field->description)
@@ -43,66 +47,66 @@
?>
-
+
+ '),
+ array('SUBFORMLT', 'SUBFORMGT'),
+ trim(
+ $this->sublayout(
+ $sublayout,
+ array(
+ 'form' => $tmpl,
+ 'basegroup' => $fieldname,
+ 'group' => $fieldname . 'X',
+ 'buttons' => $buttons,
+ 'unique_subform_id' => $unique_subform_id,
+ )
+ )
+ )
+ );
+ ?>
+
+ | ' . strip_tags($field->label);
@@ -27,7 +28,6 @@
$table_head .= ' | ';
}
-
?>
_options === null)
{
- // Get components
- $db = Factory::getDbo();
+ $db = Factory::getContainer()->get(DatabaseDriver::class);
$query = $db->getQuery(true)
->select(['id', 'title'])
->from($db->quoteName('#__usergroups'));
diff --git a/fields/YandexMaps/YandexmapssuggestField.php b/fields/YandexMaps/YandexmapssuggestField.php
deleted file mode 100644
index e6abdde..0000000
--- a/fields/YandexMaps/YandexmapssuggestField.php
+++ /dev/null
@@ -1,39 +0,0 @@
-addScript('https://api-maps.yandex.ru/2.1/?lang=ru_RU');
-
- HTMLHelper::script('lib_fields/yandexmaps/suggest.js', [
- 'version' => filemtime(__FILE__),
- 'relative' => true,
- ]);
-
- $id = "in-yandex-maps-" . random_int(1111, 9999);
- $this->class = "in-yandex-maps span6 " . $this->class;
- $this->id = $id;
-
- return '' . parent::getInput() . '
';
- }
-
-}
diff --git a/fields/YandexMaps/media/js/geocoder.js b/fields/YandexMaps/media/js/geocoder.js
deleted file mode 100644
index 09127a1..0000000
--- a/fields/YandexMaps/media/js/geocoder.js
+++ /dev/null
@@ -1,21 +0,0 @@
-document.addEventListener("DOMContentLoaded", function () {
-
- ymaps.load(function () {
- let list = document.querySelectorAll('.in-yandex-maps');
- for (let i = 0; i < list.length; i++) {
- (new ymaps.SuggestView(list[i].getAttribute('id'))).events.add('select', function (event) {
- ymaps.geocode(event.get('item').value).then(function (res) {
- var id = event.get('target')._panel._anchor.id;
- var obj = res.geoObjects.get(0),
- error, hint;
- var fulladdress = obj.properties.get('metaDataProperty.GeocoderMetaData.Address.formatted');
- var point = obj.properties.get('metaDataProperty.GeocoderMetaData.InternalToponymInfo.Point');
- list[i].value = fulladdress + ';' + point.coordinates[1] + ',' + point.coordinates[0];
- }, function (e) {
-
- });
- });
- }
- });
-
-});
\ No newline at end of file
diff --git a/fields/YandexMaps/media/js/suggest.js b/fields/YandexMaps/media/js/suggest.js
deleted file mode 100644
index adef8ef..0000000
--- a/fields/YandexMaps/media/js/suggest.js
+++ /dev/null
@@ -1,24 +0,0 @@
-document.addEventListener("DOMContentLoaded", function () {
-
- function initMaps(container) {
- let list = container.querySelectorAll('.in-yandex-maps');
- for (let i = 0; i < list.length; i++) {
- (new ymaps.SuggestView(list[i].getAttribute('id'))).events.add('select', function (event) {
- list[i].value = event.get('item').value;
- });
- }
- }
-
- ymaps.load(function () {
- initMaps(document);
- });
-
- if (window.jQuery !== undefined) {
- jQuery(document).on('subform-row-add', function (event, row) {
- initMaps(row);
- });
- }
-
-
-
-});
\ No newline at end of file
diff --git a/plugins/system/libfieldsapikey/libfieldsapikey.php b/plugins/system/libfieldsapikey/libfieldsapikey.php
deleted file mode 100644
index b59622b..0000000
--- a/plugins/system/libfieldsapikey/libfieldsapikey.php
+++ /dev/null
@@ -1,8 +0,0 @@
-set(InstallerScriptInterface::class, new class ($container->get(AdministratorApplication::class)) implements InstallerScriptInterface {
- /**
- * The application object
- *
- * @var AdministratorApplication
- *
- * @since __DEPLOY_VERSION__
- */
+
protected AdministratorApplication $app;
- /**
- * The Database object.
- *
- * @var DatabaseDriver
- *
- * @since __DEPLOY_VERSION__
- */
protected DatabaseDriver $db;
- /**
- * Constructor.
- *
- * @param AdministratorApplication $app The application object.
- *
- * @since __DEPLOY_VERSION__
- */
public function __construct(AdministratorApplication $app)
{
$this->app = $app;
$this->db = Factory::getContainer()->get('DatabaseDriver');
}
- /**
- * Function called after the extension is installed.
- *
- * @param InstallerAdapter $adapter The adapter calling this method
- *
- * @return boolean True on success
- *
- * @since __DEPLOY_VERSION__
- */
public function install(InstallerAdapter $adapter): bool
{
$this->copyMedia();
@@ -72,15 +34,6 @@ public function install(InstallerAdapter $adapter): bool
return true;
}
- /**
- * Function called after the extension is updated.
- *
- * @param InstallerAdapter $adapter The adapter calling this method
- *
- * @return boolean True on success
- *
- * @since __DEPLOY_VERSION__
- */
public function update(InstallerAdapter $adapter): bool
{
$this->copyMedia();
@@ -88,15 +41,6 @@ public function update(InstallerAdapter $adapter): bool
return true;
}
- /**
- * Function called after the extension is uninstalled.
- *
- * @param InstallerAdapter $adapter The adapter calling this method
- *
- * @return boolean True on success
- *
- * @since __DEPLOY_VERSION__
- */
public function uninstall(InstallerAdapter $adapter): bool
{
$this->deleteMedia();
@@ -104,31 +48,11 @@ public function uninstall(InstallerAdapter $adapter): bool
return true;
}
- /**
- * Function called before extension installation/update/removal procedure commences.
- *
- * @param string $type The type of change (install or discover_install, update, uninstall)
- * @param InstallerAdapter $adapter The adapter calling this method
- *
- * @return boolean True on success
- *
- * @since __DEPLOY_VERSION__
- */
public function preflight(string $type, InstallerAdapter $adapter): bool
{
return true;
}
- /**
- * Function called after extension installation/update/removal procedure commences.
- *
- * @param string $type The type of change (install or discover_install, update, uninstall)
- * @param InstallerAdapter $adapter The adapter calling this method
- *
- * @return boolean True on success
- *
- * @since __DEPLOY_VERSION__
- */
public function postflight(string $type, InstallerAdapter $adapter): bool
{
return true;
@@ -176,7 +100,6 @@ protected function copyMedia()
}
-
protected function deleteMedia()
{
$dest = JPATH_ROOT . '/media/lib_fields';