mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-23 05:51:39 +00:00
Refactor ConfirmingPage button layout and update snapshot files for syncSourceOnly mode
- Adjusted the layout of the reject button in ConfirmingPage for improved UI consistency. - Updated multiple snapshot files to include the new syncSourceOnly flag, enhancing the server's sync capabilities in tests.
This commit is contained in:
parent
b30aa8280d
commit
730cdbda28
21 changed files with 35 additions and 15 deletions
|
|
@ -90,21 +90,21 @@ function ConfirmingPage:render()
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
|
|
||||||
Reject = if Settings:get("twoWaySync")
|
Reject = if Settings:get("twoWaySync")
|
||||||
then e(TextButton, {
|
then e(TextButton, {
|
||||||
text = "Reject",
|
text = "Reject",
|
||||||
style = "Warning",
|
style = "Warning",
|
||||||
transparency = self.props.transparency,
|
transparency = self.props.transparency,
|
||||||
layoutOrder = 0,
|
layoutOrder = 0,
|
||||||
onClick = function()
|
onClick = function()
|
||||||
self:setState({ showingRejectConfirm = true })
|
self:setState({ showingRejectConfirm = true })
|
||||||
end,
|
end,
|
||||||
}, {
|
}, {
|
||||||
Tip = e(Tooltip.Trigger, {
|
Tip = e(Tooltip.Trigger, {
|
||||||
text = "Push Studio changes to the Rojo server",
|
text = "Push Studio changes to the Rojo server",
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
else nil,
|
else nil,
|
||||||
|
|
||||||
Accept = e(TextButton, {
|
Accept = e(TextButton, {
|
||||||
text = "Accept",
|
text = "Accept",
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ protocolVersion: 5
|
||||||
rootInstanceId: id-2
|
rootInstanceId: id-2
|
||||||
serverVersion: "[server-version]"
|
serverVersion: "[server-version]"
|
||||||
sessionId: id-1
|
sessionId: id-1
|
||||||
|
syncSourceOnly: true
|
||||||
unexpectedPlaceIds: ~
|
unexpectedPlaceIds: ~
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue