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

[FIX] website: snippet editor add class from li[data-value] 

bzr revid: chm@openerp.com-20140407111506-jemffxbanul2yqbk
This commit is contained in:
chm@openerp.com 2014-04-07 13:15:06 +02:00
parent 618a52116c
commit ad93089bc2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/website/static/src/js/jQuery.transfo.js
View File

@ -197,6 +197,8 @@ OTHER DEALINGS IN THE SOFTWARE.
transfo.active = {
"type": type,
"scalex": transfo.settings.scalex,
"scaley": transfo.settings.scaley,
"pageX": event.pageX,
"pageY": event.pageY,
"center": transfo.$center.offset(),
@ -257,16 +259,20 @@ OTHER DEALINGS IN THE SOFTWARE.
var angle = settings.angle * rad;
var dx = cdx*Math.cos(angle) - cdy*Math.sin(-angle);
var dy = - cdx*Math.sin(angle) + cdy*Math.cos(-angle);
if (transfo.active.type.indexOf("t") != -1) {
if (transfo.active.type.indexOf("t") != -1 && transfo.active.scaley > 0 ||
transfo.active.type.indexOf("b") != -1 && transfo.active.scaley < 0) {
settings.scaley = dy / (settings.height/2);
}
if (transfo.active.type.indexOf("b") != -1) {
if (transfo.active.type.indexOf("b") != -1 && transfo.active.scaley > 0 ||
transfo.active.type.indexOf("t") != -1 && transfo.active.scaley < 0) {
settings.scaley = - dy / (settings.height/2);
}
if (transfo.active.type.indexOf("l") != -1) {
if (transfo.active.type.indexOf("l") != -1 && transfo.active.scalex > 0 ||
transfo.active.type.indexOf("r") != -1 && transfo.active.scalex < 0) {
settings.scalex = dx / (settings.width/2);
}
if (transfo.active.type.indexOf("r") != -1) {
if (transfo.active.type.indexOf("r") != -1 && transfo.active.scalex > 0 ||
transfo.active.type.indexOf("l") != -1 && transfo.active.scalex < 0) {
settings.scalex = - dx / (settings.width/2);
}
if (settings.scaley > 0 && settings.scaley < 0.05) settings.scaley = 0.05;

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

@ -743,6 +743,7 @@
this.set_active();
this.$el.find('li[data-value] a').on('mouseenter mouseleave click', _.bind(this._mouse, this));
this.$el.not(':not([data-value])').find("a").on('mouseenter mouseleave click', _.bind(this._mouse, this));
this.$target.on('snippet-style-reset', _.bind(this.set_active, this));
this.start();