muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 19:16:41 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

possibly fixed editor initialData

Browse source
This commit is contained in:
muerwre 2018-09-04 10:45:33 +07:00
parent fce88cac29
commit 25d9b1d2df
3 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/save/SaveDialog.jsx
View file

@ -60,6 +60,12 @@ export class SaveDialog extends React.Component {
setSuccess = ({ address, description }) => {
pushPath(`/${address}/edit`);
console.log('addr?', address);
this.props.editor.setAddress(address);
this.props.editor.owner = this.props.user.id;
this.props.editor.setInitialData();
this.setState({
error: description, finished: true, sending: true, overwriting: false
});

5
src/containers/App.jsx
View file

@ -67,7 +67,10 @@ export class App extends React.Component {
};
setTitle = title => this.setState({ title });
setAddress = address => this.setState({ address });
setAddress = address => {
console.log('SAT', address);
this.setState({ address });
};
getTitle = () => this.state.title;

38
src/modules/Editor.js
View file

@ -190,7 +190,9 @@ export class Editor {
setData = ({ route, stickers, version = 1, owner, title, address }) => {
this.setTitle(title || '');
this.setAddress(address || '');
const { id } = this.getUser();
if (address && id && owner && id === owner) this.setAddress(address);
if (route) {
this.poly.setPoints(route);
@ -215,21 +217,9 @@ export class Editor {
if (Object.values(bounds)) this.map.map.fitBounds(bounds);
};
startEditing = () => {
setInitialData = () => {
const { path } = getUrlData();
const { random_url, id } = this.getUser();
// console.log('ID', id, this.owner);
const url = (this.owner && this.owner === id) ? path : random_url;
pushPath(`/${url}/edit`);
if (this.poly.latlngs && this.poly.latlngs.length > 1) this.poly.poly.enableEdit();
this.stickers.startEditing();
this.setEditing(true);
const { id } = this.getUser();
const { route, stickers } = this.dumpData();
this.initialData = {
@ -241,6 +231,22 @@ export class Editor {
route,
stickers,
};
};
startEditing = () => {
const { path } = getUrlData();
const { random_url, id } = this.getUser();
this.setInitialData();
const url = (this.owner && this.owner === id) ? path : random_url;
pushPath(`/${url}/edit`);
if (this.poly.latlngs && this.poly.latlngs.length > 1) this.poly.poly.enableEdit();
this.stickers.startEditing();
this.setEditing(true);
console.log(this.initialData);
};
@ -284,6 +290,6 @@ export class Editor {
hasEmptyHistory = () => {
const { route, stickers } = this.initialData;
return !(route && route.length >= 1 && stickers && stickers.length > 0);
return (!route || route.length < 1) && (!stickers || stickers.length <= 0);
}
}