fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smartxml: Document can create node from xml string
[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
a8144cb
..
8757389
100644
(file)
--- a/
src/editor/modules/data/data.js
+++ b/
src/editor/modules/data/data.js
@@
-1,9
+1,10
@@
define([
'libs/jquery',
'./saveDialog',
define([
'libs/jquery',
'./saveDialog',
- 'wlxml/wlxml'
+ 'wlxml/wlxml',
+ 'wlxml/extensions/list/list'
-], function($, saveDialog, wlxml) {
+], function($, saveDialog, wlxml
, listExtension
) {
'use strict';
'use strict';
@@
-15,10
+16,17
@@
return function(sandbox) {
var history = sandbox.getBootstrappedData().history;
var wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
var history = sandbox.getBootstrappedData().history;
var wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
+
+ wlxmlDocument.registerExtension(listExtension);
+ sandbox.getPlugins().forEach(function(plugin) {
+ if(plugin.documentExtension) {
+ wlxmlDocument.registerExtension(plugin.documentExtension);
+ }
+ });
function readCookie(name) {
function readCookie(name) {
- /* global escape, unescape */
+ /* global escape, unescape
, document
*/
var nameEQ = escape(name) + '=';
var ca = document.cookie.split(';');
for (var i = 0; i < ca.length; i++) {
var nameEQ = escape(name) + '=';
var ca = document.cookie.split(';');
for (var i = 0; i < ca.length; i++) {
@@
-45,7
+53,7
@@
return function(sandbox) {
var reloadHistory = function() {
$.ajax({
method: 'get',
var reloadHistory = function() {
$.ajax({
method: 'get',
- url:
'/' + gettext('editor') + '/' + document_id + '/history'
,
+ url:
sandbox.getConfig().documentHistoryUrl(document_id)
,
success: function(data) {
history = data;
sandbox.publish('historyItemAdded', data.slice(-1)[0]);
success: function(data) {
history = data;
sandbox.publish('historyItemAdded', data.slice(-1)[0]);
@@
-61,18
+69,34
@@
return function(sandbox) {
return wlxmlDocument;
},
saveDocument: function() {
return wlxmlDocument;
},
saveDocument: function() {
-
- var dialog = saveDialog.create();
+ var documentSaveForm = $.extend({
+ fields: [],
+ content_field_name: 'text',
+ version_field_name: 'version'
+ },
+ sandbox.getConfig().documentSaveForm
+ ),
+ dialog = saveDialog.create({fields: documentSaveForm.fields});
+
dialog.on('save', function(event) {
sandbox.publish('savingStarted');
dialog.on('save', function(event) {
sandbox.publish('savingStarted');
+
+ var formData = event.formData;
+ formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
+ formData[documentSaveForm.version_field_name] = document_version;
+ if(sandbox.getConfig().jsonifySentData) {
+ formData = JSON.stringify(formData);
+ }
+
dialog.toggleButtons(false);
$.ajax({
method: 'post',
dialog.toggleButtons(false);
$.ajax({
method: 'post',
- url:
'/' + gettext('editor') + '/' + document_id
,
- data:
JSON.stringify({document:wlxmlDocument.toXML(), description: event.data.description})
,
- success: function() {
+ url:
sandbox.getConfig().documentSaveUrl(document_id)
,
+ data:
formData
,
+ success: function(
data
) {
event.success();
event.success();
- sandbox.publish('savingEnded', 'success');
+ sandbox.publish('savingEnded', 'success', data.version);
+ document_version = data.version;
reloadHistory();
},
error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
reloadHistory();
},
error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
@@
-90,7
+114,7
@@
return function(sandbox) {
fetchDiff: function(ver1, ver2) {
$.ajax({
method: 'get',
fetchDiff: function(ver1, ver2) {
$.ajax({
method: 'get',
- url: '/' + gettext('editor') + '/
' + document_id + '/diff'
,
+ url: '/' + gettext('editor') + '/
diff/' + document_id
,
data: {from: ver1, to: ver2},
success: function(data) {
sandbox.publish('diffFetched', {table: data, ver1: ver1, ver2: ver2});
data: {from: ver1, to: ver2},
success: function(data) {
sandbox.publish('diffFetched', {table: data, ver1: ver1, ver2: ver2});
@@
-106,8
+130,9
@@
return function(sandbox) {
url: '/' + gettext('editor') + '/' + document_id + '/revert',
data: JSON.stringify(options),
success: function(data) {
url: '/' + gettext('editor') + '/' + document_id + '/revert',
data: JSON.stringify(options),
success: function(data) {
- document_version = data.version;
+ document_version = data.
current_
version;
reloadHistory();
reloadHistory();
+ wlxmlDocument.loadXML(data.document);
sandbox.publish('documentReverted', data);
},
});
sandbox.publish('documentReverted', data);
},
});