Remove inline Javascript for administrator/components/com_joomlaupda…

…te/tmpl/joomlaupdate/default.php (#101) * updater1 * use script options * corrections * corrections * corrections
joomla-projects · Mar 9, 2018 · cae0d8d · cae0d8d
1 parent 28f2ab0
commit cae0d8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php
@@ -21,16 +21,9 @@
 JText::script('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN');
 
 $latestJoomlaVersion = $this->updateInfo['latest'];
-
-JFactory::getDocument()->addScriptDeclaration(
-<<<JS
-var joomlaTargetVersion = '$latestJoomlaVersion';
-JS
-);
-
 ?>
 
-<div id="joomlaupdate-wrapper">
+<div id="joomlaupdate-wrapper" data-joomla-target-version="<?php echo $latestJoomlaVersion; ?>">
 	<?php if ($this->showUploadAndUpdate) : ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'joomlaupdate-tabs', array('active' => $this->shouldDisplayPreUpdateCheck() ? 'pre-update-check' : 'online-update')); ?>
 		<?php if ($this->shouldDisplayPreUpdateCheck()) : ?>

diff --git a/media/com_joomlaupdate/js/default.js b/media/com_joomlaupdate/js/default.js
@@ -97,7 +97,7 @@ Joomla = window.Joomla || {};
      */
     PreUpdateChecker.run = function () {
         // Get version of the available joomla update
-        PreUpdateChecker.joomlaTargetVersion = window.joomlaTargetVersion;
+        PreUpdateChecker.joomlaTargetVersion = document.getElementById('joomlaupdate-wrapper').getAttribute('data-joomla-target-version');
 
         // Grab all extensions based on the selector set in the config object
         var $extensions = $(PreUpdateChecker.config.selector);