Changeset 5498

Timestamp:

12/11/2011 12:23:13 AM (13 years ago)

Author:

djpaul

Message:

On activity admin edit screen, don't show move cursor for action/content metaboxes, and disable close/open toggle. See #3832

Location:

trunk/bp-activity

Files:

• admin/css/admin.css (modified) (1 diff)
• admin/css/admin.dev.css (modified) (1 diff)
• admin/js/admin.dev.js (modified) (2 diffs)
• admin/js/admin.js (modified) (1 diff)
• bp-activity-admin.php (modified) (2 diffs)

trunk/bp-activity/admin/css/admin.css

@@ -1 @@
-#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activities-primaryid{margin-bottom:1em;}
+#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action h3,#bp_activity_content h3{cursor:auto;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activities-primaryid{margin-bottom:1em;}

trunk/bp-activity/admin/css/admin.dev.css

@@ -36 +36 @@
     line-height: 0;
 }
+#bp_activity_action h3,
+#bp_activity_content h3 {
+    cursor: auto;
+}
 #bp_activity_action td.mceIframeContainer,
 #bp_activity_content td.mceIframeContainer {

trunk/bp-activity/admin/js/admin.dev.js

@@ -2 +2 @@
 
 /**
- * Activity reply object for the admin screen
+ * Activity reply object for the activity index screen
  *
  * @since 1.6
@@ -157 +157 @@
 };
 
-// Create the Activity reply object after domready event
-$(document).ready( activityReply.init );
+$(document).ready( function () {
+    // Create the Activity reply object after domready event
+    activityReply.init();
+
+    // On the edit screen, unload the close/open toggle js for the action & content metaboxes
+    $( '#bp_activity_action h3, #bp_activity_content h3' ).unbind( 'click' );
+});
+
 })(jQuery);

trunk/bp-activity/admin/js/admin.js

@@ -1 @@
-(function(a){activityReply={init:function(){a(document).on("click",".row-actions a.reply",activityReply.open);a(document).on("click","#bp-activities-container a.cancel",activityReply.close);a(document).on("click","#bp-activities-container a.save",activityReply.send);a(document).on("keyup","#bp-activities:visible",function(b){if(27==b.which){activityReply.close()}})},open:function(c){var b=a("#bp-activities-container").hide();a(this).parents("tr").after(b);b.fadeIn("300");a("#bp-activities").focus();return false},close:function(b){a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur();a("#bp-replysubmit .error").html("").hide();a("#bp-replysubmit .waiting").hide()});return false},send:function(c){a("#bp-replysubmit .error").hide();a("#bp-replysubmit .waiting").show();var b={};b["_ajax_nonce-bp-activity-admin-reply"]=a('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val();b.action="bp-activity-admin-reply";b.content=a("#bp-activities").val();b.parent_id=a("#bp-activities-container").prev().data("parent_id");b.root_id=a("#bp-activities-container").prev().data("root_id");a.ajax({data:b,type:"POST",url:ajaxurl,error:function(d){activityReply.error(d)},success:function(d){activityReply.show(d)}});return false},error:function(b){var c=b.statusText;a("#bp-replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#bp-replysubmit .error").html(c).show()}},show:function(c){var d,e,b;if(typeof(c)=="string"){activityReply.error({responseText:c});return false}b=wpAjax.parseAjaxResponse(c);if(b.errors){activityReply.error({responseText:wpAjax.broken});return false}b=b.responses[0];a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur();a("#bp-replysubmit .error").html("").hide();a("#bp-replysubmit .waiting").hide();a("#bp-activities-container").before(b.data);e=a("#activity-"+b.id);d=e.closest(".widefat").css("backgroundColor");e.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:d},300)})}};a(document).ready(activityReply.init)})(jQuery);
+(function(a){activityReply={init:function(){a(document).on("click",".row-actions a.reply",activityReply.open);a(document).on("click","#bp-activities-container a.cancel",activityReply.close);a(document).on("click","#bp-activities-container a.save",activityReply.send);a(document).on("keyup","#bp-activities:visible",function(b){if(27==b.which){activityReply.close()}})},open:function(c){var b=a("#bp-activities-container").hide();a(this).parents("tr").after(b);b.fadeIn("300");a("#bp-activities").focus();return false},close:function(b){a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur();a("#bp-replysubmit .error").html("").hide();a("#bp-replysubmit .waiting").hide()});return false},send:function(c){a("#bp-replysubmit .error").hide();a("#bp-replysubmit .waiting").show();var b={};b["_ajax_nonce-bp-activity-admin-reply"]=a('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val();b.action="bp-activity-admin-reply";b.content=a("#bp-activities").val();b.parent_id=a("#bp-activities-container").prev().data("parent_id");b.root_id=a("#bp-activities-container").prev().data("root_id");a.ajax({data:b,type:"POST",url:ajaxurl,error:function(d){activityReply.error(d)},success:function(d){activityReply.show(d)}});return false},error:function(b){var c=b.statusText;a("#bp-replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#bp-replysubmit .error").html(c).show()}},show:function(c){var d,e,b;if(typeof(c)=="string"){activityReply.error({responseText:c});return false}b=wpAjax.parseAjaxResponse(c);if(b.errors){activityReply.error({responseText:wpAjax.broken});return false}b=b.responses[0];a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur();a("#bp-replysubmit .error").html("").hide();a("#bp-replysubmit .waiting").hide();a("#bp-activities-container").before(b.data);e=a("#activity-"+b.id);d=e.closest(".widefat").css("backgroundColor");e.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:d},300)})}};a(document).ready(function(){activityReply.init();a("#bp_activity_action h3, #bp_activity_content h3").unbind("click")})})(jQuery);

trunk/bp-activity/bp-activity-admin.php

@@ -214 +214 @@
         wp_enqueue_script( 'comment' );
 
-        // Enqueue CSS
-        wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111210' );
-
     // Index screen
     } else {
@@ -248 +245 @@
             '<p>' . __( '<a href="http://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
         );
-
-        // Enqueue CSS and JavaScript
-        wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), '20111120' );
-        wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111203' );
-    }
+    }
+
+    // Enqueue CSS and JavaScript
+    wp_enqueue_script( 'bp_activity_admin_js', BP_PLUGIN_URL . "bp-activity/admin/js/admin.{$dev}js", array( 'jquery', 'wp-ajax-response' ), '20111211', true );
+    wp_enqueue_style( 'bp_activity_admin_css', BP_PLUGIN_URL . "bp-activity/admin/css/admin.{$dev}css", array(), '20111211' );
 
     // Handle spam/un-spam/delete of activities