Compare commits

...

5 Commits

17 changed files with 1937 additions and 1867 deletions

View File

@ -10,4 +10,4 @@ docs.helpers=${docs.themedir}/path.js
git=git
git.docs=gh-pages
git.master=master
version=1.1.4
version=1.1.5

View File

@ -1,32 +1,48 @@
{
"name": "canteen/html5",
"name": "mibew/html5",
"description" : "Create dynamic, valid HTML5 markup with a simple an intuitive PHP API",
"version" : "1.1.4",
"version" : "1.1.5",
"type": "library",
"keywords": ["html5", "markup", "document", "html", "tags"],
"keywords": [
"html5",
"markup",
"document",
"html",
"tags"
],
"license": "MIT",
"homepage" : "http://github.com/Canteen/CanteenHTML5",
"time": "2014-10-31",
"homepage" : "http://github.com/Mibew/CanteenHTML5",
"time": "2021-07-09",
"authors": [
{
"name": "Matt Karl",
"email": "matt@mattkarl.com",
"homepage": "http://github.com/bigtimebuddy",
"role": "Developer"
"homepage": "http://github.com/bigtimebuddy"
},
{
"name": "Mibew Messenger project",
"homepage": "https://mibew.org/"
}
],
"autoload": {
"psr-4": {"Canteen\\HTML5\\": "src/"},
"files": ["src/HTML5.php"]
"psr-4": {
"Canteen\\HTML5\\": "src/"
},
"files": [
"src/HTML5.php"
]
},
"require": {
"php": ">=5.3.0"
},
"replace": {
"canteen/html5": "~1.1.4"
},
"minimum-stability": "dev",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/Canteen/CanteenHTML5"
"url": "https://github.com/Mibew/CanteenHTML5"
}
]
}

View File

@ -53,5 +53,3 @@
// Output the result formatted nice with indents
echo $doc;
?>

View File

@ -135,10 +135,14 @@ namespace Canteen\HTML5
public function __get($name)
{
if (method_exists($this , $method =('get' . ucfirst($name))))
{
return $this->$method();
}
else
{
throw new HTML5Error(HTML5Error::INVALID_GETTER, $name);
}
}
/**
* General purpose setter for setting attribute->name and attribute->value
@ -149,10 +153,14 @@ namespace Canteen\HTML5
public function __set($name, $value)
{
if (method_exists($this , $method =('set' . ucfirst($name))))
{
return $this->$method($value);
}
else
{
throw new HTML5Error(HTML5Error::INVALID_SETTER, $name);
}
}
/**
* See if a property exists
@ -166,5 +174,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -34,5 +34,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -86,7 +86,9 @@ namespace Canteen\HTML5
{
$result = $this->docType . parent::__toString();
if ($this->beautify)
{
$result = self::beautify($result);
}
return $result;
}
@ -113,5 +115,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -39,5 +39,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -22,7 +22,10 @@ namespace Canteen\HTML5
spl_autoload_register(function($name)
{
// Ignore class names not in the HTML5 namespace
if (!preg_match('/^Canteen\\\HTML5\\\/', $name)) return;
if (!preg_match('/^Canteen\\\HTML5\\\/', $name))
{
return;
}
// Remove the HTML5 namespace
$name = preg_replace('/^Canteen\\\HTML5\\\/', '', $name);
@ -160,7 +163,9 @@ namespace Canteen\HTML5
$node->id = substr($selector, 1);
break;
case '.' :
if ($node->class) $node->class .= ' ';
if ($node->class) {
$node->class .= ' ';
}
$node->class .= substr($selector, 1);
break;
}

View File

@ -140,5 +140,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -12,11 +12,12 @@ namespace Canteen\HTML5
* echo html('br');
*
* @class Node
* @extends Proto
* @constructor
* @param {String} [tag=null] The name of the tag
* @param {Array|String} [attributes=null] The collection of tag attributes
*/
class Node
class Node extends Proto
{
/**
* The string name of the tag
@ -138,9 +139,13 @@ namespace Canteen\HTML5
if ($attribute->name === $name)
{
if (!$this->isEmpty($value))
{
$attribute->value = $value;
}
else
{
unset($this->_attributes[$i]);
}
return $this;
}
}
@ -336,5 +341,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -233,5 +233,3 @@ namespace Canteen\HTML5
}
}
}
?>

37
src/Proto.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/**
* @module Canteen\HTML5
*/
namespace Canteen\HTML5
{
/**
* Prototype class for all Canteen\HTML5 entities
*
* @class Proto
* @constructor
* @param {String} text the plain text string
*/
class Proto
{
/**
* General purpose getter to get attribute values
* @method __get
* @param {String} name The name of the property to set
*/
public function __get($name)
{
return null;
}
/**
* See if a property exists
* @method __isset
* @param {String} name The name of the attribute
*/
public function __isset($name)
{
return null;
}
}
}

View File

@ -68,5 +68,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -58,7 +58,9 @@ namespace Canteen\HTML5
'target'
),
'bdo' => array(),
'blockquote' => array('cite'),
'blockquote' => array(
'cite'
),
'body' => array(),
'br' => array(),
'button' => array(
@ -82,7 +84,9 @@ namespace Canteen\HTML5
'cite' => array(),
'code' => array(),
'col' => null,
'colgroup' => array('span'),
'colgroup' => array(
'span'
),
'command' => array(
'checked',
'disabled',
@ -137,7 +141,9 @@ namespace Canteen\HTML5
'header' => array(),
'hgroup' => array(),
'hr' => array(),
'html' => array('manifest'),
'html' => array(
'manifest'
),
'img' => array(
'alt',
'crossorigin',
@ -207,7 +213,9 @@ namespace Canteen\HTML5
'sizes',
'type'
),
'map' => array('name'),
'map' => array(
'name'
),
'mark' => array(),
'menu' => array(),
'meta' => array(
@ -266,7 +274,9 @@ namespace Canteen\HTML5
'max',
'value'
),
'q' => array('cite'),
'q' => array(
'cite'
),
'rp' => array(),
'rt' => array(),
'ruby' => array(),
@ -290,18 +300,22 @@ namespace Canteen\HTML5
'size'
),
'small' => array(),
'source' => array('media',
'source' => array(
'media',
'src',
'type'
),
'span' => array(),
'strong' => array(),
'style' => array('media',
'style' => array(
'media',
'scoped',
'type'
),
'sub' => array(),
'table' => array('border'),
'table' => array(
'border'
),
'tbody' => array(),
'td' => array(
'colspan',
@ -329,7 +343,9 @@ namespace Canteen\HTML5
'scope'
),
'thead' => array(),
'time' => array('datetime'),
'time' => array(
'datetime'
),
'title' => array(),
'tr' => array(),
'track' => array(

View File

@ -72,7 +72,10 @@ namespace Canteen\HTML5
}
foreach ($d as $name=>$value)
{
if ($name == $checkbox) continue;
if ($name == $checkbox)
{
continue;
}
$td = html('td', $value, 'class=' . $name);
$row->addChild($td);
}
@ -82,5 +85,3 @@ namespace Canteen\HTML5
}
}
}
?>

View File

@ -35,5 +35,3 @@ namespace Canteen\HTML5
}
}
}
?>