From 82a99e22c8cfc4e50bc15307c818878a261ca1bb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Mon, 30 Dec 2013 14:11:12 +0100
Subject: [PATCH] editor: handle invalid xml sent as a wlxml document

---
 src/editor/modules/data/data.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/editor/modules/data/data.js b/src/editor/modules/data/data.js
index 4a9bc72..db17955 100644
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -2,11 +2,16 @@ define([
     'libs/jquery',
     './dialog',
     'wlxml/wlxml',
-    'wlxml/extensions/list/list'
-], function($, Dialog, wlxml, listExtension) {
+    'wlxml/extensions/list/list',
+    'fnpjs/logging/logging',
+], function($, Dialog, wlxml, listExtension, logging) {
 
 'use strict';
-/* global gettext */
+/* global gettext, alert */
+
+var logger = logging.getLogger('editor.modules.data'),
+    stubDocument = '<section><div>' + gettext('This is an empty document.') + '</div></section>';
+
 
 return function(sandbox) {
 
@@ -14,7 +19,14 @@ return function(sandbox) {
     var document_version = sandbox.getBootstrappedData().version;
     var history = sandbox.getBootstrappedData().history;
 
-    var wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
+    var wlxmlDocument;
+    try {
+        wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
+    } catch(e) {
+        logger.exception(e);
+        alert(gettext('This document contains errors and can\'t be loaded. :(')); // TODO
+        wlxmlDocument = wlxml.WLXMLDocumentFromXML(stubDocument);
+    }
 
     wlxmlDocument.registerExtension(listExtension);
     sandbox.getPlugins().forEach(function(plugin) {
-- 
2.20.1