Skip to content

Commit 1773065

Browse files
committed
Linting
1 parent af90fae commit 1773065

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

.eslintrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"rules": {
3+
"strict": 0,
4+
"quotes": ["single"],
5+
"curly": "multi-line",
6+
"camelcase": 0,
7+
"no-use-before-define": "nofunc",
8+
"no-underscore-dangle": 0,
9+
"no-unused-vars": 0,
10+
"new-cap": 0
11+
},
12+
env: {
13+
"browser": true,
14+
"node": true
15+
}
16+
}

lib/draggable.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ function findInArray(array, callback) {
4141
}
4242
}
4343

44+
var matchesSelectorFunc = '';
4445
function matchesSelector(el, selector) {
45-
var method = findInArray([
46+
if (!matchesSelectorFunc) {
47+
matchesSelectorFunc = findInArray([
4648
'matches',
4749
'webkitMatchesSelector',
4850
'mozMatchesSelector',
@@ -51,8 +53,9 @@ function matchesSelector(el, selector) {
5153
], function(method){
5254
return isFunction(el[method]);
5355
});
56+
}
5457

55-
return el[method].call(el, selector);
58+
return el[matchesSelectorFunc].call(el, selector);
5659
}
5760

5861
/**
@@ -187,8 +190,10 @@ function snapToGrid(grid, pendingX, pendingY) {
187190
}
188191

189192
// Useful for preventing blue highlights all over everything when dragging.
190-
var userSelectStyle = ';user-select: none;-webkit-user-select:none;-moz-user-select:none;' +
191-
'-o-user-select:none;-ms-user-select:none;';
193+
var userSelectStyle = ';user-select: none;';
194+
if (browserPrefix) {
195+
userSelectStyle += '-' + browserPrefix.toLowerCase() + '-user-select: none;';
196+
}
192197

193198
function addUserSelectStyles(draggable) {
194199
if (!draggable.props.enableUserSelectHack) return;
@@ -206,14 +211,13 @@ function createCSSTransform(style) {
206211
// Replace unitless items with px
207212
var x = style.x + 'px';
208213
var y = style.y + 'px';
209-
return {
210-
transform: 'translate(' + x + ',' + y + ')',
211-
WebkitTransform: 'translate(' + x + ',' + y + ')',
212-
OTransform: 'translate(' + x + ',' + y + ')',
213-
msTransform: 'translate(' + x + ',' + y + ')',
214-
MozTransform: 'translate(' + x + ',' + y + ')'
215-
};
214+
var out = {transform: 'translate(' + x + ',' + y + ')'};
215+
// Add single prefixed property as well
216+
if (browserPrefix) {
217+
out[browserPrefix + 'Transform'] = out.transform;
216218
}
219+
return out;
220+
}
217221

218222

219223
//

0 commit comments

Comments
 (0)