handleDataMessage: Remove if(confirm) checks, add try/catch

FREEBIE
8 years ago · 7e0bd82bd3
parent 832b343031
commit 7e0bd82bd3
1 changed files with 7 additions and 7 deletions
--- a/js/models/messages.js
+++ b/js/models/messages.js
@ -510,22 +510,22 @@

                                        console.log('done with handleDataMessage', message.idForLogging());

-                                        if (confirm) {
-                                            confirm();
-                                        }
+                                        confirm();
                                        return resolve();
                                    }
                                    catch (e) {
                                        handleError(e);
                                    }
                                }, function(error) {
-                                    console.log('handleDataMessage: Message', message.idForLogging(), 'was deleted');
+                                    try {
+                                        console.log('handleDataMessage: Message', message.idForLogging(), 'was deleted');

-                                    if (confirm) {
                                        confirm();
+                                        return resolve();
+                                    }
+                                    catch (e) {
+                                        handleError(e);
                                    }
-
-                                    return resolve();
                                });
                            }, handleError);
                        }, handleError);