...
 
Commits (2)
...@@ -249,8 +249,6 @@ ...@@ -249,8 +249,6 @@
mobileTempCell: { mobileTempCell: {
x: 0, x: 0,
y: 0, y: 0,
ox: 0,
oy: 0,
width: 1, width: 1,
height: 1, height: 1,
left: 0, left: 0,
...@@ -433,74 +431,63 @@ ...@@ -433,74 +431,63 @@
} }
}, },
handleMoveCell (obj) { handleMoveCell (obj) {
this.cellHandler.move.x = obj.position.left let
this.cellHandler.move.y = obj.position.top pos = this.getGridPositionForEvent(obj),
fullCell = this.gridDimensions.full.cell,
let res = this.getGridPositionForEvent(obj) moveHandler = this.cellHandler.move,
tempCell = this.mobileTempCell
this.cellHandler.move.gridPosition.row = res.y
this.cellHandler.move.gridPosition.column = res.x
if (obj.isFirst) { if (obj.isFirst) {
this.activeHandler = true this.activeHandler = true
this.mobileTempCell.show = true tempCell.show = true
this.cellHandler.move.pushed = true moveHandler.pushed = true
} }
this.mobileTempCell.x = res.x tempCell.x = pos.x
this.mobileTempCell.y = res.y tempCell.y = pos.y
this.mobileTempCell.ox = res.ox moveHandler.x = pos.ox
this.mobileTempCell.oy = res.oy moveHandler.y = pos.oy
moveHandler.gridPosition.row = pos.y
this.cellHandler.move.x = res.ox moveHandler.gridPosition.column = pos.x
this.cellHandler.move.y = res.oy
if (obj.isFinal) { if (obj.isFinal) {
this.activeHandler = false this.activeHandler = false
this.mobileTempCell.onGrid = true tempCell.onGrid = true
this.mobileTempCell.left = this.gridDimensions.full.cell.width * (res.x - 1) moveHandler.pushed = false
this.cellHandler.move.pushed = false moveHandler.x = fullCell.width * (tempCell.x - 1) + 8 + 20
// this.cellHandler.move.y = this.gridDimensions.full.cell.height * (res.y - 1) + 8 + 59 + 20 moveHandler.y = fullCell.height * (tempCell.y - 1) + 8 + 20
this.cellHandler.move.x = this.gridDimensions.full.cell.width * (this.mobileTempCell.x - 1) + 8 + 20 this.cellHandler.resize.x = fullCell.width * (pos.x + tempCell.width - 1) - 8 - 20
this.cellHandler.move.y = this.gridDimensions.full.cell.height * (this.mobileTempCell.y - 1) + 8 + 20 this.cellHandler.resize.y = fullCell.height * (pos.y + tempCell.height - 1) - 8 - 20
this.cellHandler.resize.x = this.gridDimensions.full.cell.width * (res.x + this.mobileTempCell.width - 1) - 8 - 20
this.cellHandler.resize.y = this.gridDimensions.full.cell.height * (res.y + this.mobileTempCell.height - 1) - 8 - 20
} }
}, },
handleResizeCell (obj) { handleResizeCell (obj) {
// this.cursor = {x: obj.position.left, y: obj.position.top} let
// this.cellHandler.resize = {x: obj.position.left, y: obj.position.top} pos = this.getGridPositionForEvent(obj),
this.cellHandler.resize.x = obj.position.left resizeHandler = this.cellHandler.resize,
this.cellHandler.resize.y = obj.position.top tempCell = this.mobileTempCell
// ---> panGrid
let res = this.getGridPositionForEvent(obj)
this.cellHandler.resize.gridPosition.row = res.y resizeHandler.gridPosition.row = pos.y
this.cellHandler.resize.gridPosition.column = res.x resizeHandler.gridPosition.column = pos.x
if (obj.isFirst) { if (obj.isFirst) {
this.activeHandler = true this.activeHandler = true
this.mobileTempCell.show = true tempCell.show = true
this.cellHandler.resize.pushed = true resizeHandler.pushed = true
} }
this.mobileTempCell.width = res.x - this.mobileTempCell.x + 1 tempCell.width = pos.x - tempCell.x + 1
this.mobileTempCell.height = res.y - this.mobileTempCell.y + 1 tempCell.height = pos.y - tempCell.y + 1
this.cellHandler.resize.x = res.ox resizeHandler.x = pos.ox
this.cellHandler.resize.y = res.oy resizeHandler.y = pos.oy
if (obj.isFinal) { if (obj.isFinal) {
this.activeHandler = false this.activeHandler = false
this.mobileTempCell.onGrid = true tempCell.onGrid = true
this.cellHandler.resize.pushed = false resizeHandler.pushed = false
// this.addMobileCell(obj) resizeHandler.x = this.gridDimensions.full.cell.width * pos.x - 8 - 20
// this.mobileTempCell.show = false resizeHandler.y = this.gridDimensions.full.cell.height * pos.y - 8 - 20
this.cellHandler.resize.x = this.gridDimensions.full.cell.width * res.x - 8 - 20
this.cellHandler.resize.y = this.gridDimensions.full.cell.height * res.y - 8 - 20
} }
}, },
handleCellEdit (event, annotation) { handleCellEdit (event, annotation) {
......