aboutsummaryrefslogtreecommitdiffstats
path: root/include/classes
diff options
context:
space:
mode:
Diffstat (limited to 'include/classes')
-rwxr-xr-xinclude/classes/BigPipe/BigPipe.php22
-rwxr-xr-xinclude/classes/BigPipe/Pagelet.php30
2 files changed, 33 insertions, 19 deletions
diff --git a/include/classes/BigPipe/BigPipe.php b/include/classes/BigPipe/BigPipe.php
index 39a812d..8cdda0b 100755
--- a/include/classes/BigPipe/BigPipe.php
+++ b/include/classes/BigPipe/BigPipe.php
@@ -33,21 +33,23 @@ class BigPipe {
# Prints a single pagelet response
#===============================================================================
private static function singleResponse(Pagelet $Pagelet, $last = FALSE) {
- $data = [
+ $pageletJSON = [
'ID' => $Pagelet->getID(),
'RESOURCES' => ['CSS' => $Pagelet->getCSSFiles(), 'JS' => $Pagelet->getJSFiles(), 'JS_CODE' => removeLineBreaksAndTabs($Pagelet->getJSCode())],
- 'PHASES' => (object) $Pagelet->getPhaseDoneJS(),
+ 'PHASES' => (object) $Pagelet->getPhaseDoneJS()
];
if($last) {
- $data['IS_LAST'] = true;
+ $pageletJSON['IS_LAST'] = true;
}
- $pageletHTML = str_replace('--', '--', removeLineBreaksAndTabs($Pagelet->getHTML()));
- $pageletJSON = json_encode($data, (self::$debug ? JSON_PRETTY_PRINT : FALSE));
+ $pageletHTML = removeLineBreaksAndTabs($Pagelet->getHTML());
+ $pageletHTML = str_replace('--', '--', $pageletHTML);
+
+ $pageletJSON = json_encode($pageletJSON, (self::$debug ? JSON_PRETTY_PRINT : NULL));
echo "<code class=\"hidden\" id=\"_{$Pagelet->getID()}\"><!-- {$pageletHTML} --></code>\n";
- echo "<script>BigPipe.onPageletArrive({$pageletJSON}, (document.getElementById(\"_{$Pagelet->getID()}\")));</script>\n\n";
+ echo "<script>BigPipe.onPageletArrive({$pageletJSON}, document.getElementById(\"_{$Pagelet->getID()}\"));</script>\n\n";
}
#===============================================================================
@@ -71,15 +73,15 @@ class BigPipe {
foreach($pagelets as $Pagelet) {
if(!self::isEnabled()) {
foreach($Pagelet->getCSSFiles() as $CSSFile) {
- echo '<link href="'.$CSSFile.'" rel="stylesheet" />'."\n";
+ echo "<link href=\"{$CSSFile}\" rel=\"stylesheet\" />\n";
}
foreach($Pagelet->getJSFiles() as $JSFile) {
- echo '<script src="'.$JSFile.'"></script>'."\n";
+ echo "<script src=\"{$JSFile}\"></script>\n";
}
- if($Pagelet->getJSCode()) {
- echo '<script>'.$Pagelet->getJSCode().'</script>'."\n";
+ foreach($Pagelet->getJSCode() as $JSCode) {
+ echo "<script>{$JSCode}</script>\n";
}
}
diff --git a/include/classes/BigPipe/Pagelet.php b/include/classes/BigPipe/Pagelet.php
index 36b13ea..22aadce 100755
--- a/include/classes/BigPipe/Pagelet.php
+++ b/include/classes/BigPipe/Pagelet.php
@@ -4,10 +4,11 @@ namespace BigPipe;
class Pagelet {
private $ID = NULL;
private $HTML = '';
- private $JSCode = '';
+ private $JSCode = [];
private $JSFiles = [];
private $CSSFiles = [];
private $phaseDoneJS = [];
+ private $tagname = 'div';
private static $count = 0;
#===============================================================================
@@ -29,7 +30,7 @@ class Pagelet {
const PHASE_EXECJS = 4; # After the static JS code has been executed
public function __construct($customID = NULL, $priority = self::PRIORITY_NORMAL) {
- $this->phaseDoneJS = array_pad([], 5, []);
+ $this->phaseDoneJS = array_pad($this->phaseDoneJS, 5, []);
$this->ID = is_string($customID) ? $customID : 'P'.++self::$count;
BigPipe::addPagelet($this, $priority);
@@ -80,22 +81,22 @@ class Pagelet {
#===============================================================================
# Attach a CSS resource
#===============================================================================
- public function addCSS($file) {
- return $this->CSSFiles[] = $file;
+ public function addCSS($href) {
+ return $this->CSSFiles[] = $href;
}
#===============================================================================
# Attach a JS resource
#===============================================================================
- public function addJS($file) {
- return $this->JSFiles[] = $file;
+ public function addJS($href) {
+ return $this->JSFiles[] = $href;
}
#===============================================================================
- # Add JS code or attach more
+ # Attach a main JS code part
#===============================================================================
public function addJSCode($code) {
- return $this->JSCode .= $code;
+ return $this->JSCode[] = $code;
}
#===============================================================================
@@ -113,9 +114,20 @@ class Pagelet {
}
#===============================================================================
+ # Set custom placeholder tagname
+ #===============================================================================
+ public function setTagname($tagname) {
+ return $this->tagname = $tagname;
+ }
+
+ #===============================================================================
# Magic method: __toString()
#===============================================================================
public function __toString() {
- return '<div id="'.$this->getID().'">'.((!BigPipe::isEnabled()) ? $this->getHTML() : NULL).'</div>';
+ $pageletHTML = "<{$this->tagname} id=\"{$this->getID()}\">";
+ $pageletHTML .= !BigPipe::isEnabled() ? $this->getHTML() : NULL;
+ $pageletHTML .= "</{$this->tagname}>";
+
+ return $pageletHTML;
}
} \ No newline at end of file