fix(developer): fix issues with template and presentation

keymanapp · Jul 14, 2022 · b702b7d · b702b7d
1 parent d294684
commit b702b7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/developer/src/tike/child/UfrmKeymanWizard.pas b/developer/src/tike/child/UfrmKeymanWizard.pas
@@ -3323,6 +3323,7 @@ procedure TfrmKeymanWizard.SelectTouchLayoutTemplate(APromptChange: Boolean);
     PromptChange := APromptChange;
     if ShowModal = mrOk then
     begin
+      frameTouchLayout.SaveToString;
       frameTouchLayout.TemplateFileName := TemplateFileName;
       frameTouchLayout.Load('', True, False);   // I4034
       Self.Modified := True;

diff --git a/developer/src/tike/xml/layoutbuilder/builder.js b/developer/src/tike/xml/layoutbuilder/builder.js
@@ -954,10 +954,15 @@ $(function() {
             $('#selPlatform').val(data.platform);
           }
           builder.selectPlatform();
-          if(data.presentation && builder.presentations[data.presentation]) {
+          if(data.presentation &&
+              builder.presentations[data.presentation] &&
+              $('#selPlatformPresentation option[value="'+data.presentation+'"]').length) {
             $('#selPlatformPresentation').val(data.presentation);
-            builder.prepareLayer();
+          } else {
+            // The last selected presentation is no longer available; select the first option instead
+            $('#selPlatformPresentation').val($('#selPlatformPresentation option:first').val());
           }
+          builder.prepareLayer();
           if(data.layer && KVKL[builder.lastPlatform][data.layer]) {
             $('#selLayer').val(data.layer);
             builder.selectLayer();