Remove duplicated javascript function definition

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12419 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/templates/default_advanced/page_header.tpl b/templates/default_advanced/page_header.tpl
index 2e830cfefe155def0bf78b6dec51e0e738ccfe9d..08b147cfcb2fa960fe71c4756e78dbb1a0aa3e3c 100644 (file)
--- a/templates/default_advanced/page_header.tpl
+++ b/templates/default_advanced/page_header.tpl
@@ -119,7 +119,12 @@ $help_link         = makeInternalLink ('src/help.php', $help_str);
 </div>
 <br />
 <!-- End Header Navigation Table -->
 </div>
 <br />
 <!-- End Header Navigation Table -->

-<?php } ?>
+<?php 
+   } 
+
+   // now, some generic javascript for use with preview pane
+
+?>

 <script type="text/javascript" language="JavaScript">
 <!--
    var delayed_page_load_uri = '';
 <script type="text/javascript" language="JavaScript">
 <!--
    var delayed_page_load_uri = '';


@@ -127,6 +132,11 @@ $help_link         = makeInternalLink ('src/help.php', $help_str);
    { page_load_uri = page_uri; setTimeout('page_load()', 500); }
    function page_load()
    { document.location = page_load_uri; }
    { page_load_uri = page_uri; setTimeout('page_load()', 500); }
    function page_load()
    { document.location = page_load_uri; }

+   function refresh_message_list()
+   {
+      if (typeof(parent.right.delayed_page_load) != 'undefined')
+         parent.right.delayed_page_load("<?php echo $message_list_href; ?>");
+   }

 <?php 
 
    // autohide the preview pane if desired when not viewing messages,
 <?php 
 
    // autohide the preview pane if desired when not viewing messages,

diff --git a/templates/default_advanced/read_menubar_buttons.tpl b/templates/default_advanced/read_menubar_buttons.tpl
index 0819c05f330974e33a0fd96db2f22db74040fd81..152dad4c9a4fd16ed006d50eb13b177adb78891d 100644 (file)
--- a/templates/default_advanced/read_menubar_buttons.tpl
+++ b/templates/default_advanced/read_menubar_buttons.tpl
@@ -70,14 +70,6 @@ $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_lis
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';

-if ($show_preview_pane) { ?>
-   <script>
-   <!--
-      function refresh_message_list()
-      { parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); }
-   // -->
-   </script>
-<?php }

 
 
 /** Begin template **/
 
 
 /** Begin template **/

diff --git a/templates/default_advanced/read_menubar_nav.tpl b/templates/default_advanced/read_menubar_nav.tpl
index d14e07f5c5bd00a659dca58ed3934023c0f2f1f8..ade69122b2c00b9311a9748a7f30376077aa4974 100644 (file)
--- a/templates/default_advanced/read_menubar_nav.tpl
+++ b/templates/default_advanced/read_menubar_nav.tpl
@@ -66,17 +66,6 @@ $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_lis
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';

-if ($show_preview_pane) { ?>
-   <script>
-   <!--
-      function refresh_message_list()
-      { 
-          if (typeof(parent.right.delayed_page_load) != 'undefined')
-              parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); 
-      }
-   // -->
-   </script>
-<?php }

 
 
 /** Begin template **/
 
 
 /** Begin template **/