Index: token.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.js,v
retrieving revision 1.3
diff -u -p -r1.3 token.js
--- token.js	20 Mar 2010 19:48:25 -0000	1.3
+++ token.js	20 Feb 2011 13:38:38 -0000
@@ -44,7 +46,9 @@ Drupal.behaviors.tokenInsert = {
             myField.value += myValue;
           }
 
-          $('html,body').animate({scrollTop: $(myField).offset().top}, 500);
+          if ($(this).parents('table').hasClass('token-click-insert-scroll')) {
+            $('html,body').animate({scrollTop: $(myField).offset().top}, 500);
+          }
         }
         return false;
       });
Index: token.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.module,v
retrieving revision 1.63
diff -u -p -r1.63 token.module
--- token.module	14 Feb 2011 23:22:28 -0000	1.63
+++ token.module	20 Feb 2011 13:38:41 -0000
@@ -121,7 +121,7 @@ function token_theme() {
       'file' => 'token.pages.inc',
     ),
     'token_tree' => array(
-      'variables' => array('token_types' => array(), 'global_types' => TRUE, 'click_insert' => TRUE, 'show_restricted' => FALSE, 'recursion_limit' => 4),
+      'variables' => array('token_types' => array(), 'global_types' => TRUE, 'click_insert' => TRUE, 'scroll_on_insert' => TRUE, 'show_restricted' => FALSE, 'recursion_limit' => 4),
       'file' => 'token.pages.inc',
     ),
   );
Index: token.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token.pages.inc,v
retrieving revision 1.13
diff -u -p -r1.13 token.pages.inc
--- token.pages.inc	18 Dec 2010 01:53:33 -0000	1.13
+++ token.pages.inc	20 Feb 2011 13:38:42 -0000
@@ -90,8 +90,11 @@ function theme_token_tree($variables) {
     'empty' => t('No tokens available.'),
   );
   if ($variables['click_insert']) {
     $table_options['caption'] = t('Click a token to insert it into the field you\'ve last clicked.');
     $table_options['attributes']['class'][] = 'token-click-insert';
+    if ($variables['scroll_on_insert']) {
+      $table_options['attributes']['class'][] = 'token-click-insert-scroll';
+    }
   }
 
   return theme('tree_table', $table_options);