Skip to content

Commit 2565000

Browse files
author
Adam Bradley
committed
fix(list): Drag to expose list option buttons, closes #701
1 parent 19bb7d9 commit 2565000

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

js/utils/poly.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,27 @@
55
ionic.CSS = {};
66

77
(function() {
8-
var keys = ['webkitTransform', 'transform', '-webkit-transform', 'webkit-transform',
8+
9+
// transform
10+
var i, keys = ['webkitTransform', 'transform', '-webkit-transform', 'webkit-transform',
911
'-moz-transform', 'moz-transform', 'MozTransform', 'mozTransform'];
1012

11-
for(var i = 0; i < keys.length; i++) {
13+
for(i = 0; i < keys.length; i++) {
1214
if(document.documentElement.style[keys[i]] !== undefined) {
1315
ionic.CSS.TRANSFORM = keys[i];
1416
break;
1517
}
1618
}
19+
20+
// transition
21+
keys = ['webkitTransition', 'mozTransition', 'transition']
22+
for(i = 0; i < keys.length; i++) {
23+
if(document.documentElement.style[keys[i]] !== undefined) {
24+
ionic.CSS.TRANSITION = keys[i];
25+
break;
26+
}
27+
}
28+
1729
})();
1830

1931
// classList polyfill for them older Androids

js/views/listView.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
}
9393

9494
this._currentDrag.content.style[ionic.CSS.TRANSFORM] = 'translate3d(' + newX + 'px, 0, 0)';
95-
this._currentDrag.content.style.webkitTransition = 'none';
95+
this._currentDrag.content.style[ionic.CSS.TRANSITION] = 'none';
9696
}
9797
});
9898

@@ -142,7 +142,7 @@
142142
} else {
143143
_this._currentDrag.content.style[ionic.CSS.TRANSFORM] = 'translate3d(' + restingPoint + 'px, 0, 0)';
144144
}
145-
_this._currentDrag.content.style[ionic.CSS.TRANSFORM] = '';
145+
_this._currentDrag.content.style[ionic.CSS.TRANSITION] = '';
146146

147147

148148
// Kill the current drag

0 commit comments

Comments
 (0)