summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js
diff options
context:
space:
mode:
authorchm@openerp.com <>2014-03-14 17:23:46 +0100
committerchm@openerp.com <>2014-03-14 17:23:46 +0100
commit353bbdc2c3d0e019561eb60aacb36b68b4ed935a (patch)
tree3edf0d86cb82f1579552b30c54cc5ed2dd0bc22c /addons/website/static/src/js
parent9bc57fdc08660ae426e0d5910af58ae3cbe432cb (diff)
[FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
Diffstat (limited to 'addons/website/static/src/js')
-rw-r--r--addons/website/static/src/js/website.editor.newpage.js2
-rw-r--r--addons/website/static/src/js/website.js2
-rw-r--r--addons/website/static/src/js/website.mobile.js4
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index b475223ecd9..77a086790fa 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -48,7 +48,7 @@
}
}).then(function (val, field, $dialog) {
if (val) {
- var url = '/website/add/' + encodeURI(val);
+ var url = '/website/add' + encodeURI(val);
if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1";
document.location = url;
}
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 249058d91fb..eec815ed8c7 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -103,7 +103,7 @@
var page = +$a.attr("href").split(",").pop().split('-')[1];
data['page'] = page;
- $.post('/website/kanban/', data, function (col) {
+ $.post('/website/kanban', data, function (col) {
$col.find("> .thumbnail").remove();
$pagination.last().before(col);
});
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 59c2328e09b..88a558f5094 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -18,9 +18,9 @@
},
start: function () {
if (!window.location.origin) { // fix for ie9
- window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '') + '/';
+ window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
}
- document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + "#mobile-preview";
+ document.getElementById("mobile-viewport").src = window.location.origin + (window.location.pathname.length ? '/' : '') + window.location.pathname + "#mobile-preview";
this.$el.modal();
},
destroy: function () {