diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-08 14:49:18 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-08 14:49:18 +0100 |
| commit | d248ae06698bb8d711dfc83b823c82e5980c2cf1 (patch) | |
| tree | cdadb23429b1af4f795382adb8e7dcce3bcad047 /addons/website/static/src/js | |
| parent | abcb165d97dc90cbb878dd0f6ad3e35937816c8d (diff) | |
Revert "[ADD] website_version: website versioning and ab testing"
With more than 100 comments on github[1], this commit is clearly not
production-ready.
This reverts commit c255b5bc3461c803e38057c72c45530235de84dd, reversing
changes made to e5ac65de59f45f2d15ae6f6b840b02cac78afd03.
[1] https://github.com/odoo/odoo/commit/c255b5bc3461c803e38057c72c45530235de84dd
Diffstat (limited to 'addons/website/static/src/js')
| -rw-r--r-- | addons/website/static/src/js/website.ace.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 14 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index ad39ac92025..ce9fe1b4662 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -135,7 +135,7 @@ loadTemplates: function () { var self = this; var args = { - key: $(document.documentElement).data('view-xmlid'), + xml_id: $(document.documentElement).data('view-xmlid'), full: true, bundles: !!$('script[src*=".assets_common"]').length }; diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index cc80c8e1710..849c31f9dd5 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -911,7 +911,7 @@ define(['summernote/summernote'], function () { rte_changed: function () { this.$buttons.save.prop('disabled', false); }, - _save: function () { + save: function () { var self = this; var saved = {}; // list of allready saved views and data @@ -979,17 +979,9 @@ define(['summernote/summernote'], function () { }); }); }, - save: function () { - return this._save().then(function () { - website.reload(); - }); - }, /** * Saves an RTE content, which always corresponds to a view section (?). */ - save_without_reload: function () { - return this._save(); - }, saveElement: function ($el) { var markup = $el.prop('outerHTML'); return openerp.jsonRpc('/web/dataset/call', 'call', { @@ -1038,10 +1030,10 @@ define(['summernote/summernote'], function () { if(this.loaded) { return; } - openerp.jsonRpc('/website/customize_template_get', 'call', { 'key': this.view_name }).then( + openerp.jsonRpc('/website/customize_template_get', 'call', { 'xml_id': this.view_name }).then( function(result) { _.each(result, function (item) { - if (item.key === "website.debugger" && !window.location.search.match(/[&?]debug(&|$)/)) return; + if (item.xml_id === "website.debugger" && !window.location.search.match(/[&?]debug(&|$)/)) return; if (item.header) { self.$menu.append('<li class="dropdown-header">' + item.name + '</li>'); } else { diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index fe54c4e9236..82d2022ba02 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -102,7 +102,7 @@ var self = this; this.$button = $(openerp.qweb.render('website.snippets_button')) - .prependTo(this.parent.$(".js_editor_placeholder")) + .prependTo(this.parent.$("#website-top-edit ul")) .find("button"); this.$button.click(_.bind(this.show_blocks, this)); |
