Merge pull request #89 from JohnWinter13/master

Adjust key pressed behaviour when caps lock is on - closes #88

Author: CSchank

src/Building.elm

@@ -426,7 +426,11 @@ update env msg ( model, pModel, sModel ) =
                     ( ( { model | machineState = Regular }, pModel, sModel ), False, Cmd.none )
 
         KeyPressed k ->
-            if k == "Enter" then
+            let
+                normalizedKey =
+                    String.toLower k
+            in
+            if normalizedKey == "enter" then
                 --pressed enter
                 case model.machineState of
                     EditingStateLabel sId newLbl ->
@@ -464,7 +468,7 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == "d" then
+            else if normalizedKey == "d" then
                 case model.machineState of
                     SelectedState stId ->
                         let
@@ -526,13 +530,13 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == "g" then
+            else if normalizedKey == "g" then
                 ( ( model, pModel, sModel ), False, sendMsg ToggleSnap )
 
             else
                 case model.machineState of
                     SelectedState sId ->
-                        if k == "f" then
+                        if normalizedKey == "f" then
                             let
                                 newMachine =
                                     { oldMachine

src/Main.elm

@@ -241,17 +241,21 @@ update msg model =
                 ( model, Cmd.none )
 
         KeyPressed k ->
-            if k == "Shift" then
+            let
+                normalizedKey =
+                    String.toLower k
+            in
+            if normalizedKey == "shift" then
                 ( { model | environment = { oldEnvironment | holdingShift = True } }, Cmd.none )
 
-            else if k == "y" || k == "z" then
+            else if normalizedKey == "y" || normalizedKey == "z" then
                 let
                     doUndo =
-                        (oldEnvironment.holdingControl || oldEnvironment.holdingMeta) && k == "z"
+                        (oldEnvironment.holdingControl || oldEnvironment.holdingMeta) && normalizedKey == "z"
 
                     doRedo =
-                        (oldEnvironment.holdingControl && k == "y")
-                            || (oldEnvironment.holdingMeta && oldEnvironment.holdingShift && k == "z")
+                        (oldEnvironment.holdingControl && normalizedKey == "y")
+                            || (oldEnvironment.holdingMeta && oldEnvironment.holdingShift && normalizedKey == "z")
                 in
                 ( { model
                     | appModel =
@@ -267,11 +271,11 @@ update msg model =
                 , Cmd.none
                 )
 
-            else if k == "Meta" then
+            else if normalizedKey == "meta" then
                 --pressed meta key
                 ( { model | environment = { oldEnvironment | holdingMeta = True } }, Cmd.none )
 
-            else if k == "Control" then
+            else if normalizedKey == "control" then
                 --pressed control
                 ( { model | environment = { oldEnvironment | holdingControl = True } }, Cmd.none )
                 {- else if k == 66 then

src/Simulating.elm

@@ -336,15 +336,19 @@ update env msg ( model, pModel, sModel ) =
             ( ( Default tId -1 Nothing {- ??? -}, { pModel | currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), False, Cmd.none )
 
         KeyPressed k ->
-            if k == "Enter" then
+            let
+                normalizedKey =
+                    String.toLower k
+            in
+            if normalizedKey == "enter" then
                 case model of
                     Editing tId ->
                         ( ( Default tId -1 Nothing, { pModel | currentStates = epsTrans oldMachine.transitionNames oldMachine.delta oldMachine.start }, sModel ), True, Cmd.none )
 
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == "Backspace" || k == "ArrowLeft" then
+            else if normalizedKey == "backspace" || normalizedKey == "arrowleft" then
                 case model of
                     Editing tapeId ->
                         let
@@ -375,15 +379,15 @@ update env msg ( model, pModel, sModel ) =
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == "ArrowRight" then
+            else if normalizedKey == "arrowright" then
                 case model of
                     Default _ _ _ ->
                         ( ( model, pModel, sModel ), False, Task.perform identity (Task.succeed <| Step) )
 
                     _ ->
                         ( ( model, pModel, sModel ), False, Cmd.none )
 
-            else if k == "ArrowLeft" then
+            else if normalizedKey == "arrowleft" then
                 case model of
                     Default tId _ hErr ->
                         ( ( Default tId -1 hErr, { pModel | currentStates = sModel.machine.start }, sModel ), False, Cmd.none )
@@ -396,7 +400,7 @@ update env msg ( model, pModel, sModel ) =
                     Editing tapeId ->
                         let
                             charCode =
-                                case k of
+                                case normalizedKey of
                                     "a" ->
                                         0