From b422a736ffa92963001bb58e40652f6abc619d4c Mon Sep 17 00:00:00 2001 From: Aidan Boyle Date: Mon, 2 Jul 2012 15:30:05 +1200 Subject: [PATCH 1/2] Use local object for inlineSettings If the jquery.metadata plugin is in use then the original metadata object would be passed in as the timeEntry settings object. This meant that the element's metadata object would be extended with the timeEntry settings. --- jquery.timeentry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.timeentry.js b/jquery.timeentry.js index 1dbc245..c21248c 100644 --- a/jquery.timeentry.js +++ b/jquery.timeentry.js @@ -963,7 +963,7 @@ $.fn.timeEntry = function(options) { } else { // Check for settings on the control itself - var inlineSettings = ($.fn.metadata ? $(this).metadata() : {}); + var inlineSettings = $.extend({}, $.fn.metadata ? $(this).metadata() : {}); $.timeEntry._connectTimeEntry(this, $.extend(inlineSettings, options)); } } From 9b0d35bfd15737d1f8cc7d20cbf0684db7691e1a Mon Sep 17 00:00:00 2001 From: Aidan Boyle Date: Tue, 3 Jul 2012 09:55:13 +1200 Subject: [PATCH 2/2] Add metadata test --- tests/jquery.metadata.js | 120 +++++++++++++++++++++++++++++++++++++++ tests/metadata.html | 27 +++++++++ 2 files changed, 147 insertions(+) create mode 100644 tests/jquery.metadata.js create mode 100644 tests/metadata.html diff --git a/tests/jquery.metadata.js b/tests/jquery.metadata.js new file mode 100644 index 0000000..eb98e80 --- /dev/null +++ b/tests/jquery.metadata.js @@ -0,0 +1,120 @@ +/* + * Metadata - jQuery plugin for parsing metadata from elements + * + * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ + +/** + * Sets the type of metadata to use. Metadata is encoded in JSON, and each property + * in the JSON will become a property of the element itself. + * + * There are three supported types of metadata storage: + * + * attr: Inside an attribute. The name parameter indicates *which* attribute. + * + * class: Inside the class attribute, wrapped in curly braces: { } + * + * elem: Inside a child element (e.g. a script tag). The + * name parameter indicates *which* element. + * + * The metadata for an element is loaded the first time the element is accessed via jQuery. + * + * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements + * matched by expr, then redefine the metadata type and run another $(expr) for other elements. + * + * @name $.metadata.setType + * + * @example

This is a p

+ * @before $.metadata.setType("class") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from the class attribute + * + * @example

This is a p

+ * @before $.metadata.setType("attr", "data") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a "data" attribute + * + * @example

This is a p

+ * @before $.metadata.setType("elem", "script") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a nested script element + * + * @param String type The encoding type + * @param String name The name of the attribute to be used to get metadata (optional) + * @cat Plugins/Metadata + * @descr Sets the type of encoding to be used when loading metadata for the first time + * @type undefined + * @see metadata() + */ + +(function($) { + +$.extend({ + metadata : { + defaults : { + type: 'class', + name: 'metadata', + cre: /({.*})/, + single: 'metadata' + }, + setType: function( type, name ){ + this.defaults.type = type; + this.defaults.name = name; + }, + get: function( elem, opts ){ + var settings = $.extend({},this.defaults,opts); + // check for empty string in single property + if ( !settings.single.length ) settings.single = 'metadata'; + + var data = $.data(elem, settings.single); + // returned cached data if it already exists + if ( data ) return data; + + data = "{}"; + + if ( settings.type == "class" ) { + var m = settings.cre.exec( elem.className ); + if ( m ) + data = m[1]; + } else if ( settings.type == "elem" ) { + if( !elem.getElementsByTagName ) + return undefined; + var e = elem.getElementsByTagName(settings.name); + if ( e.length ) + data = $.trim(e[0].innerHTML); + } else if ( elem.getAttribute != undefined ) { + var attr = elem.getAttribute( settings.name ); + if ( attr ) + data = attr; + } + + if ( data.indexOf( '{' ) <0 ) + data = "{" + data + "}"; + + data = eval("(" + data + ")"); + + $.data( elem, settings.single, data ); + return data; + } + } +}); + +/** + * Returns the metadata object for the first member of the jQuery object. + * + * @name metadata + * @descr Returns element's metadata object + * @param Object opts An object contianing settings to override the defaults + * @type jQuery + * @cat Plugins/Metadata + */ +$.fn.metadata = function( opts ){ + return $.metadata.get( this[0], opts ); +}; + +})(jQuery); \ No newline at end of file diff --git a/tests/metadata.html b/tests/metadata.html new file mode 100644 index 0000000..acc0ace --- /dev/null +++ b/tests/metadata.html @@ -0,0 +1,27 @@ + + + + + + + + + + + + +
+
+ +
+ +