fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor: refactoring the way document properties are kept
[fnpeditor.git]
/
src
/
editor
/
modules
/
data
/
data.js
diff --git
a/src/editor/modules/data/data.js
b/src/editor/modules/data/data.js
index
dd81909
..
0bce5dc
100644
(file)
--- a/
src/editor/modules/data/data.js
+++ b/
src/editor/modules/data/data.js
@@
-16,11
+16,20
@@
var logger = logging.getLogger('editor.modules.data'),
return function(sandbox) {
var document_id = sandbox.getBootstrappedData().document_id;
return function(sandbox) {
var document_id = sandbox.getBootstrappedData().document_id;
- var document_version = sandbox.getBootstrappedData().version;
var history = sandbox.getBootstrappedData().history;
var documentDirty = false;
var draftDirty = false;
var history = sandbox.getBootstrappedData().history;
var documentDirty = false;
var draftDirty = false;
+ var documentProperties = {};
+ var data = sandbox.getBootstrappedData();
+ Object.keys(data)
+ .filter(function(key) {
+ return key !== 'history' && key !== 'document';
+ })
+ .forEach(function(key) {
+ documentProperties[key] = data[key];
+ });
+
var wlxmlDocument, text;
var loadDocument = function(text) {
var wlxmlDocument, text;
var loadDocument = function(text) {
@@
-41,11
+50,14
@@
return function(sandbox) {
});
var modificationFlag = true;
});
var modificationFlag = true;
-
wlxmlDocument.on('change',
function() {
+
var handleChange =
function() {
documentDirty = true;
draftDirty = true;
modificationFlag = true;
documentDirty = true;
draftDirty = true;
modificationFlag = true;
- });
+ };
+ wlxmlDocument.on('change', handleChange);
+ wlxmlDocument.on('contentSet', handleChange);
+
if(window.localStorage) {
window.setInterval(function() {
if(modificationFlag) {
if(window.localStorage) {
window.setInterval(function() {
if(modificationFlag) {
@@
-54,9
+66,9
@@
return function(sandbox) {
}
if(wlxmlDocument && documentDirty && draftDirty) {
logger.debug('Saving draft to local storage.');
}
if(wlxmlDocument && documentDirty && draftDirty) {
logger.debug('Saving draft to local storage.');
- sandbox.publish('savingStarted');
+ sandbox.publish('savingStarted'
, 'local'
);
window.localStorage.setItem(getLocalStorageKey(), wlxmlDocument.toXML());
window.localStorage.setItem(getLocalStorageKey(), wlxmlDocument.toXML());
- sandbox.publish('savingEnded', 'success');
+ sandbox.publish('savingEnded', 'success'
, 'local'
);
draftDirty = false;
}
}, sandbox.getConfig().autoSaveInterval || 2500);
draftDirty = false;
}
}, sandbox.getConfig().autoSaveInterval || 2500);
@@
-101,7
+113,7
@@
return function(sandbox) {
};
var getLocalStorageKey = function() {
};
var getLocalStorageKey = function() {
- return 'draft-id:' + document_id + '-ver:' + document
_
version;
+ return 'draft-id:' + document_id + '-ver:' + document
Properties.
version;
};
};
@@
-156,11
+168,11
@@
return function(sandbox) {
});
dialog.on('execute', function(event) {
});
dialog.on('execute', function(event) {
- sandbox.publish('savingStarted');
+ sandbox.publish('savingStarted'
, 'remote'
);
var formData = event.formData;
formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
var formData = event.formData;
formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
- formData[documentSaveForm.version_field_name] = document
_
version;
+ formData[documentSaveForm.version_field_name] = document
Properties.
version;
if(sandbox.getConfig().jsonifySentData) {
formData = JSON.stringify(formData);
}
if(sandbox.getConfig().jsonifySentData) {
formData = JSON.stringify(formData);
}
@@
-172,11
+184,19
@@
return function(sandbox) {
data: formData,
success: function(data) {
event.success();
data: formData,
success: function(data) {
event.success();
- sandbox.publish('savingEnded', 'success', data.version);
- document_version = data.version;
+ sandbox.publish('savingEnded', 'success', 'remote', data);
+
+ Object.keys(data)
+ .filter(function(key) {
+ return key !== 'text';
+ })
+ .forEach(function(key) {
+ documentProperties[key] = data[key];
+ });
+
reloadHistory();
},
reloadHistory();
},
- error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
+ error: function() {event.error(); sandbox.publish('savingEnded', 'error'
, 'remote'
);}
});
});
dialog.on('cancel', function() {
});
});
dialog.on('cancel', function() {
@@
-224,7
+244,13
@@
return function(sandbox) {
url: sandbox.getConfig().documentRestoreUrl(document_id),
data: formData,
success: function(data) {
url: sandbox.getConfig().documentRestoreUrl(document_id),
data: formData,
success: function(data) {
- document_version = data.version;
+ Object.keys(data)
+ .filter(function(key) {
+ return key !== 'document';
+ })
+ .forEach(function(key) {
+ documentProperties = data[key];
+ });
reloadHistory();
wlxmlDocument.loadXML(data.document);
documentDirty = false;
reloadHistory();
wlxmlDocument.loadXML(data.document);
documentDirty = false;
@@
-235,11
+261,17
@@
return function(sandbox) {
});
dialog.show();
},
});
dialog.show();
},
+ dropDraft: function() {
+ logger.debug('Dropping a draft...');
+ wlxmlDocument.loadXML(sandbox.getBootstrappedData().document);
+ draftDirty = false;
+ logger.debug('Draft dropped');
+ },
getDocumentId: function() {
return document_id;
},
getDocumentId: function() {
return document_id;
},
- getDocument
Version
: function() {
- return document
_version
;
+ getDocument
Properties
: function() {
+ return document
Properties
;
}
};
};
}
};
};