Permalink
Browse files

Renamed WebLoader\LoaderFactory to WebLoader\Nette\LoaderFactory

  • Loading branch information...
1 parent 2a44c5c commit 1824560e3b0e25e61c2a2787d638da5c888e7e02 @fprochazka fprochazka committed Apr 20, 2014
Showing with 5 additions and 7 deletions.
  1. +1 −1 README.md
  2. +1 −1 WebLoader/Nette/Extension.php
  3. +3 −5 WebLoader/{ → Nette}/LoaderFactory.php
View
@@ -85,7 +85,7 @@ $webloaderExtension->install($configurator);
Usage in `app/presenters/BasePresenter.php`:
```php
- /** @var \WebLoader\LoaderFactory @inject */
+ /** @var \WebLoader\Nette\LoaderFactory @inject */
public $webLoader;
/** @return CssLoader */
@@ -87,7 +87,7 @@ public function loadConfiguration()
}
$builder->addDefinition($this->prefix('factory'))
- ->setClass('WebLoader\LoaderFactory', array($loaderFactoryTempPaths));
+ ->setClass('WebLoader\Nette\LoaderFactory', array($loaderFactoryTempPaths));
}
private function addWebLoader(ContainerBuilder $builder, $name, $config)
@@ -1,12 +1,10 @@
<?php
-namespace WebLoader;
+namespace WebLoader\Nette;
use Nette\DI\Container;
use Nette\Http\IRequest;
-use WebLoader\Nette\CssLoader;
-use WebLoader\Nette\Extension;
-use WebLoader\Nette\JavaScriptLoader;
+use WebLoader\Compiler;
class LoaderFactory
{
@@ -62,7 +60,7 @@ private function formatTempPath($name)
{
$lName = strtolower($name);
$tempPath = isset($this->tempPaths[$lName]) ? $this->tempPaths[$lName] : Extension::DEFAULT_TEMP_PATH;
- return rtrim($this->httpRequest->url->basePath, '/') . '/' . $tempPath;
+ return rtrim($this->httpRequest->getUrl()->basePath, '/') . '/' . $tempPath;
}
}

0 comments on commit 1824560

Please sign in to comment.