diff options
Diffstat (limited to 'addons/website/static/src/js/website.ace.js')
| -rw-r--r-- | addons/website/static/src/js/website.ace.js | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index bc7c58575db..fd26c50aefd 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -27,21 +27,16 @@ this.xml = text; }, isWellFormed: function () { - try { - if (document.implementation.createDocument) { - var dom = new DOMParser().parseFromString(this.xml, "text/xml"); - return dom.getElementsByTagName("parsererror").length === 0; - } else if (window.ActiveXObject) { - // TODO test in IE - var msDom = new ActiveXObject("Microsoft.XMLDOM"); - msDom.async = false; - return !msDom.loadXML(this.xml); - } else { - throw Error("Not implemented"); - } - } catch(exception) { - console.log(exception); + if (document.implementation.createDocument) { + var dom = new DOMParser().parseFromString(this.xml, "text/xml"); + return dom.getElementsByTagName("parsererror").length === 0; + } else if (window.ActiveXObject) { + // TODO test in IE + var msDom = new ActiveXObject("Microsoft.XMLDOM"); + msDom.async = false; + return !msDom.loadXML(this.xml); } + return true; }, format: function () { return vkbeautify.xml(this.xml, 4); @@ -101,15 +96,11 @@ method: 'read', args: [[this.selectedViewId()], ['arch'], website.get_context()], }).then(function(result) { - if (result && result.length > 0) { - var xml = new website.ace.XmlDocument(result[0].arch) - var editingSession = new ace.EditSession(xml.xml); - editingSession.setMode("ace/mode/xml"); - editingSession.setUndoManager(new ace.UndoManager()); - editor.setSession(editingSession); - } else { - throw Error("Could not load view XML"); - } + var xml = new website.ace.XmlDocument(result[0].arch); + var editingSession = new ace.EditSession(xml.xml); + editingSession.setMode("ace/mode/xml"); + editingSession.setUndoManager(new ace.UndoManager()); + editor.setSession(editingSession); }); }, formatXml: function () { |