Skip to content

Commit 7ad39bd

Browse files
committed
fix asset problem
1 parent 54c7fed commit 7ad39bd

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

src/Directives/ScriptDirective.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ public static function handle($parameter)
88
{
99
$parameter = str_replace(['"', "'"], null, $parameter);
1010
$array = explode(',', $parameter);
11-
$secure = trim(@$array[1]) == 'true' ? true : null;
12-
$url = asset(trim($array[0]), $secure);
11+
$url = trim($array[0]);
12+
$defer = trim(@$array[1]) ?? null;
1313

14-
$defer = trim(@$array[2]) ?? null;
1514
if ($defer) {
1615
return "<script src='{$url}' defer></script>";
1716
}

src/Directives/StyleDirective.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ class StyleDirective implements Directive
77
public static function handle($parameter)
88
{
99
$parameter = str_replace(['"', "'"], null, $parameter);
10-
$array = explode(',', $parameter);
11-
$secure = trim(@$array[1]) == 'true' ? true : null;
12-
$url = asset(trim($array[0]), $secure);
1310

14-
return "<link href='{$url}' rel='stylesheet'>";
11+
return "<link href='{$parameter}' rel='stylesheet'>";
1512
}
1613
}

tests/DirectivesTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,13 @@ public function testImageDirective()
147147

148148
public function testStyleDirective()
149149
{
150-
$this->assertEquals("<link href='http://localhost/style.css' rel='stylesheet'>", $this->compiler->compileString("@style('style.css')"));
151-
$this->assertEquals("<link href='https://localhost/style.css' rel='stylesheet'>", $this->compiler->compileString("@style('style.css', true)"));
150+
$this->assertEquals("<link href='/css/style.css' rel='stylesheet'>", $this->compiler->compileString("@style('/css/style.css')"));
152151
}
153152

154153
public function testScriptDirective()
155154
{
156-
$this->assertEquals("<script src='http://localhost/script.js' defer></script>", $this->compiler->compileString("@script('script.js', false, true)"));
157-
$this->assertEquals("<script src='http://localhost/script.js'></script>", $this->compiler->compileString("@script('script.js')"));
158-
$this->assertEquals("<script src='https://localhost/script.js'></script>", $this->compiler->compileString("@script('script.js', true)"));
159-
$this->assertEquals("<script src='https://localhost/script.js' defer></script>", $this->compiler->compileString("@script('script.js', true, true)"));
155+
$this->assertEquals("<script src='/js/script.js'></script>", $this->compiler->compileString("@script('/js/script.js')"));
156+
$this->assertEquals("<script src='/js/script.js' defer></script>", $this->compiler->compileString("@script('/js/script.js', true)"));
160157
}
161158

162159
public function testConfigDirectiveStyle()

0 commit comments

Comments
 (0)