← All changes | lib/pquery/gan_node_html.php +20 -19 0.9.2 → 2.2.1 View file →

		@@ -6,9 +6,9 @@
6	6	* @license http://opensource.org/licenses/LGPL-2.1 LGPL-2.1
7	7	* @package pQuery
8	8	*/
9	9
10		-namespace pQuery;
	10	+namespace pagelayerQuery;
11	11
12	12	/**
13	13	* Holds (x)html/xml tag information like tag name, attributes,
14	14	* parent, children, self close, etc.
		@@ -64,9 +64,9 @@
64	64	* Name of the selector class
65	65	* @var string
66	66	* @see select()
67	67	*/
68		- var $selectClass = 'pQuery\\HtmlSelector';
	68	+ var $selectClass = 'pagelayerQuery\\HtmlSelector';
69	69	/**
70	70	* Name of the parser class
71	71	* @var string
72	72	* @see setOuterText()
		@@ -71,9 +71,9 @@
71	71	* @var string
72	72	* @see setOuterText()
73	73	* @see setInnerText()
74	74	*/
75		- var $parserClass = 'pQuery\\Html5Parser';
	75	+ var $parserClass = 'pagelayerQuery\\Html5Parser';
76	76
77	77	/**
78	78	* Name of the class used for {@link addChild()}
79	79	* @var string
		@@ -82,39 +82,39 @@
82	82	/**
83	83	* Name of the class used for {@link addText()}
84	84	* @var string
85	85	*/
86		- var $childClass_Text = 'pQuery\\TextNode';
	86	+ var $childClass_Text = 'pagelayerQuery\\TextNode';
87	87	/**
88	88	* Name of the class used for {@link addComment()}
89	89	* @var string
90	90	*/
91		- var $childClass_Comment = 'pQuery\\CommentNode';
	91	+ var $childClass_Comment = 'pagelayerQuery\\CommentNode';
92	92	/**
93	93	* Name of the class used for {@link addContional()}
94	94	* @var string
95	95	*/
96		- var $childClass_Conditional = 'pQuery\\ConditionalTagNode';
	96	+ var $childClass_Conditional = 'pagelayerQuery\\ConditionalTagNode';
97	97	/**
98	98	* Name of the class used for {@link addCDATA()}
99	99	* @var string
100	100	*/
101		- var $childClass_CDATA = 'pQuery\\CdataNode';
	101	+ var $childClass_CDATA = 'pagelayerQuery\\CdataNode';
102	102	/**
103	103	* Name of the class used for {@link addDoctype()}
104	104	* @var string
105	105	*/
106		- var $childClass_Doctype = 'pQuery\\DoctypeNode';
	106	+ var $childClass_Doctype = 'pagelayerQuery\\DoctypeNode';
107	107	/**
108	108	* Name of the class used for {@link addXML()}
109	109	* @var string
110	110	*/
111		- var $childClass_XML = 'pQuery\\XmlNode';
	111	+ var $childClass_XML = 'pagelayerQuery\\XmlNode';
112	112	/**
113	113	* Name of the class used for {@link addASP()}
114	114	* @var string
115	115	*/
116		- var $childClass_ASP = 'pQuery\\AspEmbeddedNode';
	116	+ var $childClass_ASP = 'pagelayerQuery\\AspEmbeddedNode';
117	117
118	118	/**
119	119	* Parent node, null if none
120	120	* @var DomNode
		@@ -190,9 +190,9 @@
190	190	* with values equal to the attribute name will not output
191	191	* the value, e.g. selected="selected" will be selected.
192	192	* @var bool
193	193	*/
194		- var $attribute_shorttag = true;
	194	+ var $attribute_shorttag = false;
195	195
196	196	/**
197	197	* Function map used for the selector filter
198	198	* @var array
		@@ -335,9 +335,9 @@
335	335	foreach($this->attributes as $a => $v) {
336	336	$s .= ' '.$a;
337	337	if ((!$this->attribute_shorttag) || ($v !== $a)) {
338	338	$quote = '"';//(strpos($v, '"') === false) ? '"' : "'";
339		- $v = str_replace('"', '"', $v);
	339	+ $v = str_replace('"', '"', $v);
340	340	$s .= '='.$quote.$v.$quote;
341	341	}
342	342	}
343	343	return $s;
		@@ -394,9 +394,9 @@
394	394	* Similar to JavaScript outerText, will return full (html formatted) node
395	395	* @return string
396	396	*/
397	397	function getOuterText() {
398		- return html_entity_decode($this->toString(), ENT_QUOTES);
	398	+ return $this->toString();
399	399	}
400	400
401	401	/**
402	402	* Similar to JavaScript outerText, will replace node (and child nodes) with new text
		@@ -436,9 +436,9 @@
436	436	* Similar to JavaScript innerText, will return (html formatted) content
437	437	* @return string
438	438	*/
439	439	function getInnerText() {
440		- return html_entity_decode($this->toString(true, true, 1), ENT_QUOTES);
	440	+ return $this->toString(true, true, 1);
441	441	}
442	442
443	443	/**
444	444	* Similar to JavaScript innerText, will replace child nodes with new text
		@@ -463,9 +463,9 @@
463	463	* Similar to JavaScript plainText, will return text in node (and subnodes)
464	464	* @return string
465	465	*/
466	466	function getPlainText() {
467		- return preg_replace('`\s+`', ' ', html_entity_decode($this->toString(true, true, true), ENT_QUOTES));
	467	+ return preg_replace('`\s+`', ' ', $this->toString(true, true, true));
468	468	}
469	469
470	470	/**
471	471	* Return plaintext taking document encoding into account
		@@ -476,9 +476,9 @@
476	476	$enc = $this->getEncoding();
477	477	if ($enc !== false) {
478	478	$txt = mb_convert_encoding($txt, 'UTF-8', $enc);
479	479	}
480		- return preg_replace('`\s+`', ' ', html_entity_decode($txt, ENT_QUOTES, 'UTF-8'));
	480	+ return preg_replace('`\s+`', ' ', $txt);
481	481	}
482	482
483	483	/**
484	484	* Similar to JavaScript plainText, will replace child nodes with new text (literal)
		@@ -486,9 +486,9 @@
486	486	*/
487	487	function setPlainText($text) {
488	488	$this->clear();
489	489	if (trim($text)) {
490		- $this->addText(htmlentities($text, ENT_QUOTES));
	490	+ $this->addText($text);
491	491	}
492	492	}
493	493
494	494	/**
		@@ -1464,9 +1464,9 @@
1464	1464	function addClass($className) {
1465	1465	if (!is_array($className)) {
1466	1466	$className = array($className);
1467	1467	}
1468		- $class = $this->class;
	1468	+ $class = isset($this->class) ? $this->class : '';
1469	1469	foreach ($className as $c) {
1470	1470	if (!(preg_match('`\b'.preg_quote($c).'\b`si', $class) > 0)) {
1471	1471	$class .= ' '.$c;
1472	1472	}
		@@ -1922,9 +1922,9 @@
1922	1922	* @return IQuery Returns the matching nodes from the query.
1923	1923	*/
1924	1924	public function query($query = '*') {
1925	1925	$select = $this->select($query);
1926		- $result = new \pQuery((array)$select);
	1926	+ $result = new \pagelayerQuery((array)$select);
1927	1927	return $result;
1928	1928	}
1929	1929
1930	1930	/**
		@@ -2352,8 +2352,9 @@
2352	2352
2353	2353	return $this;
2354	2354	}
2355	2355
	2356	+ #[\ReturnTypeWillChange]
2356	2357	public function count() {
2357	2358	return 1;
2358	2359	}
2359	2360