odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] website: snippet dropdown options 

bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
This commit is contained in:
chm@openerp.com 2014-03-13 14:05:56 +01:00
parent 2390c9179b
commit 9496d823e9
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/website/static/src/js/website.snippets.editor.js
View File

@ -202,13 +202,17 @@
var self = this;
var snipped_event_flag;
$("#wrapwrap").on('click', function (event) {
if (snipped_event_flag) {
if (snipped_event_flag || !event.srcElement) {
return;
}
snipped_event_flag = true;
setTimeout(function () {snipped_event_flag = false;}, 0);
var $target = $(event.srcElement || event.target);
var $target = $(event.srcElement);
if ($target.parents(".oe_overlay").length) {
return;
}
if (!$target.is(website.snippet.globalSelector)) {
$target = $target.parents(website.snippet.globalSelector).first();
@ -1445,6 +1449,7 @@
if ($ul.find("li").length) {
$styles.removeClass("hidden");
}
this.$overlay.find('[data-toggle="dropdown"]').dropdown();
},
get_parent_block: function () {

2
addons/website/static/src/xml/website.snippets.xml
View File

@ -22,7 +22,7 @@
<t t-name="website.snippet_overlay">
<div class="oe_overlay">
<div class="oe_overlay_options">
<div class="oe_overlay_options" contentEditable="false">
<div class="btn-group">
<a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><i class="fa fa-upload"></i></a>
<div class="dropdown oe_options hidden btn-group">

22
addons/website/views/snippets.xml
View File

@ -922,17 +922,6 @@
</li>
</div>
<div data-snippet-option-id='carousel'
data-selector=".carousel">
<li class="divider"></li>
<li>
<a href="#" class="button js_add">Add Slide</a>
</li>
<li>
<a href="#" class="button js_remove">Remove Slide</a>
</li>
</div>
<div data-snippet-option-id='carousel-style'
data-selector="div[data-snippet-id='carousel']">
<li class="dropdown-submenu" data-required="true">
@ -945,6 +934,17 @@
</li>
</div>
<div data-snippet-option-id='carousel'
data-selector=".carousel">
<li class="divider"></li>
<li>
<a href="#" class="button js_add">Add Slide</a>
</li>
<li>
<a href="#" class="button js_remove">Remove Slide</a>
</li>
</div>
<div data-snippet-option-id='margin-y'
data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
</div>