deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added 2 of 3 fixes of #164

Browse source
This commit is contained in:
Jörn Zaefferer 2006-10-11 13:35:05 +00:00
parent 6de5a6b96a
commit 2e544e9eb8
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/test/data/dashboard.xml
View file

@ -3,12 +3,8 @@
<locations> <locations>
<location> <location>
<infowindowtab> <infowindowtab>
<tab title="Location"> <tab title="Location"><![CDATA[blabla]]></tab>
<![CDATA[blabla]]> <tab title="Users"><![CDATA[blublu]]></tab>
</tab>
<tab title="Users">
<![CDATA[blublu]]>
</tab>
</infowindowtab> </infowindowtab>
</location> </location>
</locations> </locations>

12
src/ajax/ajax.js
View file

@ -288,6 +288,18 @@ jQuery.extend({
* } * }
* ) * )
* *
* @test stop();
* $.get('data/dashboard.xml', function(xml) {
* var content = [];
* $('tab', xml).each(function() {
* content.push($(this).text());
* });
* ok( content[0] == 'blabla', 'Check first tab');
* ok( content[1] == 'blublu', 'Check second tab');
* start();
* });
*
*
* @name $.get * @name $.get
* @type jQuery * @type jQuery
* @param String url The URL of the page to load. * @param String url The URL of the page to load.

19
src/jquery/jquery.js vendored
View file

@ -50,8 +50,10 @@ jQuery = function(a,c) {
return new jQuery(a,c); return new jQuery(a,c);
// Handle HTML strings // Handle HTML strings
var m = /^[^<]*(<.+>)[^>]*$/.exec(a); if (typeof a == "string") {
if ( m ) a = jQuery.clean( [ m[1] ] ); var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
if ( m ) a = jQuery.clean( [ m[1] ] );
}
// Watch for when an array is passed in // Watch for when an array is passed in
this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ? this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ?
@ -446,6 +448,17 @@ jQuery.fn = jQuery.prototype = {
* $("#check2").attr('checked', false); * $("#check2").attr('checked', false);
* ok( document.getElementById('check2').checked == false, 'Set checked attribute' ); * ok( document.getElementById('check2').checked == false, 'Set checked attribute' );
* *
* @test stop();
* $.get('data/dashboard.xml', function(xml) {
* var titles = [];
* $('tab', xml).each(function() {
* titles.push($(this).attr('title'));
* });
* ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
* ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
* start();
* });
*
* @name attr * @name attr
* @type jQuery * @type jQuery
* @param String key The name of the property to set. * @param String key The name of the property to set.
@ -1558,7 +1571,7 @@ jQuery.extend({
empty: "!a.childNodes.length", empty: "!a.childNodes.length",
// Text Check // Text Check
contains: "(a.innerText||a.innerHTML).indexOf(m[3])>=0", contains: "((a.firstChild && a.firstChild.nodeValue)||a.innerText||a.innerHTML).indexOf(m[3])>=0",
// Visibility // Visibility
visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'", visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'",