@atom/teletype-client
Advanced tools
Comparing version 0.37.2 to 0.38.0
@@ -652,3 +652,4 @@ const assert = require('assert') | ||
let position | ||
if (this.resolveFollowState(siteId) === FollowState.RETRACTED) { | ||
const followState = this.resolveFollowState(siteId) | ||
if (followState === FollowState.RETRACTED) { | ||
const leaderId = this.resolveLeaderSiteId(siteId) | ||
@@ -660,5 +661,5 @@ position = editorProxy.cursorPositionForSiteId(leaderId) | ||
activePositions[siteId] = {editorProxy, position} | ||
activePositions[siteId] = {editorProxy, position, followState} | ||
} else { | ||
activePositions[siteId] = {editorProxy: null, position: null} | ||
activePositions[siteId] = {editorProxy: null, position: null, followState: null} | ||
} | ||
@@ -665,0 +666,0 @@ } |
{ | ||
"name": "@atom/teletype-client", | ||
"version": "0.37.2", | ||
"version": "0.38.0", | ||
"description": "", | ||
@@ -16,5 +16,5 @@ "main": "index.js", | ||
"google-protobuf": "^3.5.0", | ||
"pusher-js": "^4.1.0", | ||
"uuid": "^3.1.0", | ||
"webrtc-adapter": "^6.0.4" | ||
"pusher-js": "^4.2.2", | ||
"uuid": "^3.2.1", | ||
"webrtc-adapter": "^6.1.5" | ||
}, | ||
@@ -25,5 +25,5 @@ "devDependencies": { | ||
"dotenv": "^4.0.0", | ||
"electron": "1.7.11", | ||
"electron-mocha": "^4.0.0" | ||
"electron": "1.7.13", | ||
"electron-mocha": "^4.0.3" | ||
} | ||
} |
@@ -71,5 +71,5 @@ const assert = require('assert') | ||
return Object.keys(this.activePositionsBySiteId).map((siteId) => { | ||
const {editorProxy, position} = this.activePositionsBySiteId[siteId] | ||
const {editorProxy, position, followState} = this.activePositionsBySiteId[siteId] | ||
const editorProxyId = editorProxy ? editorProxy.id : null | ||
return {siteId, editorProxyId, position} | ||
return {siteId, editorProxyId, position, followState} | ||
}) | ||
@@ -76,0 +76,0 @@ } |
@@ -790,7 +790,6 @@ require('./setup') | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 4)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(4, 4)}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(4, 4)} | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 4), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(4, 4), followState: FollowState.RETRACTED}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(4, 4), followState: FollowState.RETRACTED} | ||
]) | ||
// Update active positions after a text change. | ||
@@ -800,5 +799,5 @@ hostBufferProxy1.setTextInRange(point(4, 0), point(4, 0), 'X') | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 5)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(4, 5)}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(4, 5)} | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 5), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(4, 5), followState: FollowState.RETRACTED}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(4, 5), followState: FollowState.RETRACTED} | ||
]) | ||
@@ -813,5 +812,5 @@ | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 5)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(5, 4)}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(5, 4)} | ||
{siteId: 1, editorProxyId: hostEditorProxy1.id, position: point(4, 5), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(5, 4), followState: FollowState.EXTENDED}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(5, 4), followState: FollowState.RETRACTED} | ||
]) | ||
@@ -828,5 +827,5 @@ | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(5, 4)}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(5, 4)} | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy1.id, position: point(5, 4), followState: FollowState.DISCONNECTED}, | ||
{siteId: 3, editorProxyId: hostEditorProxy1.id, position: point(5, 4), followState: FollowState.RETRACTED} | ||
]) | ||
@@ -843,5 +842,5 @@ | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0)}, | ||
{siteId: 3, editorProxyId: hostEditorProxy2.id, position: point(1, 0)} | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0), followState: FollowState.DISCONNECTED}, | ||
{siteId: 3, editorProxyId: hostEditorProxy2.id, position: point(1, 0), followState: FollowState.RETRACTED} | ||
]) | ||
@@ -853,4 +852,4 @@ | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2)}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0)} | ||
{siteId: 1, editorProxyId: hostEditorProxy2.id, position: point(2, 2), followState: FollowState.DISCONNECTED}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0), followState: FollowState.DISCONNECTED} | ||
]) | ||
@@ -862,4 +861,4 @@ | ||
await assertActivePositions([ | ||
{siteId: 1, editorProxyId: null, position: null}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0)} | ||
{siteId: 1, editorProxyId: null, position: null, followState: null}, | ||
{siteId: 2, editorProxyId: hostEditorProxy2.id, position: point(1, 0), followState: FollowState.DISCONNECTED} | ||
]) | ||
@@ -866,0 +865,0 @@ |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
690744
12083
Updatedpusher-js@^4.2.2
Updateduuid@^3.2.1
Updatedwebrtc-adapter@^6.1.5