summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.ace.js
diff options
context:
space:
mode:
authorddm <ddm@openerp.com>2013-09-12 17:33:38 +0200
committerddm <ddm@openerp.com>2013-09-12 17:33:38 +0200
commit0673d95ff53fa69cf2f09656d51aad54bdf81f97 (patch)
treeec00e18a3ab7c94d5f8ae061af7fb49f69b3c6d0 /addons/website/static/src/js/website.ace.js
parent28043e726272f4b54b3afa8e84f7688f5001ba92 (diff)
[FIX] SEO according to mockup
bzr revid: ddm@openerp.com-20130912153338-00oh2h3qals2h2g9
Diffstat (limited to 'addons/website/static/src/js/website.ace.js')
-rw-r--r--addons/website/static/src/js/website.ace.js37
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 () {