per-batch absolute url option

bicisteadm · Jan 30, 2018 · 9363263 · 9363263
1 parent be31720
commit 9363263
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/WebLoader/Compiler.php b/WebLoader/Compiler.php
@@ -43,6 +43,9 @@ class Compiler
 	/** @var string */
 	private $nonce = NULL;
 
+	/** @var bool */
+	private $absoluteUrl = FALSE;
+
 	public function __construct(IFileCollection $files, IOutputNamingConvention $convention, $outputDir)
 	{
 		$this->collection = $files;
@@ -178,6 +181,25 @@ public function setDefer($defer)
 		return $this;
 	}
 
+
+	/**
+	 * @return boolean
+	 */
+	public function isAbsoluteUrl()
+	{
+		return $this->absoluteUrl;
+	}
+
+	/**
+	 * @param boolean $absoluteUrl
+	 * @return Compiler
+	 */
+	public function setAbsoluteUrl($absoluteUrl)
+	{
+		$this->absoluteUrl = $absoluteUrl;
+		return $this;
+	}
+
 	/**
 	 * Set check last modified
 	 * @param bool $checkLastModified

diff --git a/WebLoader/Nette/Extension.php b/WebLoader/Nette/Extension.php
@@ -40,6 +40,7 @@ public function getDefaultConfig()
 				'async' => FALSE,
 				'defer' => FALSE,
 				'nonce' => NULL,
+				'absoluteUrl' => FALSE,
 				'namingConvention' => '@' . $this->prefix('jsNamingConvention'),
 			),
 			'cssDefaults' => array(
@@ -57,6 +58,7 @@ public function getDefaultConfig()
 				'async' => FALSE,
 				'defer' => FALSE,
 				'nonce' => NULL,
+				'absoluteUrl' => FALSE,
 				'namingConvention' => '@' . $this->prefix('cssNamingConvention'),
 			),
 			'js' => array(
@@ -138,10 +140,12 @@ private function addWebLoader(ContainerBuilder $builder, $name, $config)
 				$config['tempDir'],
 			));
 
-		$compiler->addSetup('setJoinFiles', array($config['joinFiles']))
+		$compiler
+			->addSetup('setJoinFiles', array($config['joinFiles']))
 			->addSetup('setAsync', array($config['async']))
 			->addSetup('setDefer', array($config['defer']))
-			->addSetup('setNonce', array($config['nonce']));
+			->addSetup('setNonce', array($config['nonce']))
+			->addSetup('setAbsoluteUrl', array($config['absoluteUrl']));
 
 		if ($builder->parameters['webloader']['debugger']) {
 			$compiler->addSetup('@' . $this->prefix('tracyPanel') . '::addLoader', array(

diff --git a/WebLoader/Nette/LoaderFactory.php b/WebLoader/Nette/LoaderFactory.php
@@ -44,7 +44,7 @@ public function createCssLoader($name, $appendLastModified = FALSE)
 	{
 		/** @var Compiler $compiler */
 		$compiler = $this->serviceLocator->getService($this->extensionName . '.css' . ucfirst($name) . 'Compiler');
-		return new CssLoader($compiler, $this->formatTempPath($name), $appendLastModified);
+		return new CssLoader($compiler, $this->formatTempPath($name, $compiler->isAbsoluteUrl()), $appendLastModified);
 	}
 
 	/**
@@ -56,18 +56,19 @@ public function createJavaScriptLoader($name, $appendLastModified = FALSE)
 	{
 		/** @var Compiler $compiler */
 		$compiler = $this->serviceLocator->getService($this->extensionName . '.js' . ucfirst($name) . 'Compiler');
-		return new JavaScriptLoader($compiler, $this->formatTempPath($name), $appendLastModified);
+		return new JavaScriptLoader($compiler, $this->formatTempPath($name, $compiler->isAbsoluteUrl()), $appendLastModified);
 	}
 
 	/**
 	 * @param string $name
 	 * @return string
 	 */
-	private function formatTempPath($name)
+	private function formatTempPath($name, $absoluteUrl = FALSE)
 	{
 		$lName = strtolower($name);
 		$tempPath = isset($this->tempPaths[$lName]) ? $this->tempPaths[$lName] : Extension::DEFAULT_TEMP_PATH;
-		return rtrim($this->httpRequest->getUrl()->basePath, '/') . '/' . $tempPath;
+		$method = $absoluteUrl ? 'getBaseUrl' : 'getBasePath';
+		return rtrim($this->httpRequest->getUrl()->{$method}(), '/') . '/' . $tempPath;
 	}
 
 }