Html data attributes are automatically encoded as JSON

Author: dg

src/Forms/Controls/BaseControl.php

@@ -253,7 +253,7 @@ public function getControl()
 			'id' => $this->getHtmlId(),
 			'required' => $this->isRequired(),
 			'disabled' => $this->isDisabled(),
-			'data-nette-rules' => Nette\Forms\Helpers::exportRules($this->rules),
+			'data-nette-rules' => Nette\Forms\Helpers::exportRules($this->rules) ?: NULL,
 		));
 	}
 

src/Forms/Controls/SubmitButton.php

@@ -118,7 +118,7 @@ public function getControl($caption = NULL)
 		}
 		return parent::getControl($caption)->addAttributes(array(
 			'formnovalidate' => $this->validationScope !== NULL,
-			'data-nette-validation-scope' => $scope ? json_encode($scope) : NULL,
+			'data-nette-validation-scope' => $scope ?: NULL,
 		));
 	}
 

src/Forms/Helpers.php

@@ -95,7 +95,7 @@ public static function generateHtmlName($id)
 	/**
 	 * @return array
 	 */
-	public static function exportRules(Rules $rules, $json = TRUE)
+	public static function exportRules(Rules $rules)
 	{
 		$payload = array();
 		foreach ($rules as $rule) {
@@ -108,7 +108,7 @@ public static function exportRules(Rules $rules, $json = TRUE)
 			if ($rule->branch) {
 				$item = array(
 					'op' => ($rule->isNegative ? '~' : '') . $op,
-					'rules' => static::exportRules($rule->branch, FALSE),
+					'rules' => static::exportRules($rule->branch),
 					'control' => $rule->control->getHtmlName()
 				);
 				if ($rule->branch->getToggles()) {
@@ -128,9 +128,7 @@ public static function exportRules(Rules $rules, $json = TRUE)
 
 			$payload[] = $item;
 		}
-		return $json
-			? ($payload ? Nette\Utils\Json::encode($payload) : NULL)
-			: $payload;
+		return $payload;
 	}