rebasing on master

This commit is contained in:
Amine Ben hammou
2017-09-27 12:29:19 +00:00
parent c29dc8b4c7
commit 4e2e9f6f8f
38 changed files with 249 additions and 249 deletions

View File

@@ -19,8 +19,8 @@ define([
maxLength: Infinity,
modelField: 'styles.block.height',
onResize: function (event) {
var currentLength = parseFloat(this.view.model.get(this.options.modelField)),
newLength = currentLength + this.options.transformationFunction(event.dy);
var currentLength = parseFloat(this.view.model.get(this.options.modelField));
var newLength = currentLength + event.y;
newLength = Math.min(this.options.maxLength, Math.max(this.options.minLength, newLength));
this.view.model.set(this.options.modelField, newLength + 'px');
}

View File

@@ -48,8 +48,8 @@ define([
elementSelector: '.mailpoet_image',
resizeHandleSelector: '.mailpoet_image_resize_handle',
onResize: function (event) {
var corner = this.$('.mailpoet_image').offset(),
width = event.pageX - corner.left;
var corner = this.$('.mailpoet_image').offset();
var width = event.pageX - corner.left;
this.view.model.set('width', width + 'px');
}
},