Skip to content

Commit

Permalink
Merge branch '4.0-dev' into cleanup-content-banner-toolbar-code
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilsonge
wilsonge committed Jan 6, 2019
2 parents ceb5b70 + 62acb29 commit 0ec132d
Show file tree
Hide file tree
Showing 57 changed files with 498 additions and 431 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_associations/forms/filter_associations.xml
View file
Expand Up @@ -4,7 +4,7 @@
name="itemtype"
type="itemtype"
filtermode="selector"
onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
onchange="Joomla.resetFilters(this)"
>
<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
</field>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_banners/tmpl/tracks/default.php
View file
Expand Up @@ -96,10 +96,10 @@
'width' => '300px',
'modalWidth' => '40',
'footer' => '<a class="btn" data-dismiss="modal" type="button"'
. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#downloadModal\', buttonSelector: \'#closeBtn\'})">'
. Text::_('COM_BANNERS_CANCEL') . '</a>'
. '<button class="btn btn-success" type="button"'
. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#downloadModal\', buttonSelector: \'#exportBtn\'})">'
. Text::_('COM_BANNERS_TRACKS_EXPORT') . '</button>',
)
); ?>
Expand Down
12 changes: 8 additions & 4 deletions administrator/components/com_categories/Field/CategoryeditField.php
View file
Expand Up @@ -68,7 +68,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)

if ($return)
{
$this->allowAdd = $this->element['allowAdd'] ?? '';
$this->allowAdd = isset($this->element['allowAdd']) ? (boolean) $this->element['allowAdd'] : false;
}

return $return;
Expand All @@ -88,7 +88,8 @@ public function __get($name)
switch ($name)
{
case 'allowAdd':
return $this->$name;
return (bool) $this->$name;

}

return parent::__get($name);
Expand Down Expand Up @@ -348,8 +349,11 @@ protected function getInput()
{
$data = $this->getLayoutData();

$data['options'] = $this->getOptions();
$data['allowCustom'] = $this->allowAdd;
$data['options'] = $this->getOptions();
$data['allowCustom'] = $this->allowAdd;
$data['customFields'] = (boolean) $this->element['custom-fields-enabled'];
$data['customFieldsCatId'] = (string) $this->element['custom-fields-cat-id'];
$data['customFieldsSection'] = (string) $this->element['custom-fields-section'];

$renderer = $this->getRenderer($this->layout);
$renderer->setComponent('com_categories');
Expand Down
16 changes: 15 additions & 1 deletion administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
View file
Expand Up @@ -119,12 +119,26 @@
$html[] = HTMLHelper::_('select.genericlist', $options, $name, trim($attr), 'value', 'text', $value, $id);
}

if ($customFields === true)
{
$attr2 .= ' data-custom-fields-catid="' . $customFieldsCatId . '" data-custom-fields-section="' . $customFieldsSection . '"';
$attr2 .= ' onchange="Joomla.categoryHasChanged(this)"';
}
else
{
$attr2 .= $onchange ? ' onchange="' . $onchange . '"' : '';
}

Text::script('JGLOBAL_SELECT_NO_RESULTS_MATCH');
Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');

Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);

// Pass the element id to the javascript
\Joomla\CMS\Factory::getDocument()->addScriptOptions('category-change', $id);

HTMLHelper::_('script', 'layouts/joomla/form/field/category-change.min.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);
HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
?>

<joomla-field-fancy-select <?php echo $attr2; ?>><?php echo implode($html); ?></joomla-field-fancy-select>
6 changes: 3 additions & 3 deletions administrator/components/com_csp/tmpl/reports/default.php
View file
Expand Up @@ -46,11 +46,11 @@
'backdrop' => 'static',
'keyboard' => false,
'footer' => '<button type="button" class="btn" data-dismiss="modal"'
. ' onclick="jQuery(\'#plugin' . $this->httpHeadersId . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->httpHeadersId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
. '<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="jQuery(\'#plugin' . $this->httpHeadersId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
. '<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->httpHeadersId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
. Text::_("JSAVE") . '</button>'
. '<button type="button" class="btn btn-success" onclick="jQuery(\'#plugin' . $this->httpHeadersId . 'Modal iframe\').contents().find(\'#applyBtn\').click(); return false;">'
. '<button type="button" class="btn btn-success" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->httpHeadersId . 'Modal\', buttonSelector: \'#applyBtn\'})">'
. Text::_("JAPPLY") . '</button>'
)
); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/Field/SectionField.php
View file
Expand Up @@ -43,7 +43,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
$return = parent::setup($element, $value, $group);

