Fixed issue #05711: Auto tab ordering no longer working

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12401 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 8, 2012 · 7eca5e5 · 7eca5e5
1 parent 0b5692e
commit 7eca5e5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/classes/eval/LimeExpressionManager.php b/classes/eval/LimeExpressionManager.php
@@ -4825,7 +4825,10 @@ static function GetRelevanceAndTailoringJavaScript()
 
         $jsParts[] = "function ExprMgr_process_relevance_and_tailoring(evt_type){\n";
         $jsParts[] = "if (typeof LEM_initialized == 'undefined') {\nLEM_initialized=true;\nLEMsetTabIndexes();\n}\n";
-        $jsParts[] = "if (evt_type == 'onchange' && (typeof last_evt_type != 'undefined' && last_evt_type == 'keydown') && (typeof target_tabIndex != 'undefined' && target_tabIndex == document.activeElement.tabIndex)) {\nreturn;\n}\n";
+        $jsParts[] = "if (evt_type == 'onchange' && (typeof last_evt_type != 'undefined' && last_evt_type == 'keydown')) {\n";
+        $jsParts[] = "  last_evt_type='onchange';\n";
+        $jsParts[] = "  return;\n";
+        $jsParts[] = "}\n";
         $jsParts[] = "last_evt_type = evt_type;\n\n";
 
         // flatten relevance array, keeping proper order

diff --git a/classes/eval/em_javascript.js b/classes/eval/em_javascript.js
@@ -495,10 +495,11 @@ function LEManyNA()
 function  LEMsetTabIndexes()
 {
     if (typeof tabIndexesSet == 'undefined') {
-        $(':input[type!=hidden][id!=runonce]').each(function(index){
+        $('#limesurvey :input[type!=hidden][id!=runonce]').each(function(index){
             $(this).bind('keydown',function(e) {
                 if (e.keyCode == 9) {
                     ExprMgr_process_relevance_and_tailoring(e.type);
+                    $(this).focus();
                     return true;
                 }
                 return true;

diff --git a/classes/eval/test/relevance.php b/classes/eval/test/relevance.php
@@ -8,8 +8,9 @@
         <title>ExpressionManager:  Unit Test Relevance</title>
         <script type="text/javascript" src="../scripts/jquery/jquery.js"></script>
         <script type="text/javascript" src="../classes/eval/em_javascript.js"></script>
+        <script type="text/javascript" src="../scripts/survey_runtime.js"></script>
     </head>
-    <body id="limesurvey" onload="ExprMgr_process_relevance_and_tailoring('');">
+    <body id="limesurvey">
         <?php
 //            include_once('../LimeExpressionManager.php');
             LimeExpressionManager::UnitTestRelevance();

diff --git a/group.php b/group.php
@@ -713,7 +713,7 @@ function checkconditions(value, name, type)
 		        document.getElementById(hiddenformname).value='';
             }
         }
-        ExprMgr_process_relevance_and_tailoring();
+        ExprMgr_process_relevance_and_tailoring('onchange');
 	}
 // -->
 </script>

diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js
@@ -2,6 +2,7 @@ var DOM1;
 $(document).ready(function()
 {
 	DOM1 = (typeof document.getElementsByTagName!='undefined');
+    if (typeof LEMsetTabIndexes === 'function') { LEMsetTabIndexes(); }
 	if (typeof checkconditions!='undefined') checkconditions();
 	if (typeof template_onload!='undefined') template_onload();
 	prepareCellAdapters();
@@ -119,9 +120,6 @@ $(document).ready(function()
          var row = $("#index .row.current");
          idx.scrollTop(row.position().top - idx.height() / 2 - row.height() / 2);
     */
-//    if (typeof ExprMgr_process_relevance_and_tailoring === 'function') {
-//        ExprMgr_process_relevance_and_tailoring();
-//    }
 });
 
 gmaps = new Object;