Html: refactoring of processing 'data' attribute

nette · Aug 5, 2015 · adedbf5 · adedbf5
1 parent 8b242c3
commit adedbf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/Utils/Html.php b/src/Utils/Html.php
@@ -507,7 +507,15 @@ public function attributes()
 		}
 
 		$s = '';
-		foreach ($this->attrs as $key => $value) {
+		$attrs = $this->attrs;
+		if (isset($attrs['data']) && is_array($attrs['data'])) { // deprecated
+			foreach ($attrs['data'] as $key => $value) {
+				$attrs['data-' . $key] = $value;
+			}
+			unset($attrs['data']);
+		}
+
+		foreach ($attrs as $key => $value) {
 			if ($value === NULL || $value === FALSE) {
 				continue;
 
@@ -520,22 +528,7 @@ public function attributes()
 				continue;
 
 			} elseif (is_array($value)) {
-				if ($key === 'data') { // deprecated
-					foreach ($value as $k => $v) {
-						if ($v !== NULL && $v !== FALSE) {
-							if (is_array($v)) {
-								$v = Json::encode($v);
-							}
-							$q = strpos($v, '"') === FALSE ? '"' : "'";
-							$s .= ' data-' . $k . '='
-								. $q . str_replace(array('&', $q), array('&amp;', $q === '"' ? '&quot;' : '&#39;'), $v)
-								. (strpos($v, '`') !== FALSE && strpbrk($v, ' <>"\'') === FALSE ? ' ' : '')
-								. $q;
-						}
-					}
-					continue;
-
-				} elseif (strncmp($key, 'data-', 5) === 0) {
+				if (strncmp($key, 'data-', 5) === 0) {
 					$value = Json::encode($value);
 
 				} else {

diff --git a/tests/Utils/Html.data.phpt b/tests/Utils/Html.data.phpt
@@ -21,7 +21,7 @@ test(function () { // deprecated
 	$el->{'data-x'} = 'x';
 	$el->data['mxss'] = '``two';
 
-	Assert::same('<div data-a="one" data-d="" data-e="two" data-mxss="``two " data-x="x"></div>', (string) $el);
+	Assert::same('<div data-x="x" data-a="one" data-d="" data-e="two" data-mxss="``two "></div>', (string) $el);
 });