mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-31 10:40:10 +02:00
Code Issues Releases Wiki Activity

resolve conflict n merge master

Browse Source
This commit is contained in:
Kushagra Gour
2019-02-28 17:04:51 +05:30
parent 75ad9249d6 7cb7d86dbd
commit c14b6d2336
8 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Notifications.jsx
View File

@@ -106,7 +106,14 @@ export function Notifications(props) {
<div>
<h1>Whats new?</h1>
<Notification version="3.6.1" {...props} isLatest={true}>
<Notification version="3.6.2" {...props} isLatest={true}>
<NotificationItem type="bug">
"404 Page not found" showing up in preview window when in detached
mode.
</NotificationItem>
</Notification>
<Notification version="3.6.1" {...props}>
<NotificationItem type="bug">
Failing to import local creations when logging in.
</NotificationItem>

2
src/components/app.jsx
View File

@@ -77,7 +77,7 @@ const LocalStorageKeys = {
ASKED_TO_IMPORT_CREATIONS: 'askedToImportCreations'
};
const UNSAVED_WARNING_COUNT = 15;
const version = '3.6.1';
const version = '3.6.2';
export default class App extends Component {
constructor() {

4
src/detached-window.js
View File

@@ -1,6 +1,6 @@
window.addEventListener('message', e => {
// Recieving from app window
if (e.data && e.data.contents) {
if (e.data && e.data.contents && e.data.contents.match(/<html/)) {
const frame = document.querySelector('iframe');
frame.src = frame.src;
setTimeout(() => {
@@ -9,7 +9,7 @@ window.addEventListener('message', e => {
frame.contentDocument.close();
}, 10);
}
if (e.data && e.data.url) {
if (e.data && e.data.url && e.data.match(/preview\.html/)) {
document.querySelector('iframe').src = e.data.url;
}

2
src/manifest.json
View File

@@ -1,6 +1,6 @@
{
"name": "Web Maker",
"version": "3.6.1",
"version": "3.6.2",
"manifest_version": 2,
"description": "Blazing fast & offline playground for your web experiments",
"homepage_url": "https://webmakerapp.com",

2
src/options.html
View File

@@ -37,7 +37,7 @@
<body>
<h3>Settings
<span style="opacity: 0.6;font-size:0.7em;">
v3.6.1</span>
v3.6.2</span>
</h3>
<form name="optionsForm">
<label>