Compare commits

..

No commits in common. "609ca4d3f5e1c6e20cd45f3c2fe4336b18dbb778" and "c3c36504ab837b87ef162539691fa0b4f45bc936" have entirely different histories.

3 changed files with 28 additions and 35 deletions

View File

@ -48,12 +48,19 @@ var Types;
Types[Types["REFRESH"] = 2] = "REFRESH";
})(Types || (Types = {}));
let rules = [{
let rules = [
{
match: (url) => {
return url.indexOf("/api/") >= 0;
},
type: Types.NOCACHE
},
{
match: (url) => {
return url.indexOf("/version_hash") >= 0;
},
type: Types.NOCACHE
},
{
match: () => {
return true;
@ -88,12 +95,7 @@ async function fromCache(request) {
return matching
let res = await fetch(request.clone());
await cache.put(request, {
match: (url) => {
return url.indexOf("/version_hash") >= 0;
},
type: Types.NOCACHE
}, res);
await cache.put(request, res);
return await cache.match(request);
}

View File

@ -12,14 +12,17 @@ import Modal from "../../modals/Modal";
const minRows = 3;
export default class EntryComponent extends Component<{ vault: Promise<IVault>, id: string | undefined, note: string | undefined }, { title: string, changed: boolean }> {
private text: string = "";
private vault: IVault;
// private lineHeight: number = 24;
private note: ViewNote;
old_text: string;
text: string = "";
vault: IVault;
lineHeight: number = 24;
note: ViewNote;
private rows: number = minRows;
rows: number = minRows;
private skip_save: boolean = false;
skip_save: boolean = false;
// loading?: LoadingModal;
constructor(props) {
super(props);
@ -27,16 +30,12 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
}
private toVault() {
// history.back()
history.back();
// Navigation.setPage("/vault", { id: this.vault.id }, { entry: "false" }, true);
}
async componentWillMount() {
this.text = "";
this.vault = undefined;
this.note = undefined;
this.rows = minRows;
this.skip_save = false;
this.setState({ changed: false, title: "" });
try {
this.skip_save = false;
// this.loading = new LoadingModal();
@ -65,10 +64,6 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
if (rows !== this.rows) {
this.rows = rows;
}
// async onKeypress(event) {
// event = event || window.event;
//
// }
let [title] = this.text.split("\n", 1);
this.setState({ title, changed })
// if (this.loading)
@ -91,6 +86,11 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
}
}
// async onKeypress(event) {
// event = event || window.event;
//
// }
componentWillUnmount() {
if (!this.skip_save)
this.save()
@ -161,10 +161,6 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
const delete_handler = async () => {
await this.vault.deleteNote(this.props.id);
this.toVault()
// async onKeypress(event) {
// event = event || window.event;
//
// }
}
return <div>
@ -178,18 +174,13 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
</header>
<div class="uk-container">
<textarea
// async onKeypress(event) {
// event = event || window.event;
//
// }
autofocus
value={this.text}
rows={this.rows}
class="doc uk-textarea"
style="width:100%;"
onInput={evt => this.textAreaChange(evt as KeyboardEvent)}
onKeyDown={evt => this.textAreaKeyPress(evt)}
onChange={evt => this.textAreaChange(evt as KeyboardEvent)}
onKeyUp={evt => this.textAreaChange(evt)}
ref={elm => {
if (elm)
setTimeout(() => elm.focus(), 500)

View File

@ -167,7 +167,7 @@ class NotesProvider {
public async start() {
const next = () => {
setTimeout(() => {
this.sync().then(next);
this.sync().then(() => next);
}, 30000)
}
this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0);