Skip to content

Commit 1e9d839

Browse files
committed
Merge pull request #148 from leeyeh/fix-empty-list
Fix empty conversation.list() result
2 parents 6ad648d + e065f27 commit 1e9d839

File tree

7 files changed

+4
-7
lines changed

7 files changed

+4
-7
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = function(grunt) {
6767
},
6868
simplemocha: {
6969
options: {
70-
timeout: 10000,
70+
timeout: 20000,
7171
ui: 'bdd'
7272
},
7373
all: {

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "leancloud-realtime.js",
2+
"name": "leancloud-realtime",
33
"version": "2.2.1",
44
"homepage": "http://github.com/leancloud/js-realtime-sdk/",
55
"authors": [

dist/AV.realtime.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ var newConvObject = function newConvObject(cache) {
236236
var options = {};
237237
var id = this.id;
238238
options.where = {
239-
m: cache.options.peerId,
240239
objectId: id
241240
};
242241
options.serialId = engine.getSerialId(cache);

dist/AV.realtime.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/realtime.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ var newConvObject = function newConvObject(cache) {
226226
var options = {};
227227
var id = this.id;
228228
options.where = {
229-
m: cache.options.peerId,
230229
objectId: id
231230
};
232231
options.serialId = engine.getSerialId(cache);

src/realtime.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ var newConvObject = function(cache) {
226226
var options = {};
227227
var id = this.id;
228228
options.where = {
229-
m: cache.options.peerId,
230229
objectId: id
231230
};
232231
options.serialId = engine.getSerialId(cache);

test/browser/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<script>
2525
mocha.setup({
2626
ui: 'bdd',
27-
timeout: 10000
27+
timeout: 20000
2828
});
2929
</script>
3030
<script src="specs.browser.js"></script>

0 commit comments

Comments
 (0)