X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/78644811ca0c6042212788dc67add42bc41fb74c..605e54d1303b67d8cabc742ec1e7df45ff0d9102:/platforma/static/js/models.js?ds=sidebyside
diff --git a/platforma/static/js/models.js b/platforma/static/js/models.js
old mode 100644
new mode 100755
index ab021f51..dae64d8a
--- a/platforma/static/js/models.js
+++ b/platforma/static/js/models.js
@@ -4,7 +4,6 @@ Editor.Model = Editor.Object.extend({
data: null
});
-
Editor.ToolbarButtonsModel = Editor.Model.extend({
className: 'Editor.ToolbarButtonsModel',
buttons: {},
@@ -16,7 +15,7 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({
load: function() {
if (!this.get('buttons').length) {
$.ajax({
- url: toolbarUrl,
+ url: documentInfo.toolbarURL,
dataType: 'json',
success: this.loadSucceeded.bind(this)
});
@@ -37,108 +36,275 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({
});
-// Stany modelu:
//
-// -> error -> loading
-// /
-// empty -> loading -> synced -> unsynced -> loading
-// \
-// -> dirty -> updating -> updated -> synced
+// HTML Document Model
//
-Editor.XMLModel = Editor.Model.extend({
- _className: 'Editor.XMLModel',
- serverURL: null,
- data: '',
+Editor.HTMLModel = Editor.Model.extend({
+ _className: 'Editor.HTMLModel',
+ textURL: null,
state: 'empty',
-
- init: function(serverURL, revision) {
+
+ init: function(document, textURL) {
this._super();
this.set('state', 'empty');
- this.set('revision', revision);
- this.serverURL = serverURL;
- this.toolbarButtonsModel = new Editor.ToolbarButtonsModel();
+ this.set('revision', document.get('revision'));
+ this.document = document;
+
+ this.textURL = textURL;
+
+ this.htmlXSL = null;
+ this.wlmlXSL = null;
+ this.rawText = null;
+
+ // create a parser and a serializer
+ this.parser = new DOMParser();
+ this.serializer = new XMLSerializer();
+
this.addObserver(this, 'data', this.dataChanged.bind(this));
},
-
+
load: function(force) {
if (force || this.get('state') == 'empty') {
this.set('state', 'loading');
- messageCenter.addMessage('info', 'WczytujÄ XML...');
+ messageCenter.addMessage('info', 'xmlload', 'WczytujÄ HTML...');
+
+ // request all stylesheets
$.ajax({
- url: this.serverURL,
+ url: documentInfo.staticURL + 'xsl/wl2html_client.xsl',
+ dataType: 'xml',
+ success: this.htmlXSLLoadSuccess.bind(this),
+ error: this.loadingFailed.bind(this)
+ });
+
+ $.ajax({
+ url: documentInfo.staticURL + 'xsl/html2wl_client.xsl',
+ dataType: 'xml',
+ success: this.wlmlXSLLoadSuccess.bind(this),
+ error: this.loadingFailed.bind(this)
+ });
+
+ $.ajax({
+ url: this.textURL,
dataType: 'text',
data: {
- revision: this.get('revision')
+ revision: this.get('revision'),
+ user: this.document.get('user')
},
- success: this.loadingSucceeded.bind(this),
+ success: this.textLoadSuccess.bind(this),
error: this.loadingFailed.bind(this)
});
return true;
}
return false;
},
-
- loadingSucceeded: function(data) {
+
+ asWLML: function(element, inner)
+ {
+ console.log("Source", element);
+ var doc = this.parser.parseFromString(this.serializer.serializeToString(element), 'text/xml');
+
+ var result = this.wlmlXSL.transformToDocument(doc);
+
+ if(!result) {
+ console.log("Failed", this.wlmlXSL, doc);
+ throw "Failed to transform fragment";
+ }
+
+ console.log("Transformed", doc, " to: ", result.documentElement);
+ if(inner) {
+ var children = result.documentElement.childNodes;
+ var buf = '';
+
+ for(var i=0; i < children.length; i++)
+ buf += this.serializer.serializeToString(children.item(i));
+
+ return buf;
+ }
+
+ return this.serializer.serializeToString(result.documentElement);
+ },
+
+ innerAsWLML: function(elem)
+ {
+ return this.asWLML(elem, true);
+ },
+
+ updateInnerWithWLML: function($element, innerML)
+ {
+ var e = $element.clone().html('')[0];
+ var s = this.asWLML(e);
+ // hurray for dirty hacks :P
+ s = s.replace(/>%<\//, '>'+innerML+'');
+ return this.updateWithWLML($element, s);
+ },
+
+ updateWithWLML: function($element, text)
+ {
+ // filter the string
+ text = text.replace(/\/\s+/g, '
');
+ try {
+ var chunk = this.parser.parseFromString("
Źle sformatowana zawartoÅÄ:" + e.toString() + "
"; + } + + var parseError = chunk.getElementsByTagName('parsererror'); + console.log("Errors:", parseError); + + if(parseError.length > 0) + { + console.log("Parse errors.") + return this.serializer.serializeToString(parseError.item(0)); + } + + console.log("Transforming to HTML"); + var result = this.htmlXSL.transformToFragment(chunk, $element[0].ownerDocument).firstChild; + + if(!result) { + return "BÅÄ d aplikacji - nie udaÅo siÄ wygenerowaÄ nowego widoku HTML."; + } + + var errors = result.getElementsByTagName('error'); + if(errors.length > 0) + { + var errorMessage = 'WystÄ piÅy bÅÄdy:'+message+'
'); this.set('state', 'error'); - messageCenter.addMessage('error', 'Nie udaÅo mi siÄ wczytaÄ XML. Spróbuj ponownie :-('); + messageCenter.addMessage('error', 'xmlload', 'Nie udaÅo mi siÄ wczytaÄ HTML. Spróbuj ponownie :-('); }, - - update: function(message) { + + save: function(message) { if (this.get('state') == 'dirty') { - this.set('state', 'updating'); - messageCenter.addMessage('info', 'ZapisujÄ XML...'); - + this.set('state', 'saving'); + + messageCenter.addMessage('info', 'htmlsave', 'ZapisujÄ HTML...'); + var wlml = this.asWLML(this.get('data')); + var payload = { - contents: this.get('data'), - revision: this.get('revision') + contents: wlml, + revision: this.get('revision'), + user: this.document.get('user') }; + if (message) { payload.message = message; } - + $.ajax({ - url: this.serverURL, + url: this.textURL, type: 'post', dataType: 'json', data: payload, - success: this.updatingSucceeded.bind(this), - error: this.updatingFailed.bind(this) + success: this.saveSucceeded.bind(this), + error: this.saveFailed.bind(this) }); return true; } return false; }, - - updatingSucceeded: function(data) { - if (this.get('state') != 'updating') { + + saveSucceeded: function(data) { + if (this.get('state') != 'saving') { alert('erroneous state:', this.get('state')); } this.set('revision', data.revision); this.set('state', 'updated'); - messageCenter.addMessage('success', 'ZapisaÅem XML :-)'); + messageCenter.addMessage('success', 'htmlsave', 'ZapisaÅem :-)'); }, - - updatingFailed: function() { - if (this.get('state') != 'updating') { + + saveFailed: function() { + if (this.get('state') != 'saving') { alert('erroneous state:', this.get('state')); } - messageCenter.addMessage('error', 'Nie udaÅo mi siÄ zapisaÄ XML. Spróbuj ponownie :-('); + messageCenter.addMessage('error', 'htmlsave', 'Nie udaÅo mi siÄ zapisaÄ.'); this.set('state', 'dirty'); }, - + // For debbuging set: function(property, value) { if (property == 'state') { @@ -146,13 +312,13 @@ Editor.XMLModel = Editor.Model.extend({ } return this._super(property, value); }, - + dataChanged: function(property, value) { if (this.get('state') == 'synced') { this.set('state', 'dirty'); } }, - + dispose: function() { this.removeObserver(this); this._super(); @@ -160,42 +326,47 @@ Editor.XMLModel = Editor.Model.extend({ }); -Editor.HTMLModel = Editor.Model.extend({ - _className: 'Editor.HTMLModel', - dataURL: null, - htmlURL: null, - renderURL: null, - displaData: '', - xmlParts: {}, +// Stany modelu: +// +// -> error -> loading +// / +// empty -> loading -> synced -> unsynced -> loading +// \ +// -> dirty -> updating -> updated -> synced +// +Editor.XMLModel = Editor.Model.extend({ + _className: 'Editor.XMLModel', + serverURL: null, + data: '', state: 'empty', - init: function(htmlURL, revision, dataURL) { + init: function(document, serverURL) { this._super(); this.set('state', 'empty'); - this.set('revision', revision); - this.htmlURL = htmlURL; - this.dataURL = dataURL; - this.renderURL = "http://localhost:8000/api/render"; - this.xmlParts = {}; + this.set('revision', document.get('revision')); + this.document = document; + this.serverURL = serverURL; + this.toolbarButtonsModel = new Editor.ToolbarButtonsModel(); + this.addObserver(this, 'data', this.dataChanged.bind(this)); }, load: function(force) { if (force || this.get('state') == 'empty') { this.set('state', 'loading'); - - // load the transformed data - // messageCenter.addMessage('info', 'WczytujÄ HTML...'); - + messageCenter.addMessage('info', 'xmlload', 'WczytujÄ XML...'); $.ajax({ - url: this.htmlURL, + url: this.serverURL, dataType: 'text', data: { - revision: this.get('revision') + revision: this.get('revision'), + user: this.document.get('user') }, success: this.loadingSucceeded.bind(this), error: this.loadingFailed.bind(this) }); + return true; } + return false; }, loadingSucceeded: function(data) { @@ -204,167 +375,93 @@ Editor.HTMLModel = Editor.Model.extend({ } this.set('data', data); this.set('state', 'synced'); - // messageCenter.addMessage('success', 'WczytaÅem HTML :-)'); + messageCenter.addMessage('success', 'xmlload', 'WczytaÅem XML :-)'); }, - loadingFailed: function(response) { + loadingFailed: function(response) + { if (this.get('state') != 'loading') { alert('erroneous state:', this.get('state')); } - - var json_response = null; - var message = ""; - - try { - json_response = $.evalJSON(response.responseText); - - if(json_response.reason == 'xml-parse-error') { - - message = json_response.message.replace(/(line\s+)(\d+)(\s+)/i, - "$1$2$3"); - - message = message.replace(/(line\s+)(\d+)(\,\s*column\s+)(\d+)/i, - "$1$2$3$4"); - - - } - else { - message = json_response.message || json_response.reason || "nieznany bÅÄ d."; - } - } - catch (e) { - message = response.statusText; - } - - this.set('error', 'Nie udaÅo siÄ wczytaÄ widoku HTML:
' + message); - + + var message = parseXHRError(response); + + this.set('error', ''+message+'
'); this.set('state', 'error'); - // messageCenter.addMessage('error', 'Nie udaÅo mi siÄ wczytaÄ HTML. Spróbuj ponownie :-('); - }, - - getXMLPart: function(elem, callback) - { - var path = elem.attr('wl2o:path'); - if(!this.xmlParts[path]) - this.loadXMLPart(elem, callback); - else - callback(path, this.xmlParts[path]); - }, - - loadXMLPart: function(elem, callback) - { - var path = elem.attr('wl2o:path'); - var self = this; - - $.ajax({ - url: this.dataURL, - dataType: 'text', - data: { - revision: this.get('revision'), - part: path - }, - success: function(data) { - self.xmlParts[path] = data; - callback(path, data); - }, - // TODO: error handling - error: function(data) { - console.log('Failed to load fragment'); - callback(undefined, undefined); - } - }); + messageCenter.addMessage('error', 'xmlload', 'Nie udaÅo mi siÄ wczytaÄ XML. Spróbuj ponownie :-('); }, - - putXMLPart: function(elem, data) { - var self = this; - - var path = elem.attr('wl2o:path'); - this.xmlParts[path] = data; - - this.set('state', 'unsynced'); - - /* re-render the changed fragment */ - $.ajax({ - url: this.renderURL, - type: "POST", - dataType: 'text; charset=utf-8', - data: { - fragment: data, - part: path - }, - success: function(htmldata) { - elem.replaceWith(htmldata); - self.set('state', 'dirty'); - } - }); - }, - - update: function(message) { + + save: function(message) { if (this.get('state') == 'dirty') { this.set('state', 'updating'); - + messageCenter.addMessage('info', 'xmlsave', 'ZapisujÄ XML...'); + var payload = { - chunks: $.toJSON(this.xmlParts), - revision: this.get('revision') + contents: this.get('data'), + revision: this.get('revision'), + user: this.document.get('user') }; - if (message) { payload.message = message; } - - console.log(payload) - + $.ajax({ - url: this.dataURL, + url: this.serverURL, type: 'post', dataType: 'json', data: payload, - success: this.updatingSucceeded.bind(this), - error: this.updatingFailed.bind(this) + success: this.saveSucceeded.bind(this), + error: this.saveFailed.bind(this) }); return true; } return false; - }, - - updatingSucceeded: function(data) { + + saveSucceeded: function(data) { if (this.get('state') != 'updating') { alert('erroneous state:', this.get('state')); } - - // flush the cache - this.xmlParts = {}; - this.set('revision', data.revision); this.set('state', 'updated'); + messageCenter.addMessage('success', 'xmlsave', 'ZapisaÅem XML :-)'); }, - - updatingFailed: function() { + + saveFailed: function() { if (this.get('state') != 'updating') { alert('erroneous state:', this.get('state')); } - messageCenter.addMessage('error', 'Uaktualnienie nie powiodÅo siÄ', 'Uaktualnienie nie powiodÅo siÄ'); + messageCenter.addMessage('error', 'xmlsave', 'Nie udaÅo mi siÄ zapisaÄ XML. Spróbuj ponownie :-('); this.set('state', 'dirty'); }, - + // For debbuging set: function(property, value) { if (property == 'state') { console.log(this.description(), ':', property, '=', value); } return this._super(property, value); + }, + + dataChanged: function(property, value) { + if (this.get('state') == 'synced') { + this.set('state', 'dirty'); + } + }, + + dispose: function() { + this.removeObserver(this); + this._super(); } }); - Editor.ImageGalleryModel = Editor.Model.extend({ _className: 'Editor.ImageGalleryModel', serverURL: null, data: [], state: 'empty', - init: function(serverURL) { + init: function(document, serverURL) { this._super(); this.set('state', 'empty'); this.serverURL = serverURL; @@ -372,18 +469,40 @@ Editor.ImageGalleryModel = Editor.Model.extend({ this.pages = []; }, + setGallery: function(path) { + $.ajax({ + url: this.serverURL, + type: 'post', + data: { + path: path, + }, + success: this.settingGallerySucceeded.bind(this) + }); + }, + + settingGallerySucceeded: function(data) { + console.log('settingGallerySucceeded'); + this.load(true); + }, + load: function(force) { if (force || this.get('state') == 'empty') { + console.log("setting state"); this.set('state', 'loading'); + console.log("going ajax"); $.ajax({ url: this.serverURL, dataType: 'json', - success: this.loadingSucceeded.bind(this) + success: this.loadingSucceeded.bind(this), + error: this.loadingFailed.bind(this) }); } }, - loadingSucceeded: function(data) { + loadingSucceeded: function(data) + { + console.log("success"); + if (this.get('state') != 'loading') { alert('erroneous state:', this.get('state')); } @@ -392,14 +511,23 @@ Editor.ImageGalleryModel = Editor.Model.extend({ if (data.length === 0) { this.set('data', []); - } else { - console.log('dupa'); + } else { this.set('data', data[0].pages); } this.set('state', 'synced'); }, + loadingFailed: function(data) { + console.log("failed"); + + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } + + this.set('state', 'error'); + }, + set: function(property, value) { if (property == 'state') { console.log(this.description(), ':', property, '=', value); @@ -411,25 +539,28 @@ Editor.ImageGalleryModel = Editor.Model.extend({ Editor.DocumentModel = Editor.Model.extend({ _className: 'Editor.DocumentModel', - data: null, // name, text_url, user_revision, latest_shared_rev, parts_url, dc_url, size, merge_url + data: null, // name, text_url, revision, latest_shared_rev, parts_url, dc_url, size, merge_url contentModels: {}, state: 'empty', + errors: '', + revision: '', + user: '', init: function() { this._super(); - this.set('state', 'empty'); - this.load(); + this.set('state', 'empty'); }, load: function() { if (this.get('state') == 'empty') { this.set('state', 'loading'); - messageCenter.addMessage('info', 'ÅadujÄ dane dokumentu...'); + messageCenter.addMessage('info', 'docload', 'ÅadujÄ dane dokumentu...'); $.ajax({ cache: false, - url: documentsUrl + fileId, + url: documentInfo.docURL, dataType: 'json', - success: this.successfulLoad.bind(this) + success: this.successfulLoad.bind(this), + error: this.failedLoad.bind(this) }); } }, @@ -437,15 +568,33 @@ Editor.DocumentModel = Editor.Model.extend({ successfulLoad: function(data) { this.set('data', data); this.set('state', 'synced'); + + this.set('revision', data.revision); + this.set('user', data.user); + this.contentModels = { - 'xml': new Editor.XMLModel(data.text_url, data.user_revision), - 'html': new Editor.HTMLModel(data.html_url, data.user_revision, data.text_url), - 'gallery': new Editor.ImageGalleryModel(data.gallery_url) - }; + 'xml': new Editor.XMLModel(this, data.text_url), + 'html': new Editor.HTMLModel(this, data.text_url), + 'gallery': new Editor.ImageGalleryModel(this, data.gallery_url) + }; + for (var key in this.contentModels) { this.contentModels[key].addObserver(this, 'state', this.contentModelStateChanged.bind(this)); } - messageCenter.addMessage('success', 'Dane dokumentu zostaÅy zaÅadowane :-)'); + + this.error = ''; + + messageCenter.addMessage('success', 'docload', 'Dokument zaÅadowany poprawnie :-)'); + }, + + failedLoad: function(response) { + if (this.get('state') != 'loading') { + alert('erroneous state:', this.get('state')); + } + + var err = parseXHRError(response); + this.set('error', ''+err.error_message+"
"); + this.set('state', 'error'); }, contentModelStateChanged: function(property, value, contentModel) { @@ -461,12 +610,13 @@ Editor.DocumentModel = Editor.Model.extend({ for (key in this.contentModels) { if (this.contentModels[key].guid() == contentModel.guid()) { this.contentModels[key].set('state', 'synced'); - this.data.user_revision = this.contentModels[key].get('revision'); + this.revision = this.contentModels[key].get('revision'); + } } for (key in this.contentModels) { if (this.contentModels[key].guid() != contentModel.guid()) { - this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('revision', this.revision); this.contentModels[key].set('state', 'empty'); } } @@ -476,7 +626,7 @@ Editor.DocumentModel = Editor.Model.extend({ saveDirtyContentModel: function(message) { for (var key in this.contentModels) { if (this.contentModels[key].get('state') == 'dirty') { - this.contentModels[key].update(message); + this.contentModels[key].save(message); break; } } @@ -484,55 +634,81 @@ Editor.DocumentModel = Editor.Model.extend({ update: function() { this.set('state', 'loading'); - messageCenter.addMessage('info', 'Uaktualniam dokument...'); + + messageCenter.addMessage('info', 'doc_update', + 'Uaktualniam dokument...'); + $.ajax({ url: this.data.merge_url, dataType: 'json', type: 'post', data: { type: 'update', - target_revision: this.data.user_revision + revision: this.get('revision'), + user: this.get('user') }, - complete: this.updateCompleted.bind(this), - success: function(data) { - this.set('updateData', data); - }.bind(this) + complete: this.updateCompleted.bind(this) }); }, - updateCompleted: function(xhr, textStatus) { - console.log(xhr.status, textStatus); - if (xhr.status == 200) { // Sukces - this.data.user_revision = this.get('updateData').revision; - messageCenter.addMessage('info', 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision, - 'Uaktualnienie dokumentu do wersji ' + this.get('updateData').revision); + updateCompleted: function(xhr, textStatus) + { + console.log(xhr.status, xhr.responseText); + var response = parseXHRResponse(xhr); + if(response.success) + { + if( (response.data.result == 'no-op') + || (response.data.timestamp == response.data.parent_timestamp)) + { + if( (response.data.revision) && (response.data.revision != this.get('revision')) ) + { + // we're out of sync + this.set('state', 'unsynced'); + return; + } + + messageCenter.addMessage('info', 'doc_update', + 'Już posiadasz najbardziej aktualnÄ wersjÄ.'); + this.set('state', 'synced'); + return; + } + + // result: success + this.set('revision', response.data.revision); + this.set('user', response.data.user); + + messageCenter.addMessage('info', 'doc_update', + 'Uaktualnienie dokumentu do wersji ' + response.data.revision); + for (var key in this.contentModels) { - this.contentModels[key].set('revision', this.data.user_revision); + this.contentModels[key].set('revision', this.get('revision') ); this.contentModels[key].set('state', 'empty'); } - messageCenter.addMessage('success', 'UaktualniÅem dokument do najnowszej wersji :-)'); - } else if (xhr.status == 202) { // Wygenerowano PullRequest (tutaj?) - } else if (xhr.status == 204) { // Nic nie zmieniono - messageCenter.addMessage('info', 'Nic siÄ nie zmieniÅo od ostatniej aktualizacji. Po co mam uaktualniaÄ?'); - } else if (xhr.status == 409) { // Konflikt podczas operacji - messageCenter.addMessage('error', 'WystÄ piÅ konflikt podczas aktualizacji. PÄdź po programistów! :-('); - } else if (xhr.status == 500) { - messageCenter.addMessage('critical', 'BÅÄ d serwera. PÄdź po programistów! :-('); + + this.set('state', 'synced'); + return; } - this.set('state', 'synced'); - this.set('updateData', null); + + // no success means trouble + messageCenter.addMessage(response.error_level, 'doc_update', + response.error_message); + + this.set('state', 'unsynced'); }, merge: function(message) { this.set('state', 'loading'); - messageCenter.addMessage('info', 'Scalam dokument z gÅównym repozytorium...'); + messageCenter.addMessage('info', 'doc_merge', + 'Scalam dokument z gÅównym repozytorium...'); + $.ajax({ url: this.data.merge_url, type: 'post', dataType: 'json', data: { type: 'share', - target_revision: this.data.user_revision, + revision: this.get('revision'), + user: this.get('user'), message: message }, complete: this.mergeCompleted.bind(this), @@ -543,25 +719,53 @@ Editor.DocumentModel = Editor.Model.extend({ }, mergeCompleted: function(xhr, textStatus) { - console.log(xhr.status, textStatus); - if (xhr.status == 200) { // Sukces - this.data.user_revision = this.get('mergeData').revision; - for (var key in this.contentModels) { - this.contentModels[key].set('revision', this.data.user_revision); - this.contentModels[key].set('state', 'empty'); + console.log(xhr.status, xhr.responseText); + var response = parseXHRResponse(xhr); + + if(response.success) { + + if( (response.data.result == 'no-op') || + ( response.data.shared_parent_timestamp + && response.data.shared_timestamp + && (response.data.shared_timestamp == response.data.shared_parent_timestamp)) ) + { + if( (response.data.revision) && (response.data.revision != this.get('revision')) ) + { + // we're out of sync + this.set('state', 'unsynced'); + return; + } + + messageCenter.addMessage('info', 'doc_merge', + 'Twoja aktualna wersja nie różni siÄ od ostatnio zatwierdzonej.'); + this.set('state', 'synced'); + return; } - messageCenter.addMessage('success', 'ScaliÅem dokument z gÅównym repozytorium :-)'); - } else if (xhr.status == 202) { // Wygenerowano PullRequest - messageCenter.addMessage('success', 'WysÅaÅem proÅbÄ o scalenie dokumentu z gÅównym repozytorium.'); - } else if (xhr.status == 204) { // Nic nie zmieniono - messageCenter.addMessage('info', 'Nic siÄ nie zmieniÅo od ostatniego scalenia. Po co mam scalaÄ?'); - } else if (xhr.status == 409) { // Konflikt podczas operacji - messageCenter.addMessage('error', 'WystÄ piÅ konflikt podczas scalania. PÄdź po programistów! :-('); - } else if (xhr.status == 500) { - messageCenter.addMessage('critical', 'BÅÄ d serwera. PÄdź po programistów! :-('); + + if( response.data.result == 'accepted') + { + messageCenter.addMessage('info', 'doc_merge', + 'ProÅba o zatwierdzenie zostaÅa przyjÄta i oczekujÄ na przyjÄcie.'); + this.set('state', 'synced'); + return; + } + + // result: success + this.set('revision', response.data.revision); + this.set('user', response.data.user); + + messageCenter.addMessage('info', 'doc_merge', + 'Twoja wersja dokumentu zostaÅa zatwierdzona.'); + + this.set('state', 'synced'); + return; } - this.set('state', 'synced'); - this.set('mergeData', null); + + // no success means trouble + messageCenter.addMessage(response.error_level, 'doc_merge', + response.error_message); + + this.set('state', 'unsynced'); }, // For debbuging @@ -578,16 +782,15 @@ var leftPanelView, rightPanelContainer, doc; $(function() { - documentsUrl = $('#api-base-url').text() + '/'; - toolbarUrl = $('#api-toolbar-url').text(); - + var flashView = new FlashView('#flashview', messageCenter); + doc = new Editor.DocumentModel(); EditorView = new EditorView('#body-wrap', doc); - EditorView.freeze(); + EditorView.freeze("