Skip to content

Commit

Permalink
Add never option to Confirmation (#893)
Browse files Browse the repository at this point in the history
  • Loading branch information
Barocena committed Mar 14, 2024
1 parent 8f9e307 commit c7a4f89
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Rojo Changelog

## Unreleased Changes
* Added Never option to Confirmation ([#893])
* Added popout diff visualizer for table properties like Attributes and Tags ([#834])
* Updated Theme to use Studio colors ([#838])
* Added experimental setting for Auto Connect in playtests ([#840])
Expand Down Expand Up @@ -55,6 +56,7 @@
[#834]: https://github.com/rojo-rbx/rojo/pull/834
[#838]: https://github.com/rojo-rbx/rojo/pull/838
[#840]: https://github.com/rojo-rbx/rojo/pull/840
[#893]: https://github.com/rojo-rbx/rojo/pull/893

## [7.4.1] - February 20, 2024
* Made the `name` field optional on project files ([#870])
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/App/StatusPages/Settings/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local function invertTbl(tbl)
end

local invertedLevels = invertTbl(Log.Level)
local confirmationBehaviors = { "Initial", "Always", "Large Changes", "Unlisted PlaceId" }
local confirmationBehaviors = { "Initial", "Always", "Large Changes", "Unlisted PlaceId", "Never" }

local function Navbar(props)
return Theme.with(function(theme)
Expand Down
3 changes: 3 additions & 0 deletions plugin/src/App/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ function App:startSession()
return "Accept"
end
end
elseif confirmationBehavior == "Never" then
Log.trace("Accepting patch without confirmation because behavior is set to Never")
return "Accept"
end

-- The datamodel name gets overwritten by Studio, making confirmation of it intrusive
Expand Down

0 comments on commit c7a4f89

Please sign in to comment.