Skip to content
Permalink
Browse files
Added 2 of 3 fixes of #164
  • Loading branch information
jzaefferer committed Oct 11, 2006
1 parent 6de5a6b commit 2e544e9eb89c87b9eac6df445474d21e9be604eb
Showing with 30 additions and 9 deletions.
  1. +2 −6 build/test/data/dashboard.xml
  2. +12 −0 src/ajax/ajax.js
  3. +16 −3 src/jquery/jquery.js
@@ -3,12 +3,8 @@
<locations>
<location>
<infowindowtab>
<tab title="Location">
<![CDATA[blabla]]>
</tab>
<tab title="Users">
<![CDATA[blublu]]>
</tab>
<tab title="Location"><![CDATA[blabla]]></tab>
<tab title="Users"><![CDATA[blublu]]></tab>
</infowindowtab>
</location>
</locations>
@@ -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
* @type jQuery
* @param String url The URL of the page to load.
@@ -50,8 +50,10 @@ jQuery = function(a,c) {
return new jQuery(a,c);

// Handle HTML strings
var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
if ( m ) a = jQuery.clean( [ m[1] ] );
if (typeof a == "string") {
var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
if ( m ) a = jQuery.clean( [ m[1] ] );
}

// Watch for when an array is passed in
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);
* 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
* @type jQuery
* @param String key The name of the property to set.
@@ -1558,7 +1571,7 @@ jQuery.extend({
empty: "!a.childNodes.length",

// 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
visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'",

0 comments on commit 2e544e9

Please sign in to comment.