Changeset 7157 for SRUAggregator

Timestamp:

10/24/17 18:09:52 (7 years ago)

Author:

Leif-Jöran

Message:

Small refactoring for React v16.0.0

Location:

SRUAggregator/trunk/src/main/resources/assets/js

Files:

• components/footer.jsx (modified) (1 diff)
• main.js (modified) (2 diffs)
• main.jsx (modified) (1 diff)

SRUAggregator/trunk/src/main/resources/assets/js/components/footer.jsx

@@ -10 +10 @@
     propTypes: {
         VERSION: PT.string.isRequired,
+        toAbout: PT.func.isRequired,
     },
 
     toAbout: function(e) {
-        main.toAbout(true);
+        this.props.toAbout(true);
         e.preventDefault();
         e.stopPropagation();

SRUAggregator/trunk/src/main/resources/assets/js/main.js

@@ -23898 +23898 @@
                         //fixme! - class Footer extends React.Component {
                         propTypes: {
-                                                VERSION: PT.string.isRequired
+                                                VERSION: PT.string.isRequired,
+                                                toAbout: PT.func.isRequired
                         },
 
                         toAbout: function toAbout(e) {
-                                                main.toAbout(true);
+                                                this.props.toAbout(true);
                                                 e.preventDefault();
                                                 e.stopPropagation();
@@ -25989 +25990 @@
         var main = ReactDOM.render(React.createElement(Main, null), document.getElementById('body'));
         if (!isEmbeddedView()) {
-                ReactDOM.render(React.createElement(_footer2.default, { VERSION: VERSION }), document.getElementById('footer'));
+                ReactDOM.render(React.createElement(_footer2.default, { VERSION: VERSION, toAbout: main.toAbout }), document.getElementById('footer'));
         } else {
                 ReactDOM.render(React.createElement(_embeddedfooter2.default, { URLROOT: URLROOT }), document.getElementById('footer'));

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -269 +269 @@
 var main = ReactDOM.render(<Main />,  document.getElementById('body'));
 if (!isEmbeddedView()) {
-        ReactDOM.render(<Footer VERSION={VERSION} />, document.getElementById('footer') );
+        ReactDOM.render(<Footer VERSION={VERSION} toAbout={main.toAbout}/>, document.getElementById('footer') );
 } else {
         ReactDOM.render(<EmbeddedFooter URLROOT={URLROOT} />, document.getElementById('footer') );