Merge pull request #24 from mjamilasfihani/development

Minor update

README.md

@@ -6,4 +6,4 @@ This library only need one file to be loaded.
 
 Open `AssetsLoader.php` and you will see the prototype there (for pre-loader page, if you set to true the jQuery will be autoloaded).
 
-Tips : Change your default route to `Landing.php` and it will display Coming Soon page. So you can more focus to finish your project :)
+Tips : Change your default route to `Landing.php` and it will display Coming Soon page. So you can more focus to finish your project :)

app/Controllers/Landing.php

@@ -4,15 +4,14 @@
 
 class Landing extends BaseController
 {
-
 	public function index()
 	{
-		return $this->__render('_landing_message', ['text' => 'Coming Soon']);
+		return self::render('_landing_message', ['text' => 'Coming Soon']);
 	}
 
 	//--------------------------------------------------------------------
 
-	protected function __render(string $name = '', array $data = [], array $options = [])
+	protected static function render(string $name = '', array $data = [], array $options = [])
 	{
 		// Load the html helper
 		helper('html');
@@ -28,5 +27,4 @@ protected function __render(string $name = '', array $data = [], array $options
 		// Render it
 		return $template->render(view($name, $data, $options));
 	}
-
-}
+}

app/Libraries/AssetsLoader.php

@@ -73,15 +73,16 @@
  * return $template->render(view('welcome_message'));
  */
 
+use App\Config\App;
+
 class AssetsLoader
 {
-
 	/**
 	 * Assets Loader Version
 	 *
 	 * @var const VERSION
 	 */
-	const VERSION = '1.3.0';
+	const VERSION = '1.3.1';
 
 	/**
 	 * Default CSS
@@ -262,18 +263,18 @@ class AssetsLoader
 	public function __construct(array $css = [], array $js = [], string $jquery = null)
 	{
 		// Load the config from app/Config/App.php
-		$app = config('App');
+		$config = new App();
 
 		// Set the config of charset
 		if ($this->charset == null)
 		{
-			$this->charset = $app->charset;
+			$this->charset = $config->charset;
 		}
 
 		// Set the config of language
 		if ($this->language == null)
 		{
-			$this->language = $app->defaultLocale;
+			$this->language = $config->defaultLocale;
 		}
 
 		// Set the config of favicon
@@ -490,5 +491,4 @@ public function render($view)
 	{
 		return $this->__header() . $view . $this->__footer();
 	}
-
-}
+}