Skip to content

Commit 380806c

Browse files
committed
better code
1 parent 776c1aa commit 380806c

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

demo/test-es5.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ AV.init({
88
appKey: appKey
99
});
1010

11+
// 基本存储
1112
var TestClass = AV.Object.extend('TestClass');
1213
var testObj = new TestClass();
1314
testObj.set({
1415
name: 'hjiang',
1516
phone: '123123123'
1617
});
18+
1719
testObj.save().then(function () {
1820
console.log('success');
1921
}).catch(function (err) {
2022
console.log('failed');
2123
console.log(err);
2224
});
2325

26+
// 存储文件
2427
var base64 = 'd29ya2luZyBhdCBhdm9zY2xvdWQgaXMgZ3JlYXQh';
2528
var file = new AV.File('myfile.txt', { base64: base64 });
2629
file.metaData('format', 'txt file');

demo/test-es6.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ AV.init({
66
appKey: appKey
77
});
88

9+
// 基本存储
910
const TestClass = AV.Object.extend('TestClass');
1011
const testObj = new TestClass();
1112
testObj.set({
1213
name: 'hjiang',
1314
phone: '123123123'
1415
});
16+
1517
testObj.save().then(() => {
1618
console.log('success');
1719
}).catch((err) => {
1820
console.log('failed');
1921
console.log(err);
2022
});
2123

24+
// 存储文件
2225
const base64 = 'd29ya2luZyBhdCBhdm9zY2xvdWQgaXMgZ3JlYXQh';
2326
var file = new AV.File('myfile.txt', { base64: base64 });
2427
file.metaData('format', 'txt file');

src/browserify-wrapper/ajax-browser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const ajax = (method, url, data, success, error) => {
3232
const appKey = AV.applicationKey;
3333
const masterKey = AV.masterKey;
3434

35-
// 清理
35+
// 清理原来多余的数据(如果不清理,会污染数据表)
3636
if (data) {
3737
delete data._ApplicationId;
3838
delete data._ApplicationKey;
@@ -77,7 +77,7 @@ const ajax = (method, url, data, success, error) => {
7777
} else {
7878
url = url + '&';
7979
}
80-
url = url + k + '=' + JSON.stringify(data[k]);
80+
url = url + k + '=' + encodeURIComponent(JSON.stringify(data[k]));
8181
i ++;
8282
}
8383
}

src/browserify-wrapper/upload-browser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ module.exports = function upload(file, AV, saveOptions) {
2020
var uptoken = response.token;
2121

2222
var data = new FormData();
23-
data.append("file", dataFormat, self._name);
23+
data.append("file", dataFormat);
24+
data.append('name', self._name);
2425
data.append("key", self._qiniu_key);
2526
data.append("token", uptoken);
2627

test/file.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ describe('files', function() {
1717
file.destroy().then(function(){
1818
done();
1919
}, function(error){
20+
console.log(error);
2021
done(error);
2122
});
2223
}, function(error){
24+
console.log(error);
2325
done(error);
2426
});
2527
});
@@ -38,10 +40,11 @@ describe('files', function() {
3840
return AV._ajax('get', url).then(function() {
3941
done(new Error('Should not parsed as JSON'));
4042
}).catch(function(err) {
41-
if (err.responseText.indexOf('GIF89a\u0018\u0000\u0018') !== -1)
43+
if (err.responseText.indexOf('GIF89a\u0018\u0000\u0018') !== -1) {
4244
done();
43-
else
45+
} else {
4446
done(new Error('Response is not a gif image'));
47+
}
4548
});
4649
}).catch(function(error) {
4750
done(error);

test/query.js

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
// queries
44
var GameScore = AV.Object.extend('GameScore');
55
var Person = AV.Object.extend('Person');
6+
var TestClass = AV.Object.extend('TestClass');
67
var query = new AV.Query(GameScore);
8+
79
describe('Queries', function () {
810
describe('#Basic Queries', function () {
911
it('should return Class Array', function (done) {
@@ -25,28 +27,14 @@ describe('Queries', function () {
2527

2628
});
2729

28-
it('should return TestClass', function(done) {
29-
var TestClass = AV.Object.extend('TestClass');
30-
var testObj = new TestClass();
31-
testObj.set({
30+
it('should return TestClass', function() {
31+
return new TestClass({
3232
name: 'hjiang',
3333
phone: '123123123'
34-
});
35-
testObj.save().then(function() {
36-
var query = new AV.Query('TestClass');
37-
query.equalTo('name', 'hjiang');
38-
query.find().then(function(datas) {
39-
var obj = datas[0];
40-
if (obj && obj.get('name') === 'hjiang') {
41-
done();
42-
} else {
43-
done('failed');
44-
}
45-
}).catch(function(err) {
46-
done(err);
47-
});
48-
}).catch(function(err) {
49-
done(err);
34+
}).save().then(function() {
35+
return new AV.Query(TestClass).equalTo('name', 'hjiang').find();
36+
}).then(function(testObjects) {
37+
expect(testObjects[0].get('name')).to.be('hjiang');
5038
});
5139
});
5240

0 commit comments

Comments
 (0)