pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: some fixes for firefox

Browse Source 
bzr revid: chm@openerp.com-20131001143817-mu7lkvuwfip2fz2u
This commit is contained in:
Christophe Matthieu
2013-10-01 16:38:17 +02:00
parent 8ecbc64a79
commit 2c49630a8b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.snippets.js
+7 -4
View File
@@ -8,8 +8,8 @@
start: function () {
var self = this;
$("[data-oe-model]").on('click', function (event) {
var tag = event.srcElement.tagName.toLowerCase();
var $this = $(event.srcElement);
var tag = $this[0].tagName.toLowerCase();
if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) {
self.$('[data-action="edit"]').parent().effect('bounce', {distance: 18, times: 5}, 250);
}
@@ -824,7 +824,8 @@
var editor = new website.editor.ImageDialog();
editor.on('start', self, function (o) {o.url = bg_value;});
editor.on('save', self, function (o) {
(typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + o.url + "')");
var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg);
$bg.css("background-image", "url('" + o.url + "')");
});
editor.appendTo($('body'));
}
@@ -832,12 +833,14 @@
.on('mouseover', function (event) {
if ($(this).data("value")) {
var src = $(this).data("value");
(typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + src + "')");
var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg);
$bg.css("background-image", "url('" + src + "')");
}
})
.on('mouseout', function (event) {
var src = $ul.find('li.active').data("value");
(typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + src + "')");
var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg);
$bg.css("background-image", "url('" + src + "')");
});
},
});
addons/website/static/src/xml/website.snippets.xml
+1 -2
View File
@@ -167,8 +167,7 @@
<div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
<!-- Carousel items -->
<div class="carousel-inner">
<div class="item image_text active">
<img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
<div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
<div class="container">
<div class="carousel-caption content">
<h2>Set Your Banner Title</h2>