[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19127-gabc1d3c

[Rouslan Placella]

The branch, master has been updated
       via  abc1d3c345dfd11ea3d940c5b944d05fc173ec34 (commit)
      from  6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 (commit)


- Log -----------------------------------------------------------------
commit abc1d3c345dfd11ea3d940c5b944d05fc173ec34
Author: Rouslan Placella <rouslan at placella.com>
Date:   Wed Sep 14 15:42:40 2011 +0100

    Fixed broken validation and reindexing of some fields in the Routines editor

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

Summary of changes:
 js/rte/routines.js |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/rte/routines.js b/js/rte/routines.js
index 50c4f00..ac7a291 100644
--- a/js/rte/routines.js
+++ b/js/rte/routines.js
@@ -58,9 +58,9 @@ RTE.validateCustom = function () {
         if (isSuccess) {
             $(this).find(':input').each(function () {
                 inputname = $(this).attr('name');
-                if (inputname.substr(0, 17) === 'item_param_dir' ||
-                    inputname.substr(0, 18) === 'item_param_name' ||
-                    inputname.substr(0, 18) === 'item_param_type') {
+                if (inputname.substr(0, 14) === 'item_param_dir' ||
+                    inputname.substr(0, 15) === 'item_param_name' ||
+                    inputname.substr(0, 15) === 'item_param_type') {
                     if ($(this).val() === '') {
                         $(this).focus();
                         isSuccess = false;
@@ -264,18 +264,18 @@ $(document).ready(function () {
                  *                      the input field being reindexed.
                  */
                 var inputname = $(this).attr('name');
-                if (inputname.substr(0, 17) === 'item_param_dir') {
+                if (inputname.substr(0, 14) === 'item_param_dir') {
+                    $(this).attr('name', inputname.substr(0, 14) + '[' + index + ']');
+                } else if (inputname.substr(0, 15) === 'item_param_name') {
+                    $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']');
+                } else if (inputname.substr(0, 15) === 'item_param_type') {
+                    $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']');
+                } else if (inputname.substr(0, 17) === 'item_param_length') {
                     $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']');
-                } else if (inputname.substr(0, 18) === 'item_param_name') {
-                    $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
-                } else if (inputname.substr(0, 18) === 'item_param_type') {
-                    $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
-                } else if (inputname.substr(0, 20) === 'item_param_length') {
+                } else if (inputname.substr(0, 20) === 'item_param_opts_text') {
                     $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']');
-                } else if (inputname.substr(0, 23) === 'item_param_opts_text') {
-                    $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']');
-                } else if (inputname.substr(0, 22) === 'item_param_opts_num') {
-                    $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']');
+                } else if (inputname.substr(0, 19) === 'item_param_opts_num') {
+                    $(this).attr('name', inputname.substr(0, 19) + '[' + index + ']');
                 }
             });
             index++;


hooks/post-receive
-- 
phpMyAdmin