Changeset 11788

Timestamp:

08/08/2009 07:22:19 AM (17 years ago)

Author:

azaozz

Message:

Scroll back to the same location after saving a file in the Plugin and Theme editors

Location:

trunk/wp-admin

Files:

• plugin-editor.php (modified) (8 diffs)
• theme-editor.php (modified) (7 diffs)

trunk/wp-admin/plugin-editor.php

@@ -10 +10 @@
 require_once('admin.php');
 
+if ( !current_user_can('edit_plugins') )
+        wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
+
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
@@ -34 +37 @@
 $file = validate_file_to_edit($file, $plugin_files);
 $real_file = WP_PLUGIN_DIR . '/' . $file;
+$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
 switch ( $action ) {
@@ -40 +44 @@
 
         check_admin_referer('edit-plugin_' . $file);
-
-        if ( !current_user_can('edit_plugins') )
-                wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
         $newcontent = stripslashes($_POST['newcontent']);
@@ -54 +55 @@
                         if ( is_plugin_active($file) )
                                 deactivate_plugins($file, true);
-                        wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1"));
+                        wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto"));
                         exit;
                 }
-                wp_redirect("plugin-editor.php?file=$file&a=te");
-        } else {
-                wp_redirect("plugin-editor.php?file=$file");
+                wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
+        } else {
+                wp_redirect("plugin-editor.php?file=$file&scrollto=$scrollto");
         }
         exit;
@@ -66 +67 @@
 
 default:
-
-        if ( !current_user_can('edit_plugins') )
-                wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
 
         if ( isset($_GET['liveupdate']) ) {
@@ -80 +78 @@
                         activate_plugin($file, "plugin-editor.php?file=$file&phperror=1"); // we'll override this later if the plugin can be included without fatal error
 
-                wp_redirect("plugin-editor.php?file=$file&a=te");
+                wp_redirect("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");
                 exit;
         }
@@ -206 +204 @@
                 <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
                 <input type="hidden" name="plugin" value="<?php echo esc_attr($plugin) ?>" />
+                <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
                 </div>
                 <?php if ( !empty( $docs_select ) ) : ?>
@@ -228 +227 @@
 <br class="clear" />
 </div>
+<script type="text/javascript">
+/* <![CDATA[ */
+jQuery(document).ready(function($){
+        $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
+        $('#newcontent').scrollTop( $('#scrollto').val() );
+});
+/* ]]> */
+</script>
 <?php
         break;

trunk/wp-admin/theme-editor.php

@@ -10 +10 @@
 require_once('admin.php');
 
+if ( !current_user_can('edit_themes') )
+        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
@@ -37 +40 @@
 $file = validate_file_to_edit($file, $allowed_files);
 $real_file = get_real_file_to_edit($file);
+$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
 $file_show = basename( $file );
@@ -45 +49 @@
 
         check_admin_referer('edit-theme_' . $file . $theme);
-
-        if ( !current_user_can('edit_themes') )
-                wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
         $newcontent = stripslashes($_POST['newcontent']);
@@ -57 +58 @@
                         fwrite($f, $newcontent);
                         fclose($f);
-                        $location = "theme-editor.php?file=$file&theme=$theme&a=te";
+                        $location = "theme-editor.php?file=$file&theme=$theme&a=te&scrollto=$scrollto";
                 } else {
-                        $location = "theme-editor.php?file=$file&theme=$theme";
+                        $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
                 }
         } else {
-                $location = "theme-editor.php?file=$file&theme=$theme";
+                $location = "theme-editor.php?file=$file&theme=$theme&scrollto=$scrollto";
         }
 
@@ -74 +75 @@
 
 default:
-
-        if ( !current_user_can('edit_themes') )
-                wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
 
         if ( use_codepress() )
@@ -202 +200 @@
                  <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
                  <input type="hidden" name="theme" value="<?php echo esc_attr($theme) ?>" />
+                 <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
                  </div>
         <?php if ( isset($functions ) && count($functions) ) { ?>
@@ -230 +229 @@
 <br class="clear" />
 </div>
+<script type="text/javascript">
+/* <![CDATA[ */
+jQuery(document).ready(function($){
+        $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
+        $('#newcontent').scrollTop( $('#scrollto').val() );
+});
+/* ]]> */
+</script>
 <?php
 break;