1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-08-03 20:07:35 +02:00
This commit is contained in:
Kushagra Gour
2017-11-19 22:00:47 +05:30
parent dbcb9ce3ff
commit 2482435088
4 changed files with 20 additions and 18 deletions

3
dist/index.html vendored
View File

@@ -6,7 +6,6 @@
<link rel="stylesheet" href="vendor.css"> <link rel="stylesheet" href="vendor.css">
<link rel="stylesheet" id="editorThemeLinkTag" href="lib/codemirror/theme/monokai.css"></link> <link rel="stylesheet" id="editorThemeLinkTag" href="lib/codemirror/theme/monokai.css"></link>
<!-- <link rel="stylesheet" id="editorThemeLinkTag" href="/dist/lib/codemirror/theme/monokai.css"></link> -->
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
@@ -291,7 +290,7 @@
<use xlink:href="#cross-icon"></use> <use xlink:href="#cross-icon"></use>
</svg> </svg>
</a> </a>
<h1>Web Maker<small style="font-size:14px;"> v2.9.3</small></h1> <h1>Web Maker<small style="font-size:14px;"> v2.9.4</small></h1>
<div> <div>
<p>Made with <span style="margin-right: 8px;">💖</span> & <span style="margin-right: 8px;">🙌</span> by <a href="https://twitter.com/chinchang457" target="_blank">Kushagra Gour</a></p> <p>Made with <span style="margin-right: 8px;">💖</span> & <span style="margin-right: 8px;">🙌</span> by <a href="https://twitter.com/chinchang457" target="_blank">Kushagra Gour</a></p>
<p>Tweet out your feature requests, comments & suggestions to <a target="_blank" href="https://twitter.com/webmakerApp">@webmakerApp</a>.</p> <p>Tweet out your feature requests, comments & suggestions to <a target="_blank" href="https://twitter.com/webmakerApp">@webmakerApp</a>.</p>

27
dist/script.js vendored
View File

@@ -607,7 +607,7 @@ globalConsoleContainerEl
(function(alertsService) { (function(alertsService) {
/* eslint-enable no-extra-semi */ /* eslint-enable no-extra-semi */
var scope = scope || {}; var scope = scope || {};
var version = '2.9.3'; var version = '2.9.4';
if (window.DEBUG) { if (window.DEBUG) {
window.scope = scope; window.scope = scope;
@@ -1578,7 +1578,7 @@ globalConsoleContainerEl
'"></script>'; '"></script>';
} }
if (js !== undefined) { if (typeof js === 'string') {
contents += '<script>\n' + js + '\n//# sourceURL=userscript.js'; contents += '<script>\n' + js + '\n//# sourceURL=userscript.js';
} else { } else {
var origin = chrome.i18n.getMessage() var origin = chrome.i18n.getMessage()
@@ -1647,7 +1647,7 @@ globalConsoleContainerEl
function createPreviewFile(html, css, js) { function createPreviewFile(html, css, js) {
const shouldInlineJs = !window.webkitRequestFileSystem; const shouldInlineJs = !window.webkitRequestFileSystem;
var contents = getCompleteHtml(html, css, shouldInlineJs ? js : ''); var contents = getCompleteHtml(html, css, shouldInlineJs ? js : null);
var blob = new Blob([contents], { type: 'text/plain;charset=UTF-8' }); var blob = new Blob([contents], { type: 'text/plain;charset=UTF-8' });
var blobjs = new Blob([js], { type: 'text/plain;charset=UTF-8' }); var blobjs = new Blob([js], { type: 'text/plain;charset=UTF-8' });
@@ -2292,8 +2292,7 @@ globalConsoleContainerEl
indentationSizeValueEl.textContent = $('[data-setting=indentSize]').value; indentationSizeValueEl.textContent = $('[data-setting=indentSize]').value;
// Replace correct css file in LINK tags's href // Replace correct css file in LINK tags's href
editorThemeLinkTag.href = editorThemeLinkTag.href = `lib/codemirror/theme/${prefs.editorTheme}.css`;
`lib/codemirror/theme/${prefs.editorTheme}.css`;
fontStyleTag.textContent = fontStyleTemplate.textContent.replace( fontStyleTag.textContent = fontStyleTemplate.textContent.replace(
/fontname/g, /fontname/g,
(prefs.editorFont === 'other' (prefs.editorFont === 'other'
@@ -2444,13 +2443,17 @@ globalConsoleContainerEl
'script $1:$2' 'script $1:$2'
); );
} }
scope.consoleCm.replaceRange( try {
arg + scope.consoleCm.replaceRange(
' ' + arg +
((arg + '').match(/\[object \w+]/) ? JSON.stringify(arg) : '') + ' ' +
'\n', ((arg + '').match(/\[object \w+]/) ? JSON.stringify(arg) : '') +
{ line: Infinity } '\n',
); { line: Infinity }
);
} catch (e) {
scope.consoleCm.replaceRange('🌀\n', { line: Infinity });
}
scope.consoleCm.scrollTo(0, Infinity); scope.consoleCm.scrollTo(0, Infinity);
logCount++; logCount++;
}); });

File diff suppressed because one or more lines are too long

4
dist/style.css vendored
View File

@@ -309,7 +309,7 @@ body > #demo-frame {
/*line-height: 20px;*/ /*line-height: 20px;*/
} }
.footer { .footer {
z-index: 1; z-index: 6; // Because .console is 6
} }
.main-header { .main-header {
display: flex; display: flex;
@@ -896,7 +896,7 @@ transition: 0.25s ease;
} }
.console { .console {
background: var(--color-bg); background: var(--color-bg);
z-index: 1; /* bring above iframe */ z-index: 6; /* bring above iframe & codemirror and also scrollbar in codemirror */
position: absolute; position: absolute;
bottom: 0; bottom: 0;
min-height: 80px; min-height: 80px;