Skip to content

Commit 949c513

Browse files
dmolsendmolsen
committed
Merge branch 'feature-panels' into dev
2 parents 0a10e54 + 2f62595 commit 949c513

File tree

7 files changed

+39
-19
lines changed

7 files changed

+39
-19
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Pattern Lab Core
22

3-
This repository contains the core functionality for Pattern Lab. Pattern Lab Core is designed to be included as a dependency within Editions.
3+
This repository contains the core functionality for Pattern Lab. Pattern Lab Core is designed to be included as a dependency within Editions. Turn it up.

‎src/PatternLab/Builder.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,8 @@ protected function generatePatterns($options = array()) {
250250

251251
// modify the pattern mark-up
252252
$markup = $patternStoreData["code"];
253-
$markupEncoded = htmlentities($markup,ENT_COMPAT,"UTF-8");
254253
$markupFull = $patternStoreData["header"].$markup.$patternStoreData["footer"];
255-
$markupEngine = htmlentities(file_get_contents($patternSourceDir."/".$pathName.".".$patternExtension),ENT_COMPAT,"UTF-8");
254+
$markupEngine = file_get_contents($patternSourceDir."/".$pathName.".".$patternExtension);
256255

257256
// if the pattern directory doesn't exist create it
258257
if (!is_dir($patternPublicDir."/".$path)) {
@@ -262,7 +261,7 @@ protected function generatePatterns($options = array()) {
262261
// write out the various pattern files
263262
file_put_contents($patternPublicDir."/".$path."/".$path.".html",$markupFull);
264263
if (!$exportFiles) {
265-
file_put_contents($patternPublicDir."/".$path."/".$path.".escaped.html",$markupEncoded);
264+
file_put_contents($patternPublicDir."/".$path."/".$path.".markup-only.html",$markup);
266265
file_put_contents($patternPublicDir."/".$path."/".$path.".".$patternExtension,$markupEngine);
267266
}
268267
/*

‎src/PatternLab/PatternData/Exporters/PatternPartialsExporter.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function run($type = "", $subtype = "") {
5151
$patternPartialData["patternLink"] = $patternStoreData["pathDash"]."/".$patternStoreData["pathDash"].".html";
5252
$patternPartialData["patternPartial"] = $patternStoreData["partial"];
5353
$patternPartialData["patternPartialCode"] = $patternStoreData["code"];
54+
$patternPartialData["patternState"] = $patternStoreData["state"];
5455

5556
$patternPartialData["patternLineageExists"] = isset($patternStoreData["lineages"]);
5657
$patternPartialData["patternLineages"] = isset($patternStoreData["lineages"]) ? $patternStoreData["lineages"] : array();
@@ -85,6 +86,21 @@ public function run($type = "", $subtype = "") {
8586

8687
}
8788

89+
} else if (($patternStoreData["category"] == "patternSubtype") && (!in_array($patternStoreData["type"],$styleGuideExcludes))) {
90+
91+
if ((($patternStoreData["type"] == $type) && empty($subtype)) || (empty($type) && empty($subtype)) || (($patternStoreData["type"] == $type) && ($patternStoreData["name"] == $subtype))) {
92+
93+
$patternPartialData = array();
94+
$patternPartialData["patternName"] = ucwords($patternStoreData["nameClean"]);
95+
$patternPartialData["patternLink"] = $patternStoreData["pathDash"]."/index.html";
96+
$patternPartialData["patternPartial"] = $patternStoreData["partial"];
97+
$patternPartialData["patternSectionSubtype"] = isset($patternStoreData["descExists"]);
98+
$patternPartialData["patternDesc"] = isset($patternStoreData["desc"]) ? $patternStoreData["desc"] : "";
99+
100+
$patternPartials[] = $patternPartialData;
101+
102+
}
103+
88104
}
89105

90106
}

‎src/PatternLab/PatternData/Rules/DocumentationRule.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
9292

9393
// if the pattern data store already exists make sure this data overwrites it
9494
$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;
95-
PatternData::setOption($patternStoreKey, $patternStoreData);
95+
PatternData::setOption($patternStoreKey, $patternStoreData);
9696

9797
}
9898

‎src/PatternLab/PatternData/Rules/PatternRule.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
7777
"nameClean" => $patternClean,
7878
"type" => $patternType,
7979
"typeDash" => $patternTypeDash,
80-
"breadcrumb" => $patternTypeClean,
80+
"breadcrumb" => array("patternType" => $patternTypeClean),
8181
"state" => $patternState,
8282
"hidden" => $hidden,
8383
"noviewall" => $noviewall,
@@ -97,7 +97,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
9797
if ($depth > 1) {
9898
$patternStoreData["subtype"] = $patternSubtype;
9999
$patternStoreData["subtypeDash"] = $patternSubtypeDash;
100-
$patternStoreData["breadcrumb"] = $patternTypeClean." > ".$patternSubtypeClean;
100+
$patternStoreData["breadcrumb"] = array("patternType" => $patternTypeClean, "patternSubtype" => $patternSubtypeClean);
101101
}
102102

103103
// if the pattern data store already exists make sure it is merged and overwrites this data

‎src/PatternLab/PatternData/Rules/PatternSubtypeRule.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public function run($depth, $ext, $path, $pathName, $name) {
4545
$patternSubtypePath = $pathName; // 00-atoms/02-blocks
4646
$patternSubtypePathDash = str_replace($dirSep,"-",$patternSubtypePath); // 00-atoms-02-blocks (file path)
4747

48+
$patternPartial = "viewall-".$patternTypeDash."-".$patternSubtypeDash;
49+
4850
// create a key for the data store
4951
$patternStoreKey = $patternTypeDash."-".$patternSubtypeDash."-plsubtype";
5052

@@ -53,9 +55,10 @@ public function run($depth, $ext, $path, $pathName, $name) {
5355
"name" => $patternSubtype,
5456
"nameDash" => $patternSubtypeDash,
5557
"nameClean" => $patternSubtypeClean,
58+
"partial" => $patternPartial,
5659
"type" => $patternType,
5760
"typeDash" => $patternTypeDash,
58-
"breadcrumb" => $patternTypeClean,
61+
"breadcrumb" => array("patternType" => $patternTypeClean),
5962
"depth" => $depth,
6063
"ext" => $ext,
6164
"path" => $path,

‎src/PatternLab/PatternData/Rules/PseudoPatternRule.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ public function __construct($options) {
3737
public function run($depth, $ext, $path, $pathName, $name) {
3838

3939
// load default vars
40-
$patternSubtype = PatternData::getPatternSubtype();
41-
$patternSubtypeDash = PatternData::getPatternSubtypeDash();
42-
$patternType = PatternData::getPatternType();
43-
$patternTypeDash = PatternData::getPatternTypeDash();
44-
$dirSep = PatternData::getDirSep();
45-
$frontMeta = PatternData::getFrontMeta();
40+
$patternSubtype = PatternData::getPatternSubtype();
41+
$patternSubtypeClean = PatternData::getPatternSubtypeClean();
42+
$patternSubtypeDash = PatternData::getPatternSubtypeDash();
43+
$patternType = PatternData::getPatternType();
44+
$patternTypeClean = PatternData::getPatternTypeClean();
45+
$patternTypeDash = PatternData::getPatternTypeDash();
46+
$dirSep = PatternData::getDirSep();
47+
$frontMeta = PatternData::getFrontMeta();
4648

4749
// should this pattern get rendered?
4850
$hidden = ($name[0] == "_");
@@ -95,7 +97,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
9597
"nameClean" => $patternClean,
9698
"type" => $patternType,
9799
"typeDash" => $patternTypeDash,
98-
"breadcrumb" => $patternType,
100+
"breadcrumb" => array("patternType" => $patternTypeClean),
99101
"state" => $patternState,
100102
"hidden" => $hidden,
101103
"noviewall" => $noviewall,
@@ -115,12 +117,12 @@ public function run($depth, $ext, $path, $pathName, $name) {
115117
if ($depth > 1) {
116118
$patternStoreData["subtype"] = $patternSubtype;
117119
$patternStoreData["subtypeDash"] = $patternSubtypeDash;
118-
$patternStoreData["breadcrumb"] = $patternType." > ".$patternSubtype;
120+
$patternStoreData["breadcrumb"] = array("patternType" => $patternTypeClean, "patternSubtype" => $patternSubtypeClean);
119121
}
120122

121123
$patternDataBase = array();
122-
if (file_exists(Config::getOption("patternSourceDir")."/".$path."/".$patternBaseData)) {
123-
$data = file_get_contents(Config::getOption("patternSourceDir")."/".$path."/".$patternBaseData);
124+
if (file_exists(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$patternBaseData)) {
125+
$data = file_get_contents(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$patternBaseData);
124126
if ($ext == "json") {
125127
$patternDataBase = json_decode($data,true);
126128
if ($jsonErrorMessage = JSON::hasError()) {
@@ -144,7 +146,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
144146
}
145147

146148
// get the data for the pseudo-pattern
147-
$data = file_get_contents(Config::getOption("patternSourceDir")."/".$pathName);
149+
$data = file_get_contents(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$pathName);
148150
if ($ext == "json") {
149151
$patternData = json_decode($data,true);
150152
if ($jsonErrorMessage = JSON::hasError()) {

0 commit comments

Comments
 (0)