Changeset 4473

Timestamp:

06/07/2011 06:44:08 PM (14 years ago)

Author:

djpaul

Message:

Backport r4349 and r4450 to 1.2 branch, for jQuery 1.6.1.

Location:

branches/1.2

Files:

• bp-themes/bp-default/_inc/global.js (modified) (14 diffs)
• readme.txt (modified) (1 diff)

branches/1.2/bp-themes/bp-default/_inc/global.js

@@ -40 +40 @@
         form.children().each( function() {
             if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") )
-                jq(this).attr( 'disabled', 'disabled' );
+                jq(this).prop( 'disabled', true );
         });
 
@@ -47 +47 @@
         /* Remove any errors */
         jq('div.error').remove();
-        button.attr('disabled','disabled');
+        button.prop('disabled', true);
 
         /* Default POST values */
@@ -73 +73 @@
             form.children().each( function() {
                 if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") )
-                    jq(this).attr( 'disabled', '' );
+                    jq(this).prop( 'disabled', false );
             });
 
@@ -80 +80 @@
                 form.prepend( response.substr( 2, response.length ) );
                 jq( 'form#' + form.attr('id') + ' div.error').hide().fadeIn( 200 );
-                button.attr("disabled", '');
+                button.prop("disabled", false);
             } else {
                 if ( 0 == jq("ul.activity-list").length ) {
@@ -95 +95 @@
 
                 /* Re-enable the submit button after 8 seconds. */
-                setTimeout( function() { button.attr("disabled", ''); }, 8000 );
+                setTimeout( function() { button.prop("disabled", false); }, 8000 );
             }
         });
@@ -340 +340 @@
                 if ( response[0] + response[1] == '-1' ) {
                     form.append( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
-                    target.attr("disabled", '');
+                    target.prop("disabled", false);
                 } else {
                     form.fadeOut( 200,
@@ -362 +362 @@
 
                     /* Re-enable the submit button after 5 seconds. */
-                    setTimeout( function() { target.attr("disabled", ''); }, 5000 );
+                    setTimeout( function() { target.prop("disabled", false); }, 5000 );
                 }
             });
@@ -613 +613 @@
         var friend_id = jq(this).val();
 
-        if ( jq(this).attr('checked') == true )
+        if ( jq(this).prop('checked') == true )
             var friend_action = 'invite';
         else
@@ -665 +665 @@
             jq('.ajax-loader').toggle();
             jq('#friend-list li#uid-' + friend_id).remove();
-            jq('#invite-list input#f-' + friend_id).attr('checked', false);
+            jq('#invite-list input#f-' + friend_id).prop('checked', false);
         });
 
@@ -825 +825 @@
         jq(this).removeClass('over');
     });
-        
+
     jq('body#bp-default table.zebra tbody tr:odd').addClass('alt');
 
@@ -1055 +1055 @@
 
     if ( null != jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length )
-        jq('#activity-filter-select select option[value=' + jq.cookie('bp-activity-filter') + ']').attr( 'selected', 'selected' );
+        jq('#activity-filter-select select option[value="' + jq.cookie('bp-activity-filter') + '"]').prop( 'selected', true );
 
     /* Activity Tab Set */
@@ -1070 +1070 @@
     jq(objects).each( function(i) {
         if ( null != jq.cookie('bp-' + objects[i] + '-filter') && jq('li#' + objects[i] + '-order-select select').length )
-            jq('li#' + objects[i] + '-order-select select option[value=' + jq.cookie('bp-' + objects[i] + '-filter') + ']').attr( 'selected', 'selected' );
+            jq('li#' + objects[i] + '-order-select select option[value="' + jq.cookie('bp-' + objects[i] + '-filter') + '"]').prop( 'selected', true );
 
         if ( null != jq.cookie('bp-' + objects[i] + '-scope') && jq('div.' + objects[i]).length ) {
@@ -1103 +1103 @@
     jq('div.item-list-tabs li#' + object + '-' + scope + ', div.item-list-tabs#object-nav li.current').addClass('selected');
     jq('div.item-list-tabs li.selected').addClass('loading');
-    jq('div.item-list-tabs select option[value=' + filter + ']').attr( 'selected', 'selected' );
+    jq('div.item-list-tabs select option[value="' + filter + '"]').prop( 'selected', true );
 
     if ( 'friends' == object )
@@ -1145 +1145 @@
     jq('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
     jq('div#object-nav.item-list-tabs li.selected, div.activity-type-tabs li.selected').addClass('loading');
-    jq('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
+    jq('#activity-filter-select select option[value="' + filter + '"]').prop( 'selected', true );
 
     /* Reload the activity stream based on the selection */

branches/1.2/readme.txt

@@ -2 +2 @@
 Contributors: apeatling, johnjamesjacoby, MrMaz, DJPaul, boonebgorges
 Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
-Requires at least: 3.1
+Requires at least: 3.2
 Tested up to: 3.1
 Stable tag: 1.2.8