From 8c503069b8b4c1de414de1b161c058e1c0b596f7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 16 Feb 2012 18:06:48 +0100 Subject: [PATCH] MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTML5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable --- code/controllers/CMSPageHistoryController.php | 9 ++++----- javascript/CMSPageHistoryController.js | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/controllers/CMSPageHistoryController.php b/code/controllers/CMSPageHistoryController.php index 137765af..e18e9c9a 100644 --- a/code/controllers/CMSPageHistoryController.php +++ b/code/controllers/CMSPageHistoryController.php @@ -221,11 +221,10 @@ class CMSPageHistoryController extends CMSMain { $hiddenID->setValue($id); $form->unsetValidator(); - $form->addExtraClass('cms-versions-form'); // placeholder, necessary for $.metadata() to work - $form->addExtraClass(Convert::raw2json(array( - 'link-tmpl-compare' => Controller::join_links($this->Link('compare'), '%s', '%s', '%s'), - 'link-tmpl-show' => Controller::join_links($this->Link('show'), '%s', '%s'), - ))); + $form + ->addExtraClass('cms-versions-form') // placeholder, necessary for $.metadata() to work + ->setAttribute('data-link-tmpl-compare', Controller::join_links($this->Link('compare'), '%s', '%s', '%s')) + ->setAttribute('data-link-tmpl-show', Controller::join_links($this->Link('show'), '%s', '%s')); return $form; } diff --git a/javascript/CMSPageHistoryController.js b/javascript/CMSPageHistoryController.js index b5e486fd..ab6a0bc2 100644 --- a/javascript/CMSPageHistoryController.js +++ b/javascript/CMSPageHistoryController.js @@ -57,9 +57,8 @@ if(!id) return false; - var button, url, selected, to, from, compare, data, metadata; + var button, url, selected, to, from, compare, data; - metadata = this.metadata({type: 'class'}); compare = (this.find(":input[name=CompareMode]").is(":checked")); selected = this.find("table input[type=checkbox]").filter(":checked"); @@ -69,12 +68,12 @@ to = selected.eq(0).val(); from = selected.eq(1).val(); button = this.find(':submit[name=action_doCompare]'); - url = ss.i18n.sprintf(metadata['link-tmpl-compare'], id,from,to); + url = ss.i18n.sprintf(this.data('linkTmplCompare'), id,from,to); } else { to = selected.eq(0).val(); button = this.find(':submit[name=action_doShowVersion]'); - url = ss.i18n.sprintf(metadata['link-tmpl-show'], id,to); + url = ss.i18n.sprintf(this.data('linkTmplShow'), id,to); } $('.cms-container').loadPanel(url, '', {selector: '.cms-edit-form'});