From 2c72749af9e0b4ba330ad568bfea21def359a61e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 20 Oct 2016 08:37:41 +1300 Subject: [PATCH] Use new react API See https://github.com/silverstripe/silverstripe-framework/issues/5524 --- client/dist/legacy.js | 2 +- client/src/legacy/TestReactFormBuilder.js | 4 ++-- webpack.config.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/dist/legacy.js b/client/dist/legacy.js index 4af58c3..8ba2af9 100644 --- a/client/dist/legacy.js +++ b/client/dist/legacy.js @@ -11,4 +11,4 @@ setTimeout(function(){return t._renderForm()},100),this[0].style.setProperty("ov a["default"].render(c["default"].createElement(l.Provider,{store:e},c["default"].createElement(d["default"],{schemaUrl:r,handleSubmit:function o(){return t._handleSubmit.apply(t,arguments)}})),this[0]) },_clearForm:function u(){a["default"].unmountComponentAtNode(this[0])},_handleSubmit:function s(t,e,n){return t.preventDefault(),n()}}),t(".TestReactFormBuilder .nav-link").entwine({onclick:function f(t){ -t.preventDefault()}})})},function(t,e){t.exports=jQuery},function(t,e){t.exports=React},function(t,e){t.exports=ReactDom},function(t,e){t.exports=ReactRedux},function(t,e){t.exports=FormBuilder}]) +t.preventDefault()}})})},function(t,e){t.exports=jQuery},function(t,e){t.exports=React},function(t,e){t.exports=ReactDom},function(t,e){t.exports=ReactRedux},function(t,e){t.exports=FormBuilderLoader}]) diff --git a/client/src/legacy/TestReactFormBuilder.js b/client/src/legacy/TestReactFormBuilder.js index 9910647..747f2a7 100644 --- a/client/src/legacy/TestReactFormBuilder.js +++ b/client/src/legacy/TestReactFormBuilder.js @@ -2,7 +2,7 @@ import jQuery from 'jQuery'; import React from 'react'; import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; -import FormBuilder from 'components/FormBuilder/FormBuilder'; +import FormBuilderLoader from 'containers/FormBuilderLoader/FormBuilderLoader'; jQuery.entwine('ss', ($) => { /** @@ -37,7 +37,7 @@ jQuery.entwine('ss', ($) => { ReactDOM.render( - this._handleSubmit(...args)} /> diff --git a/webpack.config.js b/webpack.config.js index f905c59..430871b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -43,6 +43,7 @@ const config = { 'components/FormBuilderModal/FormBuilderModal': 'FormBuilderModal', 'components/FormBuilder/FormBuilder': 'FormBuilder', 'components/Toolbar/Toolbar': 'Toolbar', + 'containers/FormBuilderLoader/FormBuilderLoader': 'FormBuilderLoader', 'state/breadcrumbs/BreadcrumbsActions': 'BreadcrumbsActions', 'deep-freeze-strict': 'DeepFreezeStrict', i18n: 'i18n',