From 6794e309af03ff83929dca85399195b743253d02 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Thu, 7 Jun 2018 11:05:59 +0530 Subject: [PATCH] port saveAsHtml --- webmaker/src/components/ContentWrap.jsx | 77 +-- webmaker/src/components/Footer.jsx | 1 + webmaker/src/components/app.jsx | 42 +- webmaker/src/utils.js | 603 ++++++++++++++---------- 4 files changed, 373 insertions(+), 350 deletions(-) diff --git a/webmaker/src/components/ContentWrap.jsx b/webmaker/src/components/ContentWrap.jsx index 77ff52e..1073a14 100644 --- a/webmaker/src/components/ContentWrap.jsx +++ b/webmaker/src/components/ContentWrap.jsx @@ -2,7 +2,7 @@ import { h, Component } from 'preact'; import UserCodeMirror from './UserCodeMirror.jsx'; import { computeHtml, computeCss, computeJs } from '../computes'; import { modes, HtmlModes, CssModes, JsModes } from '../codeModes'; -import { log, writeFile, loadJS } from '../utils'; +import { log, writeFile, loadJS, getCompleteHtml } from '../utils'; import { SplitPane } from './SplitPane.jsx'; import { trackEvent } from '../analytics'; import CodeMirror from '../CodeMirror'; @@ -76,78 +76,15 @@ export default class ContentWrap extends Component { } clearConsole() {} - /* eslint max-params: ["error", 4] */ - getCompleteHtml(html, css, js, isForExport) { - if (!this.props.currentItem) { - return ''; - } - var externalJs = this.props.currentItem.externalLibs.js - .split('\n') - .reduce(function(scripts, url) { - return scripts + (url ? '\n' : ''); - }, ''); - var externalCss = this.props.currentItem.externalLibs.css - .split('\n') - .reduce(function(links, url) { - return ( - links + - (url ? '\n' : '') - ); - }, ''); - var contents = - '\n' + - '\n\n' + - '\n' + - externalCss + - '\n' + - '\n' + - '\n' + - '\n' + - html + - '\n' + - externalJs + - '\n'; - - if (!isForExport) { - contents += - ''; - } - - if (this.jsMode === JsModes.ES6) { - contents += - ''; - } - - if (typeof js === 'string') { - contents += '\n\n'; - - return contents; - } - createPreviewFile(html, css, js) { const shouldInlineJs = !window.webkitRequestFileSystem || !window.IS_EXTENSION; - var contents = this.getCompleteHtml(html, css, shouldInlineJs ? js : null); + var contents = getCompleteHtml( + html, + css, + shouldInlineJs ? js : null, + this.props.currentItem + ); var blob = new Blob([contents], { type: 'text/plain;charset=UTF-8' }); var blobjs = new Blob([js], { type: 'text/plain;charset=UTF-8' }); diff --git a/webmaker/src/components/Footer.jsx b/webmaker/src/components/Footer.jsx index 1f9efd8..8e33e47 100644 --- a/webmaker/src/components/Footer.jsx +++ b/webmaker/src/components/Footer.jsx @@ -17,6 +17,7 @@ export default class Footer extends Component {