// Onchange must always be the change context function
$this->onchange = 'fieldsChangeContext(jQuery(this).val());';
$this->onchange = 'fieldsChangeContext(this.value);';

return $return;
}
Expand Down
25 changes: 5 additions & 20 deletions administrator/components/com_fields/Helper/FieldsHelper.php
View file
Expand Up @@ -331,26 +331,11 @@ public static function prepareForm($context, Form $form, $data)
if ($form->getField('catid') && $parts[0] != 'com_fields')
{
/*
* Setting the onchange event to reload the page when the category
* has changed
*/
$form->setFieldAttribute('catid', 'onchange', 'categoryHasChanged(this);');

// Preload spindle-wheel when we need to submit form due to category selector changed
Factory::getDocument()->addScriptDeclaration("
function categoryHasChanged(element) {
var cat = jQuery(element);
if (cat.val() == '" . $assignedCatids . "')return;
Joomla.loadingLayer('show');
jQuery('input[name=task]').val('" . $section . ".reload');
element.form.submit();
}
jQuery( document ).ready(function() {
Joomla.loadingLayer('load');
var formControl = '#" . $form->getFormControl() . "_catid';
if (!jQuery(formControl).val() != '" . $assignedCatids . "'){jQuery(formControl).val('" . $assignedCatids . "');}
});"
);
* Setting some parameters for the category field
*/
$form->setFieldAttribute('catid', 'custom-fields-enabled', true);
$form->setFieldAttribute('catid', 'custom-fields-cat-id', $assignedCatids);
$form->setFieldAttribute('catid', 'custom-fields-section', $section);
}

// Getting the fields
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_finder/Service/HTML/Filter.php
View file
Expand Up @@ -180,6 +180,7 @@ public function slider($options = array())
);

