Skip to content

Commit d922062

Browse files
committed
updating to work the way you'd expect it to work with in-code generation
1 parent e0f0acc commit d922062

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/BladeStrap.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ protected static function trim($param) {
1616

1717
public static function panel($expression) {
1818
$params = static::getParams($expression);
19-
$title = static::trim($params[0]);
20-
$class = isset($params[1]) ? "panel-".static::trim($params[1]) : "panel-default";
19+
$title = trim($params[0]);
20+
$class = isset($params[1]) ? "'panel-".static::trim($params[1])."'" : "'panel-default'";
2121

22-
$html = "<div class='panel {$class}'>";
22+
$html = "<div class='panel <?={$class}?>'>";
2323
if ($title) {
24-
$html .= "<div class='panel-heading'><h3 class='panel-title'>{$title}</h3></div>";
24+
$html .= "<div class='panel-heading'><h3 class='panel-title'><?={$title}?></h3></div>";
2525
}
2626
$html .= "<div class='panel-body'>";
2727

@@ -37,11 +37,11 @@ public static function endPanel($expression) {
3737

3838
public static function alert($expression) {
3939
$params = static::getParams($expression);
40-
$title = static::trim($params[0]);
41-
$class = isset($params[1]) ? "alert-".static::trim($params[1]) : "alert-info";
40+
$title = trim($params[0]);
41+
$class = isset($params[1]) ? "'alert-".static::trim($params[1])."'" : "'alert-info'";
4242

4343

44-
$html = "<div class='alert {$class}'>";
44+
$html = "<div class='alert <?={$class}?>'>";
4545
if ($title) {
4646
$html .= "<h5>{$title}</h5>";
4747
}

tests/BladeTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ class BladeTest extends TestCase
1111
public function testPanel(){
1212
//default panel
1313
$string = BladeStrap::panel("");
14-
$this->assertEquals("<div class='panel panel-default'><div class='panel-body'>", $string);
14+
$this->assertEquals("<div class='panel <?='panel-default'?>'><div class='panel-body'>", $string);
1515

1616
//string titles get passed to result
1717
$string = BladeStrap::panel("'Test Title'");
18-
$this->assertContains(">Test Title<", $string);
18+
$this->assertContains("Test Title", $string);
1919

2020
//variable titles get passed to result
2121
$string = BladeStrap::panel('$title');
22-
$this->assertContains('>$title<', $string);
22+
$this->assertContains('$title', $string);
2323

2424
//custom panel types titles
2525
$string = BladeStrap::panel('($title, "primary")');
@@ -37,15 +37,15 @@ public function testEndPanel(){
3737
public function testAlert(){
3838
//default
3939
$string = BladeStrap::alert("");
40-
$this->assertEquals("<div class='alert alert-info'>", $string);
40+
$this->assertEquals("<div class='alert <?='alert-info'?>'>", $string);
4141

4242
//string titles get passed to result
4343
$string = BladeStrap::alert("'Test Title'");
44-
$this->assertContains(">Test Title<", $string);
44+
$this->assertContains("Test Title", $string);
4545

4646
//variable titles get passed to result
4747
$string = BladeStrap::alert('$title');
48-
$this->assertContains('>$title<', $string);
48+
$this->assertContains('$title', $string);
4949

5050
//custom alert types titles
5151
$string = BladeStrap::alert('($title, "primary")');

0 commit comments

Comments
 (0)