Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[com_fields] Add Joomla loading overlay when form submit is triggered by category selector change #13320

Merged
merged 11 commits into from
Jan 14, 2017
Merged

[com_fields] Add Joomla loading overlay when form submit is triggered by category selector change #13320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f209bb5
Added overlay box and message box for submit and reload form after ca…
ggppdk Dec 21, 2016
c73c8c2
Removed commented testing code
ggppdk Dec 21, 2016
790d1e4
Added language strings
ggppdk Dec 21, 2016
885f33e
CS fix, added missing spaces
ggppdk Dec 23, 2016
3678486
Used Joomla logo spinner instead of fixed message
ggppdk Dec 23, 2016
e1189e6
Reverted changes in admin lang file
ggppdk Dec 23, 2016
08745a0
CS
ggppdk Dec 23, 2016
82ae6df
Revert frontend lang changes
ggppdk Dec 23, 2016
a15d4d3
Added Joomla loading overlay to new field form when changing field type
ggppdk Dec 25, 2016
0ee2b7b
Added Joomla.loadingLayer show to typeHasChanged JS method too
ggppdk Jan 7, 2017
56fc576
Merge branch 'staging' into jfields_waiting_for_cat_change
Jan 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions administrator/components/com_fields/helpers/fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,19 @@ public static function prepareForm($context, JForm $form, $data)
* has changed
*/
$form->setFieldAttribute('catid', 'onchange', 'categoryHasChanged(this);');
JFactory::getDocument()->addScriptDeclaration(
"function categoryHasChanged(element){

// Preload spindle-wheel when we need to submit form due to category selector changed
JFactory::getDocument()->addScriptDeclaration("
function categoryHasChanged(element) {
Joomla.loadingLayer('show');
var cat = jQuery(element);
if (cat.val() == '" . $assignedCatids . "')return;
jQuery('input[name=task]').val('field.storeform');
element.form.action='" . $uri . "';
element.form.submit();
}
jQuery( document ).ready(function() {
Joomla.loadingLayer('load');
var formControl = '#" . $form->getFormControl() . "_catid';
if (!jQuery(formControl).val() != '" . $assignedCatids . "'){jQuery(formControl).val('" . $assignedCatids . "');}
});");
Expand Down
12 changes: 9 additions & 3 deletions administrator/components/com_fields/models/fields/type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,19 @@ function ($a, $b)
$uri->setVar('view', null);
$uri->setVar('layout', null);

JFactory::getDocument()->addScriptDeclaration(
"function typeHasChanged(element){

JFactory::getDocument()->addScriptDeclaration("
jQuery( document ).ready(function() {
Joomla.loadingLayer('load');
});
function typeHasChanged(element){
Joomla.loadingLayer('show');
var cat = jQuery(element);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is Joomla.loadingLayer('show'); needed, otherwise it doesn't show up when the type got changed.

jQuery('input[name=task]').val('field.storeform');
element.form.action='" . $uri . "';
element.form.submit();
}");
}
");

return $options;
}
Expand Down