Skip to content

Commit e5ce535

Browse files
author
Ron Radtke
committed
Merge remote-tracking branch 'origin/develop' into feature/media_collections
# Conflicts: # android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilFS.java
2 parents 56ba64b + dc40abf commit e5ce535

35 files changed

+9806
-2397
lines changed

.eslintrc

Lines changed: 0 additions & 64 deletions
This file was deleted.

.eslintrc.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
module.exports = {
2+
root: true,
3+
rules: {
4+
'prettier/prettier': 0,
5+
"eqeqeq": 2,
6+
"comma-dangle": 0,
7+
"curly": 0,
8+
"no-console": 1,
9+
"no-debugger": 1,
10+
"no-extra-semi": 2,
11+
"no-extra-parens": 1,
12+
"no-extra-boolean-cast": 1,
13+
"no-cond-assign": 2,
14+
"no-irregular-whitespace": 2,
15+
"no-undef": 0,
16+
"no-unused-vars": 0,
17+
"semi": 2,
18+
"semi-spacing": 2,
19+
"valid-jsdoc": [
20+
1,
21+
{
22+
"requireReturn": false,
23+
"requireParamDescription": false,
24+
"requireReturnDescription": false
25+
}
26+
],
27+
"radix": 0
28+
},
29+
"parser": "babel-eslint"
30+
};

android.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a MIT-style license that can be
33
// found in the LICENSE file.
44

5-
import { NativeModules, Platform } from 'react-native'
5+
import { NativeModules, Platform } from 'react-native';
66

7-
const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil
7+
const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
88

99
/**
1010
* Send an intent to open the file.
@@ -16,37 +16,37 @@ const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil
1616
function actionViewIntent(path, mime, chooserTitle) {
1717
if(typeof chooserTitle === 'undefined') chooserTitle = null;
1818
if(Platform.OS === 'android')
19-
return ReactNativeBlobUtil.actionViewIntent(path, mime, chooserTitle)
19+
return ReactNativeBlobUtil.actionViewIntent(path, mime, chooserTitle);
2020
else
21-
return Promise.reject('ReactNativeBlobUtil.android.actionViewIntent only supports Android.')
21+
return Promise.reject('ReactNativeBlobUtil.android.actionViewIntent only supports Android.');
2222
}
2323

2424
function getContentIntent(mime) {
2525
if(Platform.OS === 'android')
26-
return ReactNativeBlobUtil.getContentIntent(mime)
26+
return ReactNativeBlobUtil.getContentIntent(mime);
2727
else
28-
return Promise.reject('ReactNativeBlobUtil.android.getContentIntent only supports Android.')
28+
return Promise.reject('ReactNativeBlobUtil.android.getContentIntent only supports Android.');
2929
}
3030

3131
function addCompleteDownload(config) {
3232
if(Platform.OS === 'android')
33-
return ReactNativeBlobUtil.addCompleteDownload(config)
33+
return ReactNativeBlobUtil.addCompleteDownload(config);
3434
else
35-
return Promise.reject('ReactNativeBlobUtil.android.addCompleteDownload only supports Android.')
35+
return Promise.reject('ReactNativeBlobUtil.android.addCompleteDownload only supports Android.');
3636
}
3737

3838
function getSDCardDir() {
3939
if(Platform.OS === 'android')
40-
return ReactNativeBlobUtil.getSDCardDir()
40+
return ReactNativeBlobUtil.getSDCardDir();
4141
else
42-
return Promise.reject('ReactNativeBlobUtil.android.getSDCardDir only supports Android.')
42+
return Promise.reject('ReactNativeBlobUtil.android.getSDCardDir only supports Android.');
4343
}
4444

4545
function getSDCardApplicationDir() {
4646
if(Platform.OS === 'android')
47-
return ReactNativeBlobUtil.getSDCardApplicationDir()
47+
return ReactNativeBlobUtil.getSDCardApplicationDir();
4848
else
49-
return Promise.reject('ReactNativeBlobUtil.android.getSDCardApplicationDir only supports Android.')
49+
return Promise.reject('ReactNativeBlobUtil.android.getSDCardApplicationDir only supports Android.');
5050
}
5151

5252

@@ -56,4 +56,4 @@ export default {
5656
addCompleteDownload,
5757
getSDCardDir,
5858
getSDCardApplicationDir,
59-
}
59+
};

0 commit comments

Comments
 (0)