MINOR Updated jquery-metadata to v2.1 (removed piston as the release is not contained in the canonical git repo)

This commit is contained in:
Ingo Schommer 2011-04-16 15:10:28 +12:00
parent 03547fb205
commit 7bee470209
2 changed files with 76 additions and 58 deletions

View File

@ -1,8 +0,0 @@
---
format: 1
handler:
commit: 0dbb5ec89ce8f493e33b83433b03d6feaec867fc
branch: master
lock: false
repository_url: git://github.com/jquery/jquery-metadata.git
repository_class: Piston::Git::Repository

View File

@ -7,7 +7,7 @@
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html * http://www.gnu.org/licenses/gpl.html
* *
* Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $ * Revision: $Id: jquery.metadata.js 3640 2007-10-11 18:34:38Z pmclanahan $
* *
*/ */
@ -15,7 +15,7 @@
* Sets the type of metadata to use. Metadata is encoded in JSON, and each property * 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. * in the JSON will become a property of the element itself.
* *
* There are three supported types of metadata storage: * There are four supported types of metadata storage:
* *
* attr: Inside an attribute. The name parameter indicates *which* attribute. * attr: Inside an attribute. The name parameter indicates *which* attribute.
* *
@ -23,6 +23,7 @@
* *
* elem: Inside a child element (e.g. a script tag). The * elem: Inside a child element (e.g. a script tag). The
* name parameter indicates *which* element. * name parameter indicates *which* element.
* html5: Values are stored in data-* attributes.
* *
* The metadata for an element is loaded the first time the element is accessed via jQuery. * The metadata for an element is loaded the first time the element is accessed via jQuery.
* *
@ -46,6 +47,11 @@
* @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
* @desc Reads metadata from a nested script element * @desc Reads metadata from a nested script element
* *
* @example <p id="one" class="some_class" data-item_id="1" data-item_label="Label">This is a p</p>
* @before $.metadata.setType("html5")
* @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
* @desc Reads metadata from a series of data-* attributes
*
* @param String type The encoding type * @param String type The encoding type
* @param String name The name of the attribute to be used to get metadata (optional) * @param String name The name of the attribute to be used to get metadata (optional)
* @cat Plugins/Metadata * @cat Plugins/Metadata
@ -79,13 +85,36 @@ $.extend({
data = "{}"; data = "{}";
var getData = function(data) {
if(typeof data != "string") return data;
if( data.indexOf('{') < 0 ) {
data = eval("(" + data + ")");
}
}
var getObject = function(data) {
if(typeof data != "string") return data;
data = eval("(" + data + ")");
return data;
}
if ( settings.type == "html5" ) {
var object = {};
$( elem.attributes ).each(function() {
var name = this.nodeName;
if(name.match(/^data-/)) name = name.replace(/^data-/, '');
else return true;
object[name] = getObject(this.nodeValue);
});
} else {
if ( settings.type == "class" ) { if ( settings.type == "class" ) {
var m = settings.cre.exec( elem.className ); var m = settings.cre.exec( elem.className );
if ( m ) if ( m )
data = m[1]; data = m[1];
} else if ( settings.type == "elem" ) { } else if ( settings.type == "elem" ) {
if( !elem.getElementsByTagName ) if( !elem.getElementsByTagName ) return;
return undefined;
var e = elem.getElementsByTagName(settings.name); var e = elem.getElementsByTagName(settings.name);
if ( e.length ) if ( e.length )
data = $.trim(e[0].innerHTML); data = $.trim(e[0].innerHTML);
@ -94,14 +123,11 @@ $.extend({
if ( attr ) if ( attr )
data = attr; data = attr;
} }
object = getObject(data.indexOf("{") < 0 ? "{" + data + "}" : data);
}
if ( data.indexOf( '{' ) <0 ) $.data( elem, settings.single, object );
data = "{" + data + "}"; return object;
data = eval("(" + data + ")");
$.data( elem, settings.single, data );
return data;
} }
} }
}); });