Changeset 7411

Timestamp:

10/11/2013 05:37:33 PM (13 years ago)

Author:

boonebgorges

Message:

Improve JS for "Select" dropdown on messages screens

• Use jQuery delegation, to ensure that items added to the DOM dynamically (as in an AJAX search query) are listening for clicks
• Simplify logic

See #5070

Props imath

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

@@ -1192 +1192 @@
 
         /* Selecting unread and read messages in inbox */
-        jq("#message-type-select").change(
-                function() {
-                        var selection = jq("#message-type-select").val();
-                        var checkboxes = jq("td input[type='checkbox']");
-                        checkboxes.each( function(i) {
-                                checkboxes[i].checked = "";
-                        });
-
-                        switch(selection) {
-                                case 'unread':
-                                        var checkboxes = jq("tr.unread td input[type='checkbox']");
-                                        break;
-                                case 'read':
-                                        var checkboxes = jq("tr.read td input[type='checkbox']");
-                                        break;
-                        }
-                        if ( selection != '' ) {
-                                checkboxes.each( function(i) {
-                                        checkboxes[i].checked = "checked";
-                                });
-                        } else {
-                                checkboxes.each( function(i) {
-                                        checkboxes[i].checked = "";
-                                });
-                        }
-                }
-        );
-
+        jq( 'body.messages #item-body div.messages' ).on( 'change', '#message-type-select', function() {
+                var selection = this.value;
+                var checkboxes = jq( "td input[type='checkbox']" );
+
+                checkboxes.each( function(i) {
+                        checkboxes[i].checked = "";
+                });
+
+                var checked_value = "checked";
+                switch ( selection ) {
+                        case 'unread' :
+                                checkboxes = jq("tr.unread td input[type='checkbox']");
+                                break;
+                        case 'read' :
+                                checkboxes = jq("tr.read td input[type='checkbox']");
+                                break;
+                        case '' :
+                                checked_value = "";
+                                break;
+                }
+
+                checkboxes.each( function(i) {
+                        checkboxes[i].checked = checked_value;
+                });
+        });
+        
         /* Bulk delete messages */
         jq("#delete_inbox_messages, #delete_sentbox_messages").on( 'click', function() {

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

@@ -1176 +1176 @@
 
         /* Selecting unread and read messages in inbox */
-        jq("select#message-type-select").change(
-                function() {
-                        var selection = jq("select#message-type-select").val();
-                        var checkboxes = jq("td input[type='checkbox']");
-                        checkboxes.each( function(i) {
-                                checkboxes[i].checked = "";
-                        });
-
-                        switch(selection) {
-                                case 'unread':
-                                        var checkboxes = jq("tr.unread td input[type='checkbox']");
-                                        break;
-                                case 'read':
-                                        var checkboxes = jq("tr.read td input[type='checkbox']");
-                                        break;
-                        }
-                        if ( selection != '' ) {
-                                checkboxes.each( function(i) {
-                                        checkboxes[i].checked = "checked";
-                                });
-                        } else {
-                                checkboxes.each( function(i) {
-                                        checkboxes[i].checked = "";
-                                });
-                        }
-                }
-        );
-
+        jq( 'body.messages #item-body div.messages' ).on( 'change', '#message-type-select', function() {
+                var selection = this.value;
+                var checkboxes = jq( "td input[type='checkbox']" );
+
+                checkboxes.each( function(i) {
+                        checkboxes[i].checked = "";
+                });
+
+                var checked_value = "checked";
+                switch ( selection ) {
+                        case 'unread' :
+                                checkboxes = jq("tr.unread td input[type='checkbox']");
+                                break;
+                        case 'read' :
+                                checkboxes = jq("tr.read td input[type='checkbox']");
+                                break;
+                        case '' :
+                                checked_value = "";
+                                break;
+                }
+
+                checkboxes.each( function(i) {
+                        checkboxes[i].checked = checked_value;
+                });
+        });
+        
         /* Bulk delete messages */
         jq("a#delete_inbox_messages, a#delete_sentbox_messages").click( function() {