Skip to content

[4.0] Get document from application in HTMLHelper #24272

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

Merged
wilsonge merged 3 commits into from
Mar 21, 2019
Merged

[4.0] Get document from application in HTMLHelper #24272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
872e617
[4.0] Get document from application in HTMLHelper
SharkyKZ Mar 21, 2019
af7b49c
Move after early return
SharkyKZ Mar 21, 2019
2f1cf84
Merge branch '4.0-dev' into j4/HTMLHelper
wilsonge Mar 21, 2019
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
20 changes: 11 additions & 9 deletions libraries/src/HTML/HTMLHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ public static function stylesheet($file, $options = array(), $attribs = array())
}

// If inclusion is required
$document = Factory::getDocument();
$document = Factory::getApplication()->getDocument();

foreach ($includes as $include)
{
Expand Down Expand Up @@ -730,7 +730,7 @@ public static function script($file, $options = array(), $attribs = array())
}

// If inclusion is required
$document = Factory::getDocument();
$document = Factory::getApplication()->getDocument();

foreach ($includes as $include)
{
Expand Down Expand Up @@ -768,9 +768,6 @@ public static function webcomponent(string $file, array $options = [])
// Script core.js is responsible for the polyfills and the async loading of the web components
static::_('behavior.core');

$version = '';
$mediaVersion = Factory::getDocument()->getMediaVersion();

// Add the css if exists
self::_('stylesheet', str_replace('.js', '.css', $file), $options);

Expand All @@ -787,31 +784,36 @@ public static function webcomponent(string $file, array $options = [])
return;
}

$document = Factory::getApplication()->getDocument();
$version = '';

if (isset($options['version']))
{
if ($options['version'] === 'auto')
{
$version = '?' . $mediaVersion;
$version = '?' . $document->getMediaVersion();
}
else
{
$version = '?' . $options['version'];
}
}

$components = $document->getScriptOptions('webcomponents');

foreach ($includes as $include)
{
$potential = $include . ((strpos($include, '?') === false) ? $version : '');
$components = Factory::getDocument()->getScriptOptions('webcomponents');

if (in_array($potential, $components))
{
continue;
}

$components[] = $potential;
Factory::getDocument()->addScriptOptions('webcomponents', $components);
}

$document->addScriptOptions('webcomponents', $components);
}

/**
Expand Down Expand Up @@ -1067,7 +1069,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
{
$tag = Factory::getLanguage()->getTag();
$calendar = Factory::getLanguage()->getCalendar();
$direction = strtolower(Factory::getDocument()->getDirection());
$direction = strtolower(Factory::getApplication()->getDocument()->getDirection());

// Get the appropriate file for the current language date helper
$helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js';
Expand Down