--- ~/sites/all/modules/facebook_status/facebook_status.module Thu Apr 22 15:58:11 2010 +++ ~/sites/all/modules/facebook_status/progress/facebook_status.module Tue Apr 27 01:57:57 2010 @@ -618,11 +618,13 @@ if ($account === FALSE) { $account = facebook_status_choose_owner(FALSE); } - if (facebook_status_can_post($account, $user)) { - return '
'. drupal_get_form('facebook_status_box', $account, $size, $view, $view_arg) .'
'; + $selectors = module_invoke_all('facebook_status_refresh_selectors', $account); + $output = ''; + $can_post = facebook_status_can_post($account, $user); + if ($can_post) { + $output .= '
'. drupal_get_form('facebook_status_box', $account, $size) .'
'; } if ($view && module_exists('views')) { - $rendered_view = views_embed_view($view, 'default', $account->uid); //A very specific hack for the default conversation view. if ($view_arg && $view == 'facebook_status_cross_post') { $arg = $view_arg; @@ -630,10 +632,22 @@ $arg2 = $temp[1] .','. $temp[0]; $rendered_view = views_embed_view($view, 'default', $arg, $arg2); } - return $rendered_view; + else { + $rendered_view = views_embed_view($view, 'default', $account->uid); + } + $output .= $rendered_view; + $selectors[] = '.view-id-'. $view; + } + elseif (!$can_post) { + $status = _facebook_status_get_status_fast($account->uid); + return theme('facebook_status_item', $status); + } + if (!empty($selectors)) { + drupal_add_js(array('facebook_status' => array( + 'refreshIDs' => $selectors + )), 'setting'); } - $status = _facebook_status_get_status_fast($account->uid); - return theme('facebook_status_item', $status); + return $output; } /** @@ -1360,39 +1374,21 @@ //====== /** - * Preserved for some minor level of backwards-compatibility. - */ -function _facebook_status_status($form_state, $account = NULL, $size = FALSE, $view = FALSE) { - $backtrace = debug_backtrace(); - $fn = $backtrace[1]['function']; - watchdog('facebook_status', 'function _facebook_status_status() is deprecated in favor of facebook_status_box(). Called from %function', array('%function' => $fn)); - return facebook_status_box($form_state, $account, $size, $view); -} - -/** * The status form. * * @param $account * The $user object for the user whose profile will be posted to. * @param $size * The size of the status update textfield, or FALSE to use the setting. - * @param $view - * The machine name of a view of statuses to append to the status update form. - * This view should expect to receive one argument - typically the User ID of - * the user whose profile is being viewed. - * @param $view_arg - * This is a very specific hack for the default conversation view. * @return * A $form array. */ -function facebook_status_box($form_state, $account = NULL, $size = FALSE, $view = FALSE, $view_arg = FALSE) { +function facebook_status_box($form_state, $account = NULL, $size = FALSE) { global $user; if (isset($form_state['facebook_status'])) { $aid = $form_state['facebook_status']['account']; $account = user_load(array('uid' => $aid)); $size = $form_state['facebook_status']['size']; - $view = $form_state['facebook_status']['fbss-view-value']; - $view_arg = $form_state['facebook_status']['fbss-view-arg']; } if (!$size) { @@ -1501,20 +1497,6 @@ 'method' => 'replace', ); } - if ($view && module_exists('views')) { - $rendered_view = views_embed_view($view, 'default', $account->uid); - //A very specific hack for the default conversation view. - if ($view_arg && $view = 'facebook_status_cross_post') { - $arg = $view_arg; - $temp = explode(',', $arg); - $arg2 = $temp[1] .','. $temp[0]; - $rendered_view = views_embed_view($view, 'default', $arg, $arg2); - } - $form['fbss-view'] = array( - '#value' => $rendered_view, - '#weight' => -15, - ); - } $form['sdefault'] = array( '#type' => 'value', '#value' => $default, @@ -1535,16 +1517,6 @@ '#value' => $size, '#weight' => 10, ); - $form['fbss-view-value'] = array( - '#type' => 'value', - '#value' => $view, - '#weight' => 10, - ); - $form['fbss-view-arg'] = array( - '#type' => 'value', - '#value' => $view_arg, - '#weight' => 10, - ); if (arg(0) == 'share-status' && $_GET['destination'] && $_GET['destination'] != $_GET['q']) { $form['back'] = array( '#value' => l(t('Back'), $_GET['destination'], array('attributes' => array('class' => 'facebook-status-back'))), @@ -1561,8 +1533,11 @@ */ function facebook_status_box_validate($form, &$form_state) { $maxlen = variable_get('facebook_status_length', 140); - if (drupal_strlen($form_state['values']['fbss-status']) > $maxlen) { - form_set_error('status', t('The status must be no longer than %chars characters.', array('%chars' => $maxlen))); + $len = drupal_strlen($form_state['values']['fbss-status']); + if ($len > $maxlen) { + form_set_error('status', + t('You may use a maximum of %maxchars characters, but you are using %chars characters.', + array('%maxchars' => $maxlen, '%chars' => $len))); } } @@ -1585,8 +1560,6 @@ $form_state['facebook_status'] = array( 'account' => $aid, 'size' => $size, - 'fbss-view-value' => $form_state['values']['fbss-view-value'], - 'fbss-view-arg' => $form_state['values']['fbss-view-arg'], ); $form_state['rebuild'] = TRUE; if (!variable_get('facebook_status_ahah', 1)) { @@ -1622,7 +1595,6 @@ $new_form['twitter'] = $form['twitter']; } $new_form['fbss-submit'] = $form['fbss-submit']; - $new_form['fbss-view'] = $form['fbss-view']; $new_form['sdefault'] = $form['sdefault']; //Clear the status form after it's already been submitted once to prevent confusion. unset($new_form['status']['#default_value']); --- ~/sites/all/modules/facebook_status/facebook_status.js Wed Apr 21 00:15:02 2010 +++ ~/sites/all/modules/facebook_status/progress/facebook_status.js Tue Apr 27 02:52:23 2010 @@ -3,6 +3,7 @@ var $facebook_status_field = $('.facebook_status_update:first .facebook_status_text'); var facebook_status_original_value = $facebook_status_field.val(); var fbss_maxlen = Drupal.settings.facebook_status.maxlength; + var refreshIDs = Drupal.settings.facebook_status.refreshIDs; if (Drupal.settings.facebook_status.autofocus) { $facebook_status_field.focus(); if ($facebook_status_field.val().length != 0) { @@ -47,7 +48,44 @@ }); //React when a status is submitted. $('#facebook_status_replace').bind('facebook_status_ahah_success', function() { - //Update Views here. + var loaded = {}; + //console.log("Before: "); + //console.log(refreshIDs); + //Refresh elements by re-loading the current page and replacing the old version with the updated version. + if (refreshIDs && refreshIDs != undefined) { + $.each(refreshIDs, function(i, val) { + /** + * @todo: + * - Stop the refreshIDs array from getting "undefined" elements appended to it. + * - Keep behaviors from getting attached multiple times. + * - Make sure nothing bad happens when there is nothing to update (no refreshIDs at all). + */ + if (val && val != undefined) { + if ($.trim(val) != '' && loaded[val] !== true) { + //IE will cache the result unless we add an identifier (in this case, the time). + $.get(window.location.pathname +"?ts="+ (new Date()).getTime(), function(data, textStatus) { + //new_content concept from ahah.js. Apparently Safari crashes with just $(). + //Script removal taken from load() in jQuery source. We already have the scripts we need. + //console.log("During: "); + //console.log(refreshIDs); + var new_data = data.replace(//g, ""); + var new_content = $('
').html(new_data); + if (textStatus != 'error' && new_content) { + var element = $(val); + var insert = new_content.find(val); + if (insert.get() != element.get()) { + element.replaceWith(insert); + Drupal.attachBehaviors(insert); + } + loaded[val] = true; + //console.log("After: "); + //console.log(refreshIDs); + } + }); + } + } + }); + } }); //Restore original status text if the field is blank and the slider is clicked. $('.facebook_status_slider').click(function() {