File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 1313
1414use CodeIgniter\Config\BaseConfig;
1515
16- class Assets extends \Tatter\Assets\Config
16+ class Assets extends \Tatter\Assets\Config\Assets
1717{
1818 // location of asset files in the filesystem
1919 public $fileBase = FCPATH . "assets/";
2020
21- // location of asset files via URL
22- public $webBase = base_url(' assets/') ;
21+ // location of asset files via URL; can be relative or full URL
22+ public $webBase = 'https://example.com/ assets/';
2323
2424 // additional assets to load per route - no leading/trailing slashes
2525 public $routes = [
Original file line number Diff line number Diff line change @@ -48,6 +48,14 @@ public function __construct($config = null)
4848
4949 // save configuration
5050 $ this ->config = $ config ;
51+
52+ // if no webBase is set use website URL
53+ if (empty ($ this ->config ->webBase ))
54+ $ this ->config ->webBase = base_url ();
55+
56+ // if URL is relative expand it with base URL
57+ elseif (! filter_var ($ this ->config ->webBase , FILTER_VALIDATE_URL ))
58+ $ this ->config ->webBase = base_url ($ this ->config ->webBase );
5159 }
5260
5361 // returns route-relevant and preconfigured assets of a given extension
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ class Assets extends BaseConfig
88 public $ fileBase = FCPATH . "assets/ " ;
99
1010 // location of asset files via URL
11- public $ webBase = base_url ( 'assets/ ' ) ;
11+ public $ webBase = 'assets/ ' ;
1212
1313 // additional assets to load per route - no leading/trailing slashes
1414 public $ routes = [ ];
You can’t perform that action at this time.
0 commit comments