mirror of
https://github.com/krateng/maloja.git
synced 2023-08-10 21:12:55 +03:00
Made incomplete merging process a bit less permanent
This commit is contained in:
parent
6e8cbe6a57
commit
b31e778d95
@ -108,7 +108,7 @@ function doneEditing() {
|
|||||||
// MERGING
|
// MERGING
|
||||||
|
|
||||||
function markForMerge() {
|
function markForMerge() {
|
||||||
const lcst = window.localStorage;
|
const lcst = window.sessionStorage;
|
||||||
var key = "marked_for_merge_" + entity_type;
|
var key = "marked_for_merge_" + entity_type;
|
||||||
var current_stored = (lcst.getItem(key) || '').split(",");
|
var current_stored = (lcst.getItem(key) || '').split(",");
|
||||||
current_stored = current_stored.filter((x)=>x).map((x)=>parseInt(x));
|
current_stored = current_stored.filter((x)=>x).map((x)=>parseInt(x));
|
||||||
@ -119,7 +119,7 @@ function markForMerge() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function merge() {
|
function merge() {
|
||||||
const lcst = window.localStorage;
|
const lcst = window.sessionStorage;
|
||||||
var key = "marked_for_merge_" + entity_type;
|
var key = "marked_for_merge_" + entity_type;
|
||||||
var current_stored = lcst.getItem(key).split(",");
|
var current_stored = lcst.getItem(key).split(",");
|
||||||
current_stored = current_stored.filter((x)=>x).map((x)=>parseInt(x));
|
current_stored = current_stored.filter((x)=>x).map((x)=>parseInt(x));
|
||||||
|
Loading…
Reference in New Issue
Block a user