[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10519-g38334e4

[Marc Delisle]

The branch, master has been updated
       via  38334e4f9183d94d987f89140be115a678e0a9ba (commit)
      from  04f1307a45e4a1088c28458d5bb58dfea72f20b5 (commit)


- Log -----------------------------------------------------------------
commit 38334e4f9183d94d987f89140be115a678e0a9ba
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Oct 4 08:07:48 2010 -0400

    CtrlArrowsMoving not really needed as an option, now always active

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html                          |    9 +--------
 libraries/config.default.php                |    7 -------
 libraries/config/messages.inc.php           |    1 -
 libraries/config/user_preferences.forms.php |    1 -
 libraries/tbl_properties.inc.php            |    4 ----
 tbl_change.php                              |    2 --
 6 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 71cd175..5910cc3 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1868,11 +1868,6 @@ $cfg['TrustedProxies'] =
     </dt>
     <dd>Defines if the whole textarea of the query box will be selected on
         click.</dd>
-    <dt id="CtrlArrowsMoving">
-        <span id="cfg_CtrlArrowsMoving">$cfg['CtrlArrowsMoving'] </span>boolean
-    </dt>
-    <dd>Enable Ctrl+Arrows (Option+Arrows in Safari) moving between fields when
-        editing.</dd>
 
     <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
     <dd>Maximum number of characters shown in any non-numeric field on browse view.
@@ -4082,9 +4077,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
     editing fields?</a></h4>
 
 <p> You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages
-    with many editing fields (table structure changes, row editing, etc.)
-    (must be enabled in configuration - see.
-    <a href="#CtrlArrowsMoving" class="configrule">$cfg['CtrlArrowsMoving']</a>).
+    with many editing fields (table structure changes, row editing, etc.).
     You can also have a look at the directive
     <a href="#DefaultPropDisplay" class="configrule">$cfg['DefaultPropDisplay']</a>
     ('vertical') and see if this eases up editing for you.</p>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 339a40d..cc23cee 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2199,13 +2199,6 @@ $cfg['CharTextareaCols'] = 40;
 $cfg['CharTextareaRows'] = 2;
 
 /**
- * Enable Ctrl+Arrows moving between fields when editing?
- *
- * @global boolean $cfg['CtrlArrowsMoving']
- */
-$cfg['CtrlArrowsMoving'] = true;
-
-/**
  * Max field data length in browse mode for all non-numeric fields
  *
  * @global integer $cfg['LimitChars']
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 26d5a78..65545b7 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -39,7 +39,6 @@ $strConfigCompressOnFly_name = __('Compress on the fly');
 $strConfigConfigurationFile = __('Configuration file');
 $strConfigConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data');
 $strConfigConfirm_name = __('Confirm DROP queries');
-$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
 $strConfigDBG_sql_name = __('Debug SQL');
 $strConfigDefaultDisplay_name = __('Default display direction');
 $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 025c021..cd9e673 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -115,7 +115,6 @@ $forms['Main_frame']['Edit'] = array(
     'InsertRows',
     'ForeignKeyDropdownOrder',
     'ForeignKeyMaxLimit',
-    'CtrlArrowsMoving',
     'DefaultPropDisplay');
 $forms['Main_frame']['Tabs'] = array(
     'LightTabs',
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 001fea6..a00a164 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -597,7 +597,6 @@ for ($i = 0; $i < $num_fields; $i++) {
     }
 } // end for
 
-if ($cfg['CtrlArrowsMoving']) {
     ?>
 <script src="./js/keyhandler.js" type="text/javascript"></script>
 <script type="text/javascript">
@@ -606,9 +605,6 @@ var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>;
 document.onkeydown = onKeyDownArrowsHandler;
 // ]]>
 </script>
-    <?php
-}
-?>
 
 <form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>">
 <?php
diff --git a/tbl_change.php b/tbl_change.php
index bcc0b76..41e8230 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -207,7 +207,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 &&
 // Had to put the URI because when hosted on an https server,
 // some browsers send wrongly this form to the http server.
 
-if ($cfg['CtrlArrowsMoving']) {
     ?>
 <!-- Set on key handler for moving using by Ctrl+arrows -->
 <script src="./js/keyhandler.js" type="text/javascript"></script>
@@ -218,7 +217,6 @@ document.onkeydown = onKeyDownArrowsHandler;
 //]]>
 </script>
     <?php
-}
 
 $_form_params = array(
     'db'        => $db,


hooks/post-receive
-- 
phpMyAdmin