From a196135089694eca883bde9b7ba48eea5b68e438 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Feb 2012 17:14:08 +0100
Subject: [PATCH] API CHANGE Replace jQuery.metadata in DateField markup with
 HTML5 data attributes

---
 forms/DateField.php     | 3 +--
 javascript/DateField.js | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/forms/DateField.php b/forms/DateField.php
index 1d0f1e436..1582f70f4 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -136,7 +136,7 @@ class DateField extends TextField {
 		}
 		
 		$config = array_filter($config);
-		$this->addExtraClass(Convert::raw2json($config));
+		foreach($config as $k => $v) $this->setAttribute('data-' . $k, $v);
 		
 		// Three separate fields for day, month and year
 		if($this->getConfig('dmyfields')) {
@@ -615,7 +615,6 @@ class DateField_View_JQuery {
 					));
 			}
 			
-			Requirements::javascript(THIRDPARTY_DIR . "/jquery-metadata/jquery.metadata.js");
 			Requirements::javascript(SAPPHIRE_DIR . "/javascript/DateField.js");
 		}
 		
diff --git a/javascript/DateField.js b/javascript/DateField.js
index 3861ca1b9..fcbc0bb4f 100644
--- a/javascript/DateField.js
+++ b/javascript/DateField.js
@@ -5,10 +5,10 @@
 			return $(this).each(function() {
 				if($(this).data('datepicker')) return; // already applied
 
-				this.siblings("button").addClass("ui-icon ui-icon-calendar");
+				$(this).siblings("button").addClass("ui-icon ui-icon-calendar");
 				
 				var holder = $(this).parents('.field.date:first'), 
-					config = $.extend(opts || {}, $(this).metadata({type: 'class'}), {});
+					config = $.extend(opts || {}, $(this).data(), {});
 				if(!config.showcalendar) return;
 	
 				if(config.locale && $.datepicker.regional[config.locale]) {