diff options
| author | Christophe Matthieu <chm@odoo.com> | 2014-12-17 14:31:25 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2015-01-05 10:59:42 +0100 |
| commit | 9069d0127c176317436b67b23ae5677dd9d53de7 (patch) | |
| tree | 275c8e37fb62d77dec74266592a7e7bed79d6aa8 /addons/website/static/src/js/website.contentMenu.js | |
| parent | ba1144551cf6b84cc01d8ba990f4afc2a6157a7a (diff) | |
[IMP] website: use the new summernote editor
Diffstat (limited to 'addons/website/static/src/js/website.contentMenu.js')
| -rw-r--r-- | addons/website/static/src/js/website.contentMenu.js | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js index bdb6d63c8db..21e5b5340c4 100644 --- a/addons/website/static/src/js/website.contentMenu.js +++ b/addons/website/static/src/js/website.contentMenu.js @@ -13,7 +13,7 @@ ev.preventDefault(); var $content_item = $(this); self[$content_item.data('action')](); - }) + }); return this._super(); }, @@ -102,13 +102,13 @@ }, add_menu: function () { var self = this; - var dialog = new website.contentMenu.MenuEntryDialog(); - dialog.on('add-menu', this, function (link) { + var dialog = new website.contentMenu.MenuEntryDialog(undefined, {}); + dialog.on('save', this, function (link) { var new_menu = { id: _.uniqueId('new-'), - name: link[2] || link[0], - url: link[0], - new_window: link[1], + name: link.text, + url: link.url, + new_window: link.newWindow, parent_id: false, sequence: 0, children: [], @@ -125,13 +125,13 @@ var menu = self.flat[menu_id]; if (menu) { var dialog = new website.contentMenu.MenuEntryDialog(undefined, menu); - dialog.on('update-menu', this, function (link) { - var id = link.shift(); + dialog.on('save', this, function (link) { + var id = link.id; var menu_obj = self.flat[id]; _.extend(menu_obj, { - name: link[2], - url: link[0], - new_window: link[1], + 'name': link.text, + 'url': link.url, + 'new_window': link.newWindow, }); var $menu = self.$('[data-menu-id="' + id + '"]'); $menu.find('.js_menu_label').first().text(menu_obj.name); @@ -184,6 +184,8 @@ website.contentMenu.MenuEntryDialog = website.editor.LinkDialog.extend({ template: 'website.contentMenu.dialog.add', init: function (editor, data) { + data.text = data.name || ''; + data.newWindow = data.new_window; this.data = data; return this._super.apply(this, arguments); }, @@ -191,7 +193,7 @@ var self = this; var result = $.when(this._super.apply(this, arguments)).then(function () { if (self.data) { - self.bind_data(self.data.name, self.data.url, self.data.new_window); + self.bind_data(); } var $link_text = self.$('#link-text').focus(); self.$('#link-page').change(function (e) { @@ -212,14 +214,6 @@ } return this._super.apply(this, arguments); }, - make_link: function (url, new_window, label) { - var menu_label = this.$('input#link-text').val() || label; - if (this.data) { - this.trigger('update-menu', [this.data.id, url, new_window, menu_label]); - } else { - this.trigger('add-menu', [url, new_window, menu_label]); - } - }, destroy: function () { this._super.apply(this, arguments); }, |
