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

Fallback for keepalive js #16452

Merged
merged 7 commits into from Jun 13, 2017
Merged

Fallback for keepalive js #16452

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08f3e2f
add better fallback to keepalive
andrepereiradasilva Jun 2, 2017
1fc04f9
add minified script
andrepereiradasilva Jun 2, 2017
5fee537
add Joomla instalation url core and base paths to core behaviour so a…
andrepereiradasilva Jun 2, 2017
627391a
systemPaths, not systemPath
andrepereiradasilva Jun 2, 2017
6913407
better comment
andrepereiradasilva Jun 2, 2017
ed4a177
Merge branch 'staging' into patch-20
andrepereiradasilva Jun 3, 2017
80d499b
ups ... sorry
andrepereiradasilva Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions libraries/cms/html/behavior.php
View file
Open in desktop
Expand Up @@ -88,6 +88,10 @@ public static function core()
}

JHtml::_('script', 'system/core.js', array('version' => 'auto', 'relative' => true));

// Add core paths so javascript can have the root path.
JFactory::getDocument()->addScriptOptions('system.paths', array('root' => JUri::root(true), 'base', JUri::base(true)));
Copy link
Contributor

Choose a reason for hiding this comment

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

Change to 'base' => JUri::base(true)?


static::$loaded[__METHOD__] = true;

return;
Expand Down
14 changes: 11 additions & 3 deletions media/system/js/keepalive-uncompressed.js
View file
Open in desktop
Expand Up @@ -17,12 +17,20 @@
document.addEventListener('DOMContentLoaded', function() {

var keepaliveOptions = Joomla.getOptions('system.keepalive'),
keepaliveUri = keepaliveOptions.uri ? keepaliveOptions.uri.replace(/&/g, '&') : window.location.pathname,
keepaliveInterval = keepaliveOptions.interval ? keepaliveOptions.interval : 45 * 1000;
keepaliveUri = keepaliveOptions && keepaliveOptions.uri ? keepaliveOptions.uri.replace(/&/g, '&') : '',
keepaliveInterval = keepaliveOptions && keepaliveOptions.interval ? keepaliveOptions.interval : 45 * 1000;

// Fallback in case no keepalive uri was found.
if (keepaliveUri === '')
Copy link
Member

Choose a reason for hiding this comment

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

this check only for empty string, for check all "false" cases use if (!keepaliveUri)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes but i want to strict check for empty string :) see above

keepaliveUri      = keepaliveOptions && keepaliveOptions.uri ? keepaliveOptions.uri.replace(/&/g, '&') : '',

Copy link
Member

Choose a reason for hiding this comment

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

okay 😉

{
var systemPath = Joomla.getOptions('system.paths');

keepaliveUri = (systemPaths ? systemPaths.root + '/index.php' : window.location.pathname) + '?option=com_ajax&format=json';
}

window.setInterval(function() {
Joomla.request({
url: keepaliveUri,
url: keepaliveUri,
onSuccess: function(response, xhr)
{
// Do nothing
Expand Down
2 changes: 1 addition & 1 deletion media/system/js/keepalive.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.