Merge branch 'javascript_refactor' into james_baseline_custom_pages

timmahrt · Jun 29, 2017 · a4c5f0b · a4c5f0b
2 parents e13623d + 9860f81
commit a4c5f0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/lmeds/code_generation/html.py b/lmeds/code_generation/html.py
@@ -126,12 +126,6 @@ def keyboardletterToChar(letter):
 
 
 def mapKeylist(keyIDList):
-    try:
-        if isinstance(keyIDList, basestring):
-            keyIDList = [keyIDList, ]
-    except NameError:
-        if isinstance(keyIDList, str):
-            keyIDList = [keyIDList, ]
 
     tmpKeyIDList = []
     for keyID in keyIDList:

diff --git a/lmeds/pages/boundary_pages.py b/lmeds/pages/boundary_pages.py
@@ -166,9 +166,9 @@ def __init__(self, name, transcriptName, minPlays, maxPlays,
 
         # Normalize variables
         if bindPlayKeyID is not None:
-            bindPlayKeyID = html.mapKeylist(bindPlayKeyID)
+            bindPlayKeyID = html.keyboardletterToChar(bindPlayKeyID)
         if bindSubmitID is not None:
-            bindSubmitID = html.mapKeylist(bindSubmitID)
+            bindSubmitID = html.keyboardletterToChar(bindSubmitID)
         presentAudio = presentAudio.lower() == "true"
 
         minNumSelected = int(minNumSelected)
@@ -370,9 +370,9 @@ def __init__(self, name, transcriptName, minPlays, maxPlays,
 
         # Normalize variables
         if bindPlayKeyID is not None:
-            bindPlayKeyID = html.mapKeylist(bindPlayKeyID)
+            bindPlayKeyID = html.keyboardletterToChar(bindPlayKeyID)
         if bindSubmitID is not None:
-            bindSubmitID = html.mapKeylist(bindSubmitID)
+            bindSubmitID = html.keyboardletterToChar(bindSubmitID)
         presentAudio = presentAudio.lower() == "true"
 
         minNumSelected = int(minNumSelected)