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

[IMP] website: fix and add rotationStep option for jsuery transfo

Browse Source 
bzr revid: chm@openerp.com-20140326124339-ll12dxd2qyo3gpi3
This commit is contained in:
chm@openerp.com
2014-03-26 13:43:39 +01:00
parent 26692117b6
commit b39be63a8b
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/jQuery.transfo.js
+17 -3
View File
@@ -122,13 +122,17 @@ OTHER DEALINGS IN THE SOFTWARE.
transfo.settings.scalex= transform.indexOf('scaleX') != -1 ? parseFloat(transform.match(/scaleX\(([^)]+)\)/)[1]) : 1;
transfo.settings.scaley= transform.indexOf('scaleY') != -1 ? parseFloat(transform.match(/scaleY\(([^)]+)\)/)[1]) : 1;
transfo.settings.style = ($this.attr("style")||"").replace(/[^;]+transform[^;]+/g, '');
transfo.settings.style = ($this.attr("style")||"").replace(/[^;]*transform[^;]+/g, '');
$this.attr("style", transfo.settings.style);
transfo.settings.height = $this.innerHeight();
transfo.settings.width = $this.innerWidth();
transfo.settings.css = window.getComputedStyle($this[0], null);
transfo.settings.pos = $this.offset();
transfo.settings.rotationStep = 5;
console.log(transfo.settings);
}
function _bind ($this, transfo) {
@@ -190,7 +194,11 @@ OTHER DEALINGS IN THE SOFTWARE.
else if (event.pageY >= center.top && event.pageX < center.left) ang += 180;
else if (event.pageY < center.top && event.pageX < center.left) ang += 360;
settings.angle = ang;
if (!event.ctrlKey) {
settings.angle = Math.round(ang / transfo.settings.rotationStep) * transfo.settings.rotationStep;
} else {
settings.angle = ang;
}
// reset position : don't move center
_targetCss($this, transfo);
@@ -198,7 +206,7 @@ OTHER DEALINGS IN THE SOFTWARE.
var x = center.left - new_center.left;
var y = center.top - new_center.top;
var angle = ang * rad;
settings.translatex += x*Math.cos(angle) - y*Math.sin(-angle);
settings.translatex += x*Math.cos(angle) - y*Math.sin(-angle);
settings.translatey += - x*Math.sin(angle) + y*Math.cos(-angle);
}
else if (transfo.active.type == "position") {
@@ -238,6 +246,12 @@ OTHER DEALINGS IN THE SOFTWARE.
}
}
settings.angle = Math.round(settings.angle);
settings.translatex = Math.round(settings.translatex);
settings.translatey = Math.round(settings.translatey);
settings.scalex = Math.round(settings.scalex*100)/100;
settings.scaley = Math.round(settings.scaley*100)/100;
_targetCss($this, transfo);
return false;
}