From 841c9ee9de3e483b311188d46e499ffa6c2468ca Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 28 Apr 2017 16:11:22 +0200
Subject: [PATCH] don't close popup dialog when hitting enter if textarea has
 focus

---
 www/slide/main.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/slide/main.js b/www/slide/main.js
index eb9919abc..d1972fae4 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -482,7 +482,10 @@ define([
                 // CSS
                 $('<label>', {'for': 'cssPrint'}).text(Messages.printCSS).appendTo($p);
                 $p.append($('<br>'));
-                var $textarea = $('<textarea>', {'id':'cssPrint'}).css({'width':'100%', 'height':'100px'}).appendTo($p);
+                var $textarea = $('<textarea>', {'id':'cssPrint'}).css({'width':'100%', 'height':'100px'}).appendTo($p)
+                    .on('keydown keyup', function (e) {
+                        e.stopPropagation();
+                    });
                 $textarea.val(slideOptionsTmp.style);
                 window.setTimeout(function () { $textarea.focus(); }, 0);
 
@@ -504,7 +507,7 @@ define([
 
                 var $nav = $('<nav>').appendTo($div);
                 var $cancel = $('<button>', {'class': 'cancel'}).text(Messages.cancelButton).appendTo($nav).click(todoCancel);
-                var $ok = $('<button>', {'class': 'ok'}).text(Messages.slideOptionsButton).appendTo($nav).click(todo);
+                var $ok = $('<button>', {'class': 'ok'}).text(Messages.settings_save).appendTo($nav).click(todo);
 
                 return $container;
             };