Merge pull request #7 from Snail-IDE/merge-upstream

Merge upstream

Author: someCatInTheWorld

src/components/tw-studioview/studioview.jsx

@@ -60,6 +60,11 @@ class StudioViewComponent extends React.Component {
     }
     handleSelect (id) {
         this.props.onSelect(id);
+        /**
+         * fuck this bullshity ass design paradigm, i cant find where the FUCK this event chain actually ends
+         * implicitly assume that what ever the fuck happens above will synchronously put the id into the url to be used later
+         */
+        window.location.reload();
     }
     ref (el) {
         this.el = el;

src/containers/home-communication.jsx

@@ -21,23 +21,14 @@ class HomeCommunication extends React.Component {
 
     componentDidMount() {
         window.addEventListener('message', this.wrapperEventHandler);
-        const iframe = document.createElement('iframe');
-        iframe.src = `${origin}/embed/editor?external=${encodeURIComponent(window.origin)}`;
-        iframe.width = 100;
-        iframe.height = 100;
-        iframe.style.display = 'none';
-        document.body.appendChild(iframe);
+        const iframe = document.getElementById('login');
 
         this.setState({
             frame: iframe
         });
     }
     componentWillUnmount() {
         window.removeEventListener('message', this.wrapperEventHandler);
-        const iframe = this.state.frame;
-        if (iframe) {
-            iframe.remove();
-        }
         this.setState({
             frame: null
         });
@@ -46,7 +37,7 @@ class HomeCommunication extends React.Component {
     async wrapperEventHandler(e) {
         const data = e.data;
         // Don't recursively try to run this event.
-        if (e.origin === window.origin) {
+        if (e.origin !== 'https://www.snail-ide.com') {
             return;
         }
         if (!data.type) return;

src/lib/tw-project-meta-fetcher-hoc.jsx

@@ -122,31 +122,27 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
                             new Date(rawData.date),
                             rawData.updating === true
                         );
-                    }
-                    if (rawData.remix > 0) {
-                        // this is a remix, find the original project
-                        fetchProjectMeta(rawData.remix)
-                            .then(remixProject => {
-                                // If project ID changed, ignore the results.
-                                if (this.props.projectId !== projectId) {
-                                    return;
-                                }
-                                // If this project is hidden or not approved, ignore the results.
-                                if (
-                                    typeof remixProject.name === 'string'
-                                    || typeof remixProject.owner === 'string'
-                                ) {
-                                    this.props.onSetRemixedProjectInfo(
-                                        true, // loaded
-                                        remixProject.name,
-                                        remixProject.owner
-                                    );
-                                }
-                            })
-                            .catch(err => {
-                                // this isnt fatal, just log
-                                log.warn('cannot fetch remixed project meta for this project;', err);
-                            });
+
+                        if (String(rawData.remix) !== '0') {
+                            // this is a remix, find the original project
+                            fetchProjectMeta(rawData.remix)
+                                .then(remixProject => {
+                                    // If this project is hidden or not approved, ignore the results.
+                                    if (
+                                        typeof remixProject.name === 'string'
+                                        || typeof remixProject.owner === 'string'
+                                    ) {
+                                        this.props.onSetRemixedProjectInfo(
+                                            true, // loaded
+                                            remixProject.name,
+                                            remixProject.owner
+                                        );
+                                    }
+                                }).catch(err => {
+                                    // this isnt fatal, just log
+                                    log.warn('cannot fetch remixed project meta for this project;', err);
+                                });
+                        }
                     }
                     setIndexable(true);
                 })

src/playground/addon-settings.jsx

@@ -22,7 +22,7 @@ import appTarget from './app-target';
 
 const onExportSettings = settings => {
     const blob = new Blob([JSON.stringify(settings)]);
-    downloadBlob('turbowarp-addon-settings.json', blob);
+    downloadBlob('penguinmod-addon-settings.json', blob);
 };
 
 ReactDOM.render((