From f320b3363bfad6e90ebf4e6c0deb602151a55dcc Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Thu, 10 May 2018 10:18:55 +0900
Subject: [PATCH] Move registerSetting to index

---
 packages/vulcan-forms/lib/components/Form.jsx | 6 ++----
 packages/vulcan-forms/lib/modules/index.js    | 6 ++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 34c8cf45d..76fe3578d 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -24,7 +24,7 @@ This component expects:
 
 import {
   registerComponent, Components, runCallbacks, getCollection,
-  getErrors, registerSetting, getSetting, Utils
+  getErrors, getSetting, Utils
 } from 'meteor/vulcan:core';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
@@ -42,9 +42,6 @@ import isEqualWith from 'lodash/isEqualWith';
 
 import { convertSchema, formProperties } from '../modules/schema_utils';
 
-registerSetting('forms.warnUnsavedChanges', false,
-  'Warn user about unsaved changes before leaving route', true);
-
 // unsetCompact
 const unsetCompact = (object, path) => {
   const parentPath = path.slice(0, path.lastIndexOf('.'));
@@ -621,6 +618,7 @@ class Form extends Component {
     // run error callback if it exists
     if (this.props.errorCallback) this.props.errorCallback(document, error);
   
+    // scroll back up to show error messages
     Utils.scrollIntoView('.flash-message');
   };
 
diff --git a/packages/vulcan-forms/lib/modules/index.js b/packages/vulcan-forms/lib/modules/index.js
index 1b45d47fa..c3e7afba8 100644
--- a/packages/vulcan-forms/lib/modules/index.js
+++ b/packages/vulcan-forms/lib/modules/index.js
@@ -1,5 +1,7 @@
-import { registerComponent } from 'meteor/vulcan:core';
+import { registerComponent, registerSetting } from 'meteor/vulcan:core';
+
+registerSetting('forms.warnUnsavedChanges', false, 'Warn user about unsaved changes before leaving route', true);
 
 import './components.js';
 
-export {default as FormWrapper} from '../components/FormWrapper.jsx';
\ No newline at end of file
+export { default as FormWrapper } from '../components/FormWrapper.jsx';