Changeset 6663

Timestamp:

12/25/2012 09:35:09 AM (12 years ago)

Author:

johnjamesjacoby

Message:

When accepting or rejecting a friend request, don't display a useless button. Instead, just show text. Props magnus78. Fixes #4696.

Location:

trunk

Files:

• bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-templates/bp-legacy/js/buddypress.js

@@ -881 +881 @@
                     if ( jq(this).hasClass('accept') ) {
                         action_div.children('a.reject').hide();
-                        jq(this).html( BP_DTheme.accepted ).fadeIn(50);
-                        jq(this).addClass('accepted');
+                        jq(this).html( BP_DTheme.accepted ).contents().unwrap();
                     } else {
                         action_div.children('a.accept').hide();
-                        jq(this).html( BP_DTheme.rejected ).fadeIn(50);
-                        jq(this).addClass('rejected');
+                        jq(this).html( BP_DTheme.accepted ).contents().unwrap();
                     }
                 });

trunk/bp-themes/bp-default/_inc/global.js

@@ -872 +872 @@
                     if ( jq(this).hasClass('accept') ) {
                         action_div.children('a.reject').hide();
-                        jq(this).html( BP_DTheme.accepted ).fadeIn(50);
-                        jq(this).addClass('accepted');
+                        jq(this).html( BP_DTheme.accepted ).contents().unwrap();
                     } else {
                         action_div.children('a.accept').hide();
-                        jq(this).html( BP_DTheme.rejected ).fadeIn(50);
-                        jq(this).addClass('rejected');
+                        jq(this).html( BP_DTheme.rejected ).contents().unwrap();
                     }
                 });