Updated metadata integration to include support for 2.1's HTML5 data-…

…* attribute support.
qTip2 · Nov 23, 2010 · 7146245 · 7146245
1 parent 7c28181
commit 7146245
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 43 deletions.
diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue Nov 23 01:25:40 2010 +0000
+* Date: Tue Nov 23 01:40:57 2010 +0000
 */
 
 .ui-tooltip-accessible{

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Tue Nov 23 01:25:40 2010 +0000
+* Date: Tue Nov 23 01:40:57 2010 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1241,10 +1241,13 @@ function init(id, opts)
 	docBody = $(document.body),
 
 	// Grab metadata from element if plugin is present
-	metadata = (elem.metadata) ? sanitizeOptions(elem.metadata(opts.metadata)) : {},
+	metadata = (elem.metadata) ? elem.metadata(opts.metadata) : {},
+
+	// Check if the metadata returned is in HTML5 form and grab 'name' from the object instead
+	metadata5 = metadata && opts.metadata.type === 'html5' ? metadata[opts.metadata.name] : {},
 
 	// Create unique configuration object using metadata
-	config = $.extend(TRUE, {}, opts, metadata),
+	config = $.extend(TRUE, {}, opts, sanitizeOptions(metadata5 || metadata)),
 	posOptions = config.position,
 
 	// Use document body instead of document element if needed