From 3c363050f6845f189664864f5a49f1e979c2bdf5 Mon Sep 17 00:00:00 2001
From: "Emanuel F. Oliveira" <emanuel@radicalimaging.com>
Date: Thu, 29 Sep 2016 13:23:15 +0000
Subject: [PATCH] PWV-2: Removed duplicate keys on .jscsrc file and fix small
 glitch on form dialog promises.

---
 .jscsrc                                                  | 9 ++++-----
 .../ohif-core/client/components/bootstrap/dialog/form.js | 6 +++++-
 Packages/ohif-core/client/ui/dialog/form.js              | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.jscsrc b/.jscsrc
index 8c63714bf..4ff9c3ffb 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -18,9 +18,6 @@
     "requireSemicolons": true,
     "requireSpaceAfterBinaryOperators": true,
     "requireSpaceAfterComma": true,
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
     "requireSpaceBeforeObjectValues": true,
     "requireSpacesInsideObjectBrackets": "all",
     "requireLineBreakAfterVariableAssignment": true,
@@ -29,7 +26,6 @@
     "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
     "disallowKeywords": [ "with" ],
     "disallowMultipleLineBreaks": true,
-    "disallowKeywordsOnNewLine": [ "else" ],
     "requireLineFeedAtFileEnd": true,
     "disallowSpaceAfterObjectKeys": true,
     "disallowQuotedKeysInObjects": true,
@@ -37,7 +33,10 @@
     "disallowVar": true,
     "validateLineBreaks": "LF",
     "validateIndentation": 4,
-    "validateQuoteMarks": { "mark": "'", "escape": true },
+    "validateQuoteMarks": {
+        "mark": "'",
+        "escape": true
+    },
     "validateParameterSeparator": ", ",
     "requireDollarBeforejQueryAssignment": true
 }
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.js b/Packages/ohif-core/client/components/bootstrap/dialog/form.js
index 258c66489..a038a641e 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/form.js
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.js
@@ -5,6 +5,7 @@ Template.dialogForm.onCreated(() => {
     const instance = Template.instance();
 
     instance.api = {
+
         confirm() {
             // Check if the form has valid data
             const form = instance.$('form').data('component');
@@ -20,6 +21,7 @@ Template.dialogForm.onCreated(() => {
                 instance.data.promiseResolve(formData);
             }
         },
+
         cancel() {
             // Call the cancel callback or resolve the promise
             if (_.isFunction(instance.data.cancelCallback)) {
@@ -28,6 +30,7 @@ Template.dialogForm.onCreated(() => {
                 instance.data.promiseReject();
             }
         }
+
     };
 });
 
@@ -44,5 +47,6 @@ Template.dialogForm.onRendered(() => {
     // Remove the created modal backdrop from DOM after promise is done
     const $backdrop = $modal.next('.modal-backdrop');
     const dismissDialogBackdrop = () => $backdrop.remove();
-    instance.data.promise.then(dismissDialogBackdrop).catch(dismissDialogBackdrop);
+    instance.data.promise.then(dismissDialogBackdrop, dismissDialogBackdrop);
+
 });
diff --git a/Packages/ohif-core/client/ui/dialog/form.js b/Packages/ohif-core/client/ui/dialog/form.js
index 9b72e0a57..b094c5470 100644
--- a/Packages/ohif-core/client/ui/dialog/form.js
+++ b/Packages/ohif-core/client/ui/dialog/form.js
@@ -31,7 +31,7 @@ OHIF.ui.showFormDialog = (templateName, dialogData) => {
 
     // Destroy the created dialog view when the promise is either resolved or rejected
     const dismissModal = () => Blaze.remove(view);
-    promise.then(dismissModal).catch(dismissModal);
+    promise.then(dismissModal, dismissModal);
 
     // Return the promise to allow callbacks stacking from outside
     return promise;