Ticket #4958: profile-field-vis-3.patch

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

@@ -834 +834 @@
 
         jq('.field-visibility-settings-close').on( 'click', function() {
                 var settings_div = jq(this).parent();
+                var vis_setting_text = settings_div.find('input:checked').parent().text();
 
-                jq(settings_div).slideUp( 400, function(){
-                        jq(settings_div).siblings('.field-visibility-settings-toggle').fadeIn(800);
+
+                settings_div.slideUp( 400, function(){
+                        settings_div.siblings('.field-visibility-settings-toggle').fadeIn(800);
+                        settings_div.siblings('.field-visibility-settings-toggle').children('.current-visibility-level').html(vis_setting_text);
                 });
 
                 return false;
         } );
 
+        jq("#profile-edit-form input:not(:submit),#profile-edit-form textarea,#profile-edit-form select,#signup_form input:not(:submit),#signup_form textarea,#signup_form select").change(function(){
+                
+                var shouldconfirm = true;
+
+                jq('#profile-edit-form input:submit,#signup_form input:submit').on( 'click', function() {
+                        shouldconfirm = false;
+                });
+                
+                window.onbeforeunload = function(e) {
+                        if ( shouldconfirm ) {
+                            return 'You have unsaved changes on this page. Do you want to leave this page and discard your changes or stay on this page?';
+                        }
+                };
+        });
 
         /** Friendship Requests **************************************/
 

bp-xprofile/bp-xprofile-template.php

@@ -730 +730 @@
          */
         function bp_get_the_profile_field_visibility_level() {
                 global $field;
-
-                $retval = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
+                //On the registration page, values stored in POST should take precedence over default visibility
+                if ( bp_is_register_page() && !empty( $_POST['field_' . $field->id . '_visibility'] ) ) {
+                        $retval = $_POST['field_' . $field->id . '_visibility'];
+                } else {
+                        $retval = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
+                }
 
                 return apply_filters( 'bp_get_the_profile_field_visibility_level', $retval );
         }
@@ -747 +751 @@
          */
         function bp_get_the_profile_field_visibility_level_label() {
                 global $field;
+                //On the registration page, values stored in POST should take precedence over default visibility
+                if ( bp_is_register_page() && !empty( $_POST['field_' . $field->id . '_visibility'] ) ) {
+                        $level  = $_POST['field_' . $field->id . '_visibility'];
+                } else {
+                        $level  = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
+                }
 
-                $level  = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
                 $fields = bp_xprofile_get_visibility_levels();
 
                 return apply_filters( 'bp_get_the_profile_field_visibility_level_label', $fields[$level]['label'] );