Optimised Twig extensions.

This commit is contained in:
James Cole
2015-05-01 20:17:06 +02:00
parent c98275e73a
commit bda18f296d
3 changed files with 94 additions and 77 deletions

View File

@@ -9,12 +9,10 @@ use FireflyIII\Support\ExpandedForm;
use FireflyIII\Support\Navigation;
use FireflyIII\Support\Preferences;
use FireflyIII\Support\Steam;
use FireflyIII\Support\TwigSupport;
use FireflyIII\Validation\FireflyValidator;
use Illuminate\Support\ServiceProvider;
use Route;
use Twig;
use Twig_SimpleFilter;
use Twig_SimpleFunction;
use TwigBridge\Extension\Loader\Functions;
use Validator;
@@ -35,81 +33,10 @@ class FireflyServiceProvider extends ServiceProvider
/*
* Default Twig configuration:
*/
$config = App::make('config');
Twig::addExtension(new Functions($config));
/*
* Amount::format
*/
$filter = new Twig_SimpleFilter(
'formatAmount', function ($string) {
return App::make('amount')->format($string);
}, ['is_safe' => ['html']]
);
Twig::addFilter($filter);
/*
* Amount::formatJournal
*/
$filter = new Twig_SimpleFilter(
'formatJournal', function ($journal) {
return App::make('amount')->formatJournal($journal);
}, ['is_safe' => ['html']]
);
Twig::addFilter($filter);
/*
* Steam::balance()
*/
$filter = new Twig_SimpleFilter(
'balance', function (Account $account = null) {
if (is_null($account)) {
return 'NULL';
}
return App::make('amount')->format(App::make('steam')->balance($account));
//return App::make('steam')->balance($account);
},['is_safe' => ['html']]
);
Twig::addFilter($filter);
/*
* Current active route.
*/
$filter = new Twig_SimpleFilter(
'activeRoute', function ($string) {
if (Route::getCurrentRoute()->getName() == $string) {
return 'active';
}
return '';
}
);
Twig::addFilter($filter);
/*
* Amount::getCurrencyCode()
*/
$function = new Twig_SimpleFunction(
'getCurrencyCode', function () {
return App::make('amount')->getCurrencyCode();
}
);
Twig::addFunction($function);
/*
* env
*/
$function = new Twig_SimpleFunction(
'env', function ($a, $b) {
return env($a, $b);
}
);
Twig::addFunction($function);
Twig::addExtension(new TwigSupport);
}
public function register()