diff options
| author | ddm <ddm@openerp.com> | 2013-12-06 16:08:55 +0100 |
|---|---|---|
| committer | ddm <ddm@openerp.com> | 2013-12-06 16:08:55 +0100 |
| commit | 1071cdb1d3dc347d747458f9fcd51ef75d5a92d3 (patch) | |
| tree | 37bd175483e02712f1039f918391e417da928785 /addons/website/static/src/js | |
| parent | 9be1dbfe9ec4cde33c748daed67687102c869687 (diff) | |
[IMP] Improve event support for tour and tests
bzr revid: ddm@openerp.com-20131206150855-0jsw3i2lm2l3qant
Diffstat (limited to 'addons/website/static/src/js')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 8 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.tour.banner.js | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index b93d1c2c761..af2183b576c 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -26,7 +26,6 @@ self.snippets.$button.removeClass("hidden"); website.snippet.stop_animation(); website.snippet.start_animation(); - self.trigger('tour:editor_bar_loaded'); }); return this._super.apply(this, arguments); @@ -247,7 +246,7 @@ this.snippet_focus($snippet); } if (_.isFunction($snippet.trigger)) { - $snippet.trigger('tour:snippet_activated'); + $snippet.trigger('snippet-activated'); } }, create_overlay: function ($snippet) { @@ -384,7 +383,10 @@ snippet.drop_and_build_snippet($target); } } - setTimeout(function () {self.make_active($target);},0); + setTimeout(function () { + $snippet.trigger('snippet-dropped'); + self.make_active($target); + },0); } else { $toInsert.remove(); if (self.$modal.find('input:not(:checked)').length) { diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js index a60ac05a633..70c5dd9dc38 100644 --- a/addons/website/static/src/js/website.tour.banner.js +++ b/addons/website/static/src/js/website.tour.banner.js @@ -33,7 +33,7 @@ trigger: { emitter: editor, type: 'openerp', - id: 'tour:editor_bar_loaded', + id: 'rte:ready', }, }, { @@ -97,7 +97,7 @@ title: "Edit an Area", content: "Select any area of the page to modify it. Click on this subtitle.", trigger: { - id: 'tour:snippet_activated' + id: 'snippet-activated' }, }, { |