MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTM…

…L5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable
silverstripe · Feb 17, 2012 · ac56fef · ac56fef
1 parent 9190bc4
commit ac56fef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -239,7 +239,6 @@ function init() {
 				THIRDPARTY_DIR . '/jquery-cookie/jquery.cookie.js',
 				THIRDPARTY_DIR . '/jquery-query/jquery.query.js',
 				SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.js',
-				THIRDPARTY_DIR . '/jquery-metadata/jquery.metadata.js',
 				SAPPHIRE_ADMIN_DIR . '/thirdparty/jsizes/lib/jquery.sizes.js',
 				SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jlayout.border.js',
 				SAPPHIRE_ADMIN_DIR . '/thirdparty/jlayout/lib/jquery.jlayout.js',

diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
@@ -4,8 +4,6 @@ jQuery.noConflict();
  * File: LeftAndMain.js
  */
 (function($) {
-	$.metadata.setType('html5');
-
 	// setup jquery.entwine
 	$.entwine.warningLevel = $.entwine.WARN_LEVEL_BESTPRACTISE;
 	$.entwine('ss', function($) {
@@ -347,7 +345,7 @@ jQuery.noConflict();
 		 */
 		$('.cms-container .field.date input.text').entwine({
 			onmatch: function() {
-				var holder = $(this).parents('.field.date:first'), config = holder.metadata({type: 'class'});
+				var holder = $(this).parents('.field.date:first'), config = holder.data();
 				if(!config.showcalendar) return;
 
 				config.showOn = 'button';