Browse Source

Add nearFloat method

pull/36/head
Artur Arseniev 10 years ago
parent
commit
512b479331
  1. 4
      src/commands/view/CreateComponent.js
  2. 5
      src/commands/view/SelectPosition.js
  3. 2
      src/utils/Sorter.js

4
src/commands/view/CreateComponent.js

@ -79,6 +79,10 @@ define(['backbone','./SelectPosition'],
this.updateComponentSize(e);
this.setRequirements(this.tempComponent);
var lp = this.sorter.lastPos;
if(this.nearFloat(lp.index, lp.method, this.sorter.lastDims))
this.tempComponent.style.float = 'left';
model = this.create(this.sorter.target, this.tempComponent, lp.index, lp.method);
this.sorter.prevTarget = null;
}

5
src/commands/view/SelectPosition.js

@ -88,7 +88,7 @@ define(function() {
* @return {Boolean}
* @private
* */
nearToFloat: function(index, method, dims) {
nearFloat: function(index, method, dims) {
var i = index || 0;
var m = method || 'before';
var len = dims.length;
@ -98,8 +98,7 @@ define(function() {
(dims[i-1] && !dims[i-1][4]) ||
(isLast && !dims[i-1][4]) ) )
return 1;
else
return 0;
return 0;
},

2
src/utils/Sorter.js

@ -146,7 +146,7 @@ define(['backbone'],
this.rY = (e.pageY - this.elT) + this.el.scrollTop;
this.rX = (e.pageX - this.elL) + this.el.scrollLeft;
var dims = this.dimsFromTarget(e.target, this.rX, this.rY);
this.lastDims = dims;
var pos = this.findPosition(dims, this.rX, this.rY);
// If there is a significant changes with the pointer
if( !this.lastPos ||

Loading…
Cancel
Save