|
1 | 1 | /**
|
2 |
| - * @license Angular UI Tree v2.8.0 |
| 2 | + * @license Angular UI Tree v2.9.0 |
3 | 3 | * (c) 2010-2015. https://github.com/angular-ui-tree/angular-ui-tree
|
4 | 4 | * License: MIT
|
5 | 5 | */
|
|
808 | 808 | // Remove the placeholder
|
809 | 809 | placeElm.remove();
|
810 | 810 |
|
811 |
| - // If the target was an empty tree, replace the emply element placeholder |
| 811 | + // If the target was an empty tree, replace the empty element placeholder |
812 | 812 | if (treeScope) {
|
813 | 813 | treeScope.resetEmptyElement();
|
814 | 814 | treeScope = null;
|
|
1058 | 1058 |
|
1059 | 1059 | if (ngModel) {
|
1060 | 1060 | ngModel.$render = function () {
|
1061 |
| - if (!ngModel.$modelValue || !angular.isArray(ngModel.$modelValue)) { |
1062 |
| - scope.$modelValue = []; |
1063 |
| - } |
1064 | 1061 | scope.$modelValue = ngModel.$modelValue;
|
1065 | 1062 | };
|
1066 | 1063 | }
|
|
1334 | 1331 | * @returns {Object} Object with properties offsetX, offsetY, startX, startY, nowX and dirX.
|
1335 | 1332 | */
|
1336 | 1333 | positionStarted: function (e, target) {
|
1337 |
| - var pos = {}; |
1338 |
| - pos.offsetX = e.pageX - this.offset(target).left; |
1339 |
| - pos.offsetY = e.pageY - this.offset(target).top; |
1340 |
| - pos.startX = pos.lastX = e.pageX; |
1341 |
| - pos.startY = pos.lastY = e.pageY; |
| 1334 | + var pos = {}, |
| 1335 | + pageX = e.pageX, |
| 1336 | + pageY = e.pageY; |
| 1337 | + |
| 1338 | + if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) { |
| 1339 | + pageX = e.originalEvent.touches[0].pageX; |
| 1340 | + pageY = e.originalEvent.touches[0].pageY; |
| 1341 | + } |
| 1342 | + pos.offsetX = pageX - this.offset(target).left; |
| 1343 | + pos.offsetY = pageY - this.offset(target).top; |
| 1344 | + pos.startX = pos.lastX = pageX; |
| 1345 | + pos.startY = pos.lastY = pageY; |
1342 | 1346 | pos.nowX = pos.nowY = pos.distX = pos.distY = pos.dirAx = 0;
|
1343 | 1347 | pos.dirX = pos.dirY = pos.lastDirX = pos.lastDirY = pos.distAxX = pos.distAxY = 0;
|
1344 | 1348 | return pos;
|
1345 | 1349 | },
|
1346 | 1350 |
|
1347 | 1351 | positionMoved: function (e, pos, firstMoving) {
|
| 1352 | + var pageX = e.pageX, |
| 1353 | + pageY = e.pageY, |
| 1354 | + newAx; |
| 1355 | + if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) { |
| 1356 | + pageX = e.originalEvent.touches[0].pageX; |
| 1357 | + pageY = e.originalEvent.touches[0].pageY; |
| 1358 | + } |
1348 | 1359 | // mouse position last events
|
1349 | 1360 | pos.lastX = pos.nowX;
|
1350 | 1361 | pos.lastY = pos.nowY;
|
1351 | 1362 |
|
1352 | 1363 | // mouse position this events
|
1353 |
| - pos.nowX = e.pageX; |
1354 |
| - pos.nowY = e.pageY; |
| 1364 | + pos.nowX = pageX; |
| 1365 | + pos.nowY = pageY; |
1355 | 1366 |
|
1356 | 1367 | // distance mouse moved between events
|
1357 | 1368 | pos.distX = pos.nowX - pos.lastX;
|
|
1366 | 1377 | pos.dirY = pos.distY === 0 ? 0 : pos.distY > 0 ? 1 : -1;
|
1367 | 1378 |
|
1368 | 1379 | // axis mouse is now moving on
|
1369 |
| - var newAx = Math.abs(pos.distX) > Math.abs(pos.distY) ? 1 : 0; |
| 1380 | + newAx = Math.abs(pos.distX) > Math.abs(pos.distY) ? 1 : 0; |
1370 | 1381 |
|
1371 | 1382 | // do nothing on first move
|
1372 | 1383 | if (firstMoving) {
|
|
0 commit comments