Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

LimeSurvey · May 15, 2012 · b76a64b · b76a64b
2 parents ff03709 + f29c0be
commit b76a64b
Show file tree

Hide file tree

Showing 3 changed files with 11,202 additions and 2 deletions.
diff --git a/admin/scripts/answers.js b/admin/scripts/answers.js
@@ -98,7 +98,7 @@ function addinput()
     languages=langs.split(';');
 
     sNextCode=getNextCode($(this).parent().parent().find('.code').val());
-    while ($(this).parent().parent().parent().find('input[value="'+sNextCode+'"]').length>0)
+    while ($(this).parent().parent().parent().find('input[value="'+sNextCode+'"]').length>0 && sNextCode!=$(this).parent().parent().find('.code').val())
     {
         sNextCode=getNextCode(sNextCode);
     }

diff --git a/admin/scripts/subquestions.js b/admin/scripts/subquestions.js
@@ -87,7 +87,7 @@ function addinput()
     languages=langs.split(';');
 
     nextcode=getNextCode($(this).parent().parent().find('.code').val());
-    while ($(this).parent().parent().parent().find('input[value="'+nextcode+'"]').length>0)
+    while ($(this).parent().parent().parent().find('input[value="'+nextcode+'"]').length>0 && nextcode!=$(this).parent().parent().find('.code').val())
     {
         nextcode=getNextCode(nextcode);
     }