// Populate the toggle button.
// @todo Remove jQuery
$html .= '<button class="btn btn-secondary" type="button" onclick="jQuery(\'[id=&quot;tax-'
. $bk . '&quot;]\').each(function(){this.click();});"><span class="fa fa-square" aria-hidden="true"></span> '
. Text::_('JGLOBAL_SELECTION_INVERT') . '</button><hr>';
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/forms/filter_installed.xml
View file
Expand Up @@ -3,7 +3,7 @@
<field
name="client_id"
type="list"
onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
onchange="Joomla.resetFilters(this)"
filtermode="selector"
>
<option value="0">JSITE</option>
Expand Down
12 changes: 6 additions & 6 deletions administrator/components/com_menus/tmpl/menus/default.php
View file
Expand Up @@ -182,13 +182,13 @@
'bodyHeight' => 70,
'modalWidth' => 80,
'footer' => '<a type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleEdit' . $module->id . 'Modal\', buttonSelector: \'#closeBtn\'})">'
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
. '<button type="button" class="btn btn-primary" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleEdit' . $module->id . 'Modal\', buttonSelector: \'#saveBtn\'})">'
. Text::_('JSAVE') . '</button>'
. '<button type="button" class="btn btn-success" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#applyBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleEdit' . $module->id . 'Modal\', buttonSelector: \'#applyBtn\'})">'
. Text::_('JAPPLY') . '</button>',
)
); ?>
Expand All @@ -211,13 +211,13 @@
'bodyHeight' => 70,
'modalWidth' => 80,
'footer' => '<a type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#closeBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleAddModal\', buttonSelector: \'#closeBtn\'})">'
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
. '<button type="button" class="btn btn-primary" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#saveBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleAddModal\', buttonSelector: \'#saveBtn\'})">'
. Text::_('JSAVE') . '</button>'
. '<button type="button" class="btn btn-success" aria-hidden="true"'
. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#applyBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#moduleAddModal\', buttonSelector: \'#applyBtn\'})">'
. Text::_('JAPPLY') . '</button>',
)
); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_messages/View/Messages/HtmlView.php
View file
Expand Up @@ -131,7 +131,7 @@ protected function addToolbar()
. Text::_('JCANCEL')
. '</button>'
. '<button class="btn btn-success" type="button" data-dismiss="modal" aria-hidden="true"'
. ' onclick="jQuery(\'#modal-cog iframe\').contents().find(\'#saveBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#modal-cog\', buttonSelector: \'#saveBtn\'})">'
. Text::_('JSAVE')
. '</button>'
);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesModuleField.php
View file
Expand Up @@ -41,7 +41,7 @@ class ModulesModuleField extends \JFormFieldList
*/
public function getOptions()
{
$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$options = ModulesHelper::getModules($clientId);

return array_merge(parent::getOptions(), $options);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesPositionField.php
View file
Expand Up @@ -39,7 +39,7 @@ class ModulesPositionField extends ListField
*/
public function getOptions()
{
$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$options = ModulesHelper::getPositions($clientId);

return array_merge(parent::getOptions(), $options);
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/Field/ModulesPositioneditField.php
View file
Expand Up @@ -49,7 +49,7 @@ protected function getInput()
{
$data = $this->getLayoutData();

$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
$positions = HTMLHelper::_('modules.positions', $clientId, 1, $this->value);

$data['client'] = $clientId;
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_modules/forms/filter_modules.xml
View file
Expand Up @@ -4,7 +4,6 @@
name="client_id"
type="list"
filtermode="selector"
layout="default"
onchange="jQuery('#filter_position, #filter_module, #filter_language, #filter_menuitem').val('');this.form.submit();"
>
<option value="0">JSITE</option>
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_modules/forms/filter_modulesadmin.xml
View file
Expand Up @@ -7,8 +7,7 @@
type="list"
label=""
filtermode="selector"
layout="default"
onchange="jQuery('#filter_position, #filter_module, #filter_language').val('');this.form.submit();"
onchange="Joomla.resetFilters(this)"
>
<option value="0">JSITE</option>
<option value="1">JADMINISTRATOR</option>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_modules/forms/moduleadmin.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
<field
name="id"
type="number"
Expand Down Expand Up @@ -90,7 +90,7 @@

<field
name="position"
type="moduleposition"
type="ModulesPositionedit"
label="COM_MODULES_FIELD_POSITION_LABEL"
default=""
maxlength="50"
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_modules/tmpl/module/edit.php
View file
Expand Up @@ -105,6 +105,7 @@
?>
<p><?php echo $short_description; ?></p>
<?php if ($long_description) : ?>
<?php // @todo Remove jQuery ?>
<p class="readmore">
<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
<?php echo Text::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
Expand Down
15 changes: 0 additions & 15 deletions administrator/components/com_newsfeeds/Controller/NewsfeedController.php
View file
Expand Up @@ -115,19 +115,4 @@ public function batch($model = null)

return parent::batch($model);
}

/**
* Function that allows child controller access to model data after the data has been saved.
*
* @param Model $model The data model object.
* @param array $validData The validated data.
*
* @return void
*
* @since 3.1
*/
protected function postSaveHook(BaseDatabaseModel $model, $validData = array())
{

}
}
15 changes: 0 additions & 15 deletions administrator/components/com_newsfeeds/Controller/NewsfeedsController.php
View file
Expand Up @@ -35,19 +35,4 @@ public function getModel($name = 'Newsfeed', $prefix = 'Administrator', $config
{
return parent::getModel($name, $prefix, $config);
}

/**
* Function that allows child controller access to model data
* after the item has been deleted.
*
* @param Model $model The data model object.
* @param integer $ids The validated data.
*
* @return void
*
* @since 3.1
*/
protected function postDeleteHook(Model $model, $ids = null)
{
}
}
1 change: 1 addition & 0 deletions administrator/components/com_plugins/tmpl/plugin/edit.php
View file
Expand Up @@ -86,6 +86,7 @@
?>
<p><?php echo $short_description; ?></p>
<?php if ($long_description) : ?>
<?php // @todo Remove jQuery ?>
<p class="readmore">
<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
<?php echo Text::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_redirect/tmpl/links/default.php
View file
Expand Up @@ -41,11 +41,11 @@
'backdrop' => 'static',
'keyboard' => false,
'footer' => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
. ' onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
. ' onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#closeBtn\'})">'
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
. '<button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
. '<button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#saveBtn\'})">'
. Text::_("JSAVE") . '</button>'
. '<button type="button" class="btn btn-success" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#applyBtn\').click(); return false;">'
. '<button type="button" class="btn btn-success" aria-hidden="true" onclick="Joomla.iframeButtonClick({iframeSelector: \'#plugin' . $this->redirectPluginId . 'Modal\', buttonSelector: \'#applyBtn\'}); return false;">'
. Text::_("JAPPLY") . '</button>'
)
); ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/forms/filter_styles.xml
View file
Expand Up @@ -4,7 +4,7 @@
name="client_id"
type="list"
filtermode="selector"
onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
onchange="Joomla.resetFilters(this)"
>
<option value="0">JSITE</option>
<option value="1">JADMINISTRATOR</option>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/forms/filter_templates.xml
View file
Expand Up @@ -4,7 +4,7 @@
name="client_id"
type="list"
filtermode="selector"
onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
onchange="Joomla.resetFilters(this)"
>
<option value="0">JSITE</option>
<option value="1">JADMINISTRATOR</option>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_templates/tmpl/style/edit_assignment.php
View file
Expand Up @@ -20,7 +20,7 @@
?>
<label id="jform_menuselect-lbl" for="jform_menuselect"><?php echo Text::_('JGLOBAL_MENU_SELECTION'); ?></label>
<div class="btn-toolbar">
<button class="btn btn-sm btn-secondary jform-rightbtn" type="button" onclick="jQuery('.chk-menulink').attr('checked', !jQuery('.chk-menulink').attr('checked'));">
<button class="btn btn-sm btn-secondary jform-rightbtn" type="button" onclick="document.querySelector('.chk-menulink').setAttribute('checked', !document.querySelector('.chk-menulink').getAttribute('checked'));">
<span class="icon-checkbox-partial" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_SELECTION_INVERT_ALL'); ?>
</button>
</div>
Expand All @@ -30,7 +30,7 @@
<?php foreach ($menuTypes as &$type) : ?>
<li>
<div class="menu-links-block">
<button class="btn btn-sm btn-secondary jform-rightbtn mb-2" type="button" onclick="jQuery('.<?php echo $type->menutype; ?>').attr('checked', !jQuery('.<?php echo $type->menutype; ?>').attr('checked'));">
<button class="btn btn-sm btn-secondary jform-rightbtn mb-2" type="button" onclick="document.querySelector('.<?php echo $type->menutype; ?>').setAttribute('checked', !document.querySelector('.<?php echo $type->menutype; ?>').getAttribute('checked'));">
<span class="icon-checkbox-partial" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_SELECTION_INVERT'); ?>
</button>
<h5><?php echo $type->title ?: $type->menutype; ?></h5>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/Model/NotesModel.php
View file
Expand Up @@ -117,7 +117,7 @@ protected function getListQuery()
{
$query->where('a.state = ' . (int) $published);
}
elseif ($published === '')
elseif ($published !== '*')
{
$query->where('(a.state IN (0, 1))');
}
Expand Down

0 comments on commit 0ec132d

Please sign in to comment.