Skip to content

Commit b4da660

Browse files
author
Niels Dequeker
committed
New build
1 parent 738608f commit b4da660

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

dist/angular-ui-tree.js

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license Angular UI Tree v2.8.0
2+
* @license Angular UI Tree v2.9.0
33
* (c) 2010-2015. https://github.com/angular-ui-tree/angular-ui-tree
44
* License: MIT
55
*/
@@ -808,7 +808,7 @@
808808
// Remove the placeholder
809809
placeElm.remove();
810810

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
812812
if (treeScope) {
813813
treeScope.resetEmptyElement();
814814
treeScope = null;
@@ -1058,9 +1058,6 @@
10581058

10591059
if (ngModel) {
10601060
ngModel.$render = function () {
1061-
if (!ngModel.$modelValue || !angular.isArray(ngModel.$modelValue)) {
1062-
scope.$modelValue = [];
1063-
}
10641061
scope.$modelValue = ngModel.$modelValue;
10651062
};
10661063
}
@@ -1334,24 +1331,38 @@
13341331
* @returns {Object} Object with properties offsetX, offsetY, startX, startY, nowX and dirX.
13351332
*/
13361333
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;
13421346
pos.nowX = pos.nowY = pos.distX = pos.distY = pos.dirAx = 0;
13431347
pos.dirX = pos.dirY = pos.lastDirX = pos.lastDirY = pos.distAxX = pos.distAxY = 0;
13441348
return pos;
13451349
},
13461350

13471351
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+
}
13481359
// mouse position last events
13491360
pos.lastX = pos.nowX;
13501361
pos.lastY = pos.nowY;
13511362

13521363
// mouse position this events
1353-
pos.nowX = e.pageX;
1354-
pos.nowY = e.pageY;
1364+
pos.nowX = pageX;
1365+
pos.nowY = pageY;
13551366

13561367
// distance mouse moved between events
13571368
pos.distX = pos.nowX - pos.lastX;
@@ -1366,7 +1377,7 @@
13661377
pos.dirY = pos.distY === 0 ? 0 : pos.distY > 0 ? 1 : -1;
13671378

13681379
// 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;
13701381

13711382
// do nothing on first move
13721383
if (firstMoving) {

0 commit comments

Comments
 (0)