Dev: Remove unnecessary li and ul from attribute mapping js; replace …

…some with div
LimeSurvey · Feb 4, 2016 · 30d7062 · 30d7062
1 parent c3fb446
commit 30d7062
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/application/views/admin/participants/attributeMap_view.php b/application/views/admin/participants/attributeMap_view.php
@@ -71,7 +71,7 @@
                         <?php eT("Existing token attributes"); ?> 
                     </div>
                     <div class='panel-body'>
-                        <div class="tokenatt">
+                        <div class="tokenatt ui-sortable">
                             <?php
                                 foreach ($selectedtokenattribute as $key => $value)
                                 {

diff --git a/scripts/admin/attributeMap.js b/scripts/admin/attributeMap.js
@@ -1,11 +1,13 @@
 $(document).ready(function(){
+
     if(!$('#centralattribute').length ) { //Warning that there are no unmapped attributes to map
         alert(attributesMappedText);
     }
     var height = $(document).height();
     var width = $(document).width();
     var tokencurrentarray = {};
     var newcurrentarray = {};
+
     if($("#overwrite").is(':checked')) {var attoverwrite=true;} else {var attoverwrite=false;}
     if($("#overwriteman").is(':checked')) {var attoverwriteman=true;} else {var attoverwriteman=false;}
     if($("#createautomap").is(':checked')) {var attcreateautomap=true;} else {var attcreateautomap=false;}
@@ -43,14 +45,14 @@ $(document).ready(function(){
             newcurrentarray = $(this).sortable('toArray');
             var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray)
             cpdbattpos = cpdbattpos+1;
-            $('ul#cpdbatt > li:nth-child('+cpdbattpos+')').css("color", "black");
-            $('ul#cpdbatt > li:nth-child('+cpdbattpos+')').css("background-color","white");
+            $('#cpdbatt > :nth-child('+cpdbattpos+')').css("color", "black");
+            $('#cpdbatt > :nth-child('+cpdbattpos+')').css("background-color","white");
         }
     });
-    $("ul.standardfields").sortable({
+    $(".standardfields").sortable({
         helper: 'clone',
         appendTo: 'body',
-        connectWith: "ul",
+        connectWith: "div",
         beforeStop: function(event,ui) {
             $(this).sortable('cancel');
         },
@@ -69,21 +71,21 @@ $(document).ready(function(){
                 $(ui.sender).sortable('cancel');
             }
             else {
-                $('ul.standardfields > li:nth-child('+tattpos+')').css("color","white");
-                $('ul.standardfields > li:nth-child('+tattpos+')').css("border-top","0");
-                $('ul.standardfields > li:nth-child('+cattpos+')').css("color","white");
-                $('ul.standardfields > li:nth-child('+cattpos+')').css("margin-top","-5px");
-                $('ul.standardfields > li:nth-child('+cattpos+')').css("border-top","0");
-                $('ul.standardfields > li:nth-child('+cattpos+')').css("min-height","20px");
+                $('.standardfields > :nth-child('+tattpos+')').css("color","white");
+                $('.standardfields > :nth-child('+tattpos+')').css("border-top","0");
+                $('.standardfields > :nth-child('+cattpos+')').css("color","white");
+                $('.standardfields > :nth-child('+cattpos+')').css("margin-top","-5px");
+                $('.standardfields > :nth-child('+cattpos+')').css("border-top","0");
+                $('.standardfields > :nth-child('+cattpos+')').css("min-height","20px");
                 $("#"+cattid).css("background-color","#696565");
                 $("#"+tattid).css("background-color","#696565");
             }
         }
     });
-    $("ul.tokenatt").sortable({
+    $(".tokenatt").sortable({
         helper: 'clone',
         appendTo: 'body',
-        connectWith: "ul",
+        connectWith: "div",
         beforeStop: function(event,ui) {
                 $(this).sortable('cancel');
         },
@@ -102,18 +104,18 @@ $(document).ready(function(){
                 $(ui.sender).sortable('cancel');
             }
             else {
-                $('ul.tokenatt > li:nth-child('+tattpos+')').css("color","white");
-                $('ul.tokenatt > li:nth-child('+tattpos+')').css("border-top","0");
-                $('ul.tokenatt > li:nth-child('+cattpos+')').css("color","white");
-                $('ul.tokenatt > li:nth-child('+cattpos+')').css("margin-top","-5px");
-                $('ul.tokenatt > li:nth-child('+cattpos+')').css("border-top","0");
-                $('ul.tokenatt > li:nth-child('+cattpos+')').css("min-height","20px");
+                $('.tokenatt > :nth-child('+tattpos+')').css("color","white");
+                $('.tokenatt > :nth-child('+tattpos+')').css("border-top","0");
+                $('.tokenatt > :nth-child('+cattpos+')').css("color","white");
+                $('.tokenatt > :nth-child('+cattpos+')').css("margin-top","-5px");
+                $('.tokenatt > :nth-child('+cattpos+')').css("border-top","0");
+                $('.tokenatt > :nth-child('+cattpos+')').css("min-height","20px");
                 $("#"+cattid).css("background-color","#696565");
                 $("#"+tattid).css("background-color","#696565");
             }
         }
     });
-    $("ul.newcreate").sortable({
+    $(".newcreate").sortable({
         helper: 'clone',
         appendTo: 'body',
         dropOnEmpty: true,
@@ -126,8 +128,8 @@ $(document).ready(function(){
                 newcurrentarray = $(this).sortable('toArray');
                 var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray)
                 cpdbattpos = cpdbattpos+1;
-                $('ul.newcreate > li:nth-child('+cpdbattpos+')').css("color", "white");
-                $('ul.newcreate > li:nth-child('+cpdbattpos+')').css("background-color","#696565");
+                $('.newcreate > :nth-child('+cpdbattpos+')').css("color", "white");
+                $('.newcreate > :nth-child('+cpdbattpos+')').css("background-color","#696565");
         }
     });
     $('#attmap').click(function() {
@@ -161,4 +163,4 @@ $(document).ready(function(){
             $(location).attr('href',redUrl);
         });
     });
-});
+});