diff --git a/views_autorefresh/views_autorefresh.js b/views_autorefresh/views_autorefresh.js index baa68c5f8419076f72ad401dec82261b24c410a3..d9697566e0dddcae74a005dd8385d0096e323fd8 100644 --- a/views_autorefresh/views_autorefresh.js +++ b/views_autorefresh/views_autorefresh.js @@ -59,7 +59,6 @@ Drupal.behaviors.views_autorefresh = { settings ); Drupal.settings.views_autorefresh[settings.view_name].view_args = viewData.view_args; - // Setup the click response with Drupal.ajax. var element_settings = {}; element_settings.url = ajax_path; @@ -97,6 +96,7 @@ Drupal.views_autorefresh.timer = function(view_name, anchor, target) { viewData.view_display_id = Drupal.settings.views_autorefresh[view_name].incremental.view_display_id; viewData.view_name = Drupal.settings.views_autorefresh[view_name].incremental.view_name; } + viewData.autorefreshRequest = 'autorefreshRequest'; Drupal.settings.views_autorefresh[view_name].ajax.submit = viewData; // If there's a ping URL, hit it first. diff --git a/views_autorefresh/views_autorefresh.module b/views_autorefresh/views_autorefresh.module index e16ac2dc2e2239839844cc39689bb9e52ddcb47c..8d7d158e760b2a1111d583e494398184fdc4a6e8 100644 --- a/views_autorefresh/views_autorefresh.module +++ b/views_autorefresh/views_autorefresh.module @@ -67,7 +67,8 @@ function theme_views_autorefresh($variables) { * Implementation of hook_views_ajax_data_alter(). */ function views_autorefresh_views_ajax_data_alter(&$commands, $view) { - if (!empty($view->autorefresh['incremental'])) { + $replace = isset($_REQUEST['autorefreshRequest']); + if ($replace && !empty($view->autorefresh['incremental'])) { foreach ($commands as &$command) { if ($command['command'] == 'insert' && $command['selector'] == ('.view-dom-id-' . $view->dom_id)) { $command['command'] = 'viewsAutoRefreshIncremental'; @@ -75,7 +76,7 @@ function views_autorefresh_views_ajax_data_alter(&$commands, $view) { } } } - if (!empty($view->autorefresh['interval'])) { + if ($replace && !empty($view->autorefresh['interval'])) { $commands[] = array( 'command' => 'viewsAutoRefreshTriggerUpdate', 'selector' => '.view-dom-id-' . $view->dom_id,