TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PWV-2: Removed duplicate keys on .jscsrc file and fix small glitch on form dialog promises.

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2016-09-29 13:23:15 +00:00 committed by Erik Ziegler
parent 8aa8b4288c
commit 3c363050f6
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.jscsrc
View File

@ -18,9 +18,6 @@
"requireSemicolons": true, "requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true, "requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterComma": true, "requireSpaceAfterComma": true,
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"requireSpaceBeforeObjectValues": true, "requireSpaceBeforeObjectValues": true,
"requireSpacesInsideObjectBrackets": "all", "requireSpacesInsideObjectBrackets": "all",
"requireLineBreakAfterVariableAssignment": true, "requireLineBreakAfterVariableAssignment": true,
@ -29,7 +26,6 @@
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowKeywords": [ "with" ], "disallowKeywords": [ "with" ],
"disallowMultipleLineBreaks": true, "disallowMultipleLineBreaks": true,
"disallowKeywordsOnNewLine": [ "else" ],
"requireLineFeedAtFileEnd": true, "requireLineFeedAtFileEnd": true,
"disallowSpaceAfterObjectKeys": true, "disallowSpaceAfterObjectKeys": true,
"disallowQuotedKeysInObjects": true, "disallowQuotedKeysInObjects": true,
@ -37,7 +33,10 @@
"disallowVar": true, "disallowVar": true,
"validateLineBreaks": "LF", "validateLineBreaks": "LF",
"validateIndentation": 4, "validateIndentation": 4,
"validateQuoteMarks": { "mark": "'", "escape": true }, "validateQuoteMarks": {
"mark": "'",
"escape": true
},
"validateParameterSeparator": ", ", "validateParameterSeparator": ", ",
"requireDollarBeforejQueryAssignment": true "requireDollarBeforejQueryAssignment": true
} }

6
Packages/ohif-core/client/components/bootstrap/dialog/form.js
View File

@ -5,6 +5,7 @@ Template.dialogForm.onCreated(() => {
const instance = Template.instance(); const instance = Template.instance();
instance.api = { instance.api = {
confirm() { confirm() {
// Check if the form has valid data // Check if the form has valid data
const form = instance.$('form').data('component'); const form = instance.$('form').data('component');
@ -20,6 +21,7 @@ Template.dialogForm.onCreated(() => {
instance.data.promiseResolve(formData); instance.data.promiseResolve(formData);
} }
}, },
cancel() { cancel() {
// Call the cancel callback or resolve the promise // Call the cancel callback or resolve the promise
if (_.isFunction(instance.data.cancelCallback)) { if (_.isFunction(instance.data.cancelCallback)) {
@ -28,6 +30,7 @@ Template.dialogForm.onCreated(() => {
instance.data.promiseReject(); instance.data.promiseReject();
} }
} }
}; };
}); });
@ -44,5 +47,6 @@ Template.dialogForm.onRendered(() => {
// Remove the created modal backdrop from DOM after promise is done // Remove the created modal backdrop from DOM after promise is done
const $backdrop = $modal.next('.modal-backdrop'); const $backdrop = $modal.next('.modal-backdrop');
const dismissDialogBackdrop = () => $backdrop.remove(); const dismissDialogBackdrop = () => $backdrop.remove();
instance.data.promise.then(dismissDialogBackdrop).catch(dismissDialogBackdrop); instance.data.promise.then(dismissDialogBackdrop, dismissDialogBackdrop);
}); });

2
Packages/ohif-core/client/ui/dialog/form.js
View File

@ -31,7 +31,7 @@ OHIF.ui.showFormDialog = (templateName, dialogData) => {
// Destroy the created dialog view when the promise is either resolved or rejected // Destroy the created dialog view when the promise is either resolved or rejected
const dismissModal = () => Blaze.remove(view); const dismissModal = () => Blaze.remove(view);
promise.then(dismissModal).catch(dismissModal); promise.then(dismissModal, dismissModal);
// Return the promise to allow callbacks stacking from outside // Return the promise to allow callbacks stacking from outside
return promise; return promise;