diff options
Diffstat (limited to 'addons/website/static')
| -rw-r--r-- | addons/website/static/src/js/website.contentMenu.js | 6 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.translator.js | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js index c91a9819540..54a7e041538 100644 --- a/addons/website/static/src/js/website.contentMenu.js +++ b/addons/website/static/src/js/website.contentMenu.js @@ -233,7 +233,7 @@ var EditMenuDialog = widget.Dialog.extend({ id: _.uniqueId('new-'), name: link.text, url: link.url, - new_window: link.newWindow, + new_window: link.isNewWindow, parent_id: false, sequence: 0, children: [], @@ -256,7 +256,7 @@ var EditMenuDialog = widget.Dialog.extend({ _.extend(menu_obj, { 'name': link.text, 'url': link.url, - 'new_window': link.newWindow, + 'new_window': link.isNewWindow, }); var $menu = self.$('[data-menu-id="' + id + '"]'); $menu.find('.js_menu_label').first().text(menu_obj.name); @@ -310,7 +310,7 @@ var MenuEntryDialog = widget.LinkDialog.extend({ template: 'website.contentMenu.dialog.add', init: function (editor, data) { data.text = data.name || ''; - data.newWindow = data.new_window; + data.isNewWindow = data.new_window; this.data = data; return this._super.apply(this, arguments); }, diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index 9443e972d47..fe720622431 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -31,6 +31,14 @@ website.TopBar.include({ edit_master: function (ev) { ev.preventDefault(); var $link = $('.js_language_selector a[data-default-lang]'); + if (!$link.length) { + // Fallback for old website + var l = false; + _.each($('.js_language_selector a'), function(a) { + if (!l || a.href.length < l.href.length) { l = a; } + }); + $link = $(l); + } $link[0].search += ($link[0].search ? '&' : '?') + 'enable_editor=1'; $link.click(); }, |