Merge pull request livecode#5969 from livecodeian/bugfix-16713

livecodeali · web-flow · commit 0c6d1178b5c3 · 2017-10-02T16:43:04.000+01:00
[[ Bug 16713 ]] Check order of buttons when returning answer dialog result
diff --git a/docs/notes/bugfix-16713.md b/docs/notes/bugfix-16713.md
@@ -0,0 +1 @@
+# Return correct button from answer dialog when "ok","cancel" options swapped
diff --git a/engine/src/em-dc.cpp b/engine/src/em-dc.cpp
@@ -291,7 +291,7 @@ MCScreenDC::wait(real64_t p_duration,
 
 // These functions are implemented in javascript
 extern "C" int32_t MCEmscriptenDialogShowAlert(const unichar_t* p_message, size_t p_message_length);
-extern "C" int32_t MCEmscriptenDialogShowConfirm(const unichar_t* p_message, size_t p_message_length);
+extern "C" bool MCEmscriptenDialogShowConfirm(const unichar_t* p_message, size_t p_message_length);
 extern "C" int32_t MCEmscriptenDialogShowPrompt(const unichar_t* p_message, size_t p_message_length, const unichar_t* p_default, size_t p_default_length, unichar_t** r_result, size_t* r_result_length);
 
 int32_t
@@ -316,7 +316,21 @@ MCScreenDC::popupanswerdialog(MCStringRef *p_buttons, uint32_t p_button_count, u
             
         case 2:
             // Two buttons - treat it as an "OK"/"Cancel" button pair
-            t_result = MCEmscriptenDialogShowConfirm(t_message_u16.Ptr(), t_message_u16.Size());
+            {
+                int32_t t_ok_button = 0, t_cancel_button = 1;
+                // check order of ok/cancel
+                if (MCStringIsEqualToCString(p_buttons[1], "ok", kMCStringOptionCompareCaseless) ||
+                    MCStringIsEqualToCString(p_buttons[0], "cancel", kMCStringOptionCompareCaseless))
+                {
+                    t_ok_button = 1;
+                    t_cancel_button = 0;
+                }
+                
+                if (MCEmscriptenDialogShowConfirm(t_message_u16.Ptr(), t_message_u16.Size()))
+                    t_result = t_ok_button;
+                else
+                    t_result = t_cancel_button;
+            }
             break;
             
         default:
diff --git a/engine/src/em-dialog.js b/engine/src/em-dialog.js
@@ -30,13 +30,8 @@ mergeInto(LibraryManager.library, {
         showConfirm: function(message_buffer, message_length) {
             var message = LiveCodeUtil.stringFromUTF16(message_buffer, message_length);
           
-            // Confirm returns true/false but we need the button ID
             var result = confirm(message);
-            if (result) {
-                return 0;
-            } else {
-                return 1;
-            }
+            return result;
         },
           
           showPrompt: function(message_buffer, message_length, default_buffer, default_length, return_buffer, return_length) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Return correct button from answer dialog when "ok","cancel" options swapped`