diff --git a/.jscsrc b/.jscsrc index 6003e1d85..8c63714bf 100644 --- a/.jscsrc +++ b/.jscsrc @@ -11,7 +11,6 @@ "disallowKeywordsOnNewLine": ["else"], "disallowNewlineBeforeBlockStatements": true, "requirePaddingNewLinesAfterUseStrict": true, - "requirePaddingNewLinesInObjects": true, "requirePaddingNewLinesAfterBlocks": { "allExcept": ["inCallExpressions", "inArrayExpressions", "inProperties"] }, diff --git a/Packages/ohif-core/client/components/base/template.js b/Packages/ohif-core/client/components/base/template.js index 979e9189a..1b56db365 100644 --- a/Packages/ohif-core/client/components/base/template.js +++ b/Packages/ohif-core/client/components/base/template.js @@ -1,5 +1,7 @@ -import { OHIF } from 'meteor/ohif:core'; +import { Template } from 'meteor/templating'; +import { Blaze } from 'meteor/blaze'; import { _ } from 'meteor/underscore'; +import { OHIF } from 'meteor/ohif:core'; // Create a new custom template for the base component Template.baseComponent = new Template('baseComponent', () => {}); @@ -30,9 +32,6 @@ Template.baseComponent.constructView = function(contentFunc, elseFunc) { // Extract the render function from the base template template.renderFunction = baseTemplate.renderFunction; - // Check for the mixins. If it's not informed set the lowest level mixin - const mixins = data.mixins || 'component'; - // Init the data manipulation mixins OHIF.Mixin.initData(data); diff --git a/Packages/ohif-core/client/components/base/templates/form.html b/Packages/ohif-core/client/components/base/templates/form.html index e5a4e0e4a..ca7c66c00 100644 --- a/Packages/ohif-core/client/components/base/templates/form.html +++ b/Packages/ohif-core/client/components/base/templates/form.html @@ -11,7 +11,7 @@ target="{{this.target}}" {{this.tagAttributes}} > - {{#if validationErrors}} + {{#if (and validationErrors (not this.hideValidationBox))}}