Skip to content

Commit

Permalink
0.437.0.406875 (Scripts)
Browse files Browse the repository at this point in the history
  • Loading branch information
Roblox-Client-Tracker committed Jun 17, 2020
1 parent ec3ac68 commit 7a05e00
Show file tree
Hide file tree
Showing 2,031 changed files with 108,125 additions and 31,931 deletions.
6 changes: 0 additions & 6 deletions BuiltInPlugins/AnimationClipEditor/Bin/main.server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@ local Roact = require(Plugin.Roact)
local DebugFlags = require(Plugin.Src.Util.DebugFlags)
local AnimationClipEditorPlugin = require(Plugin.Src.Components.AnimationClipEditorPlugin)

local isEnableRoactAnimationEditorOn = settings():GetFFlag("EnableRoactAnimationEditor2")

if not isEnableRoactAnimationEditorOn then
return
end

if DebugFlags.RunTests() or DebugFlags.RunRhodiumTests() then
return
end
Expand Down
6 changes: 3 additions & 3 deletions BuiltInPlugins/AnimationClipEditor/Roact/Component.lua
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ function Component:__validateProps(props)
if not success then
failureReason = failureReason or "<Validator function did not supply a message>"
error(("Property validation failed: %s\n\n%s"):format(
tostring(failureReason),
self:getElementTraceback() or "<enable element tracebacks>"),
0)
tostring(failureReason),
self:getElementTraceback() or "<enable element tracebacks>"),
0)
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function SettingsButton:render()
local props = self.props
local state = self.state

onChangeFPS = props.OnChangeFPS
local onChangeFPS = props.OnChangeFPS

return Roact.createElement("ImageButton", {
BackgroundColor3 = theme.backgroundColor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,24 @@ return function()
})
end

itSKIP("should create and destroy without errors", function()
local element = createTestKeyframe()
local instance = Roact.mount(element)
Roact.unmount(instance)
end)
local FFlagRemoveUILibraryTimeline = game:GetFastFlag("RemoveUILibraryTimeline")
if FFlagRemoveUILibraryTimeline then

itSKIP("should render correctly", function ()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestKeyframe(), container)
local frame = container:FindFirstChildOfClass("ImageButton")
it("should create and destroy without errors", function()
local element = createTestKeyframe()
local instance = Roact.mount(element)
Roact.unmount(instance)
end)

expect(frame).to.be.ok()
it("should render correctly", function ()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestKeyframe(), container)
local frame = container:FindFirstChildOfClass("ImageButton")

Roact.unmount(instance)
end)
expect(frame).to.be.ok()

Roact.unmount(instance)
end)

end
end
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,41 @@ return function()
})
end

itSKIP("should create and destroy without errors", function()
local element = createTestScrubber(true)
local instance = Roact.mount(element)
Roact.unmount(instance)
end)
local FFlagRemoveUILibraryTimeline = game:GetFastFlag("RemoveUILibraryTimeline")
if FFlagRemoveUILibraryTimeline then

it("should create and destroy without errors", function()
local element = createTestScrubber(true)
local instance = Roact.mount(element)
Roact.unmount(instance)
end)

describe("should render correctly", function()
itSKIP("should render with head correctly", function()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestScrubber(true), container)
local frame = container:FindFirstChildOfClass("Frame")

expect(frame).to.be.ok()
expect(frame["1"]).to.be.ok()
expect(frame["2"]).to.be.ok()
describe("should render correctly", function()
it("should render with head correctly", function()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestScrubber(true), container)
local frame = container:FindFirstChildOfClass("Frame")

Roact.unmount(instance)
end)
expect(frame).to.be.ok()
expect(frame["1"]).to.be.ok()
expect(frame["2"]).to.be.ok()

itSKIP("should render without head correctly", function()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestScrubber(false), container)
local frame = container:FindFirstChildOfClass("Frame")
Roact.unmount(instance)
end)

expect(frame).to.be.ok()
expect(#frame:GetChildren()).to.be.equal(1)
expect(frame["1"]).to.be.ok()
it("should render without head correctly", function()
local container = Instance.new("Folder")
local instance = Roact.mount(createTestScrubber(false), container)
local frame = container:FindFirstChildOfClass("Frame")

Roact.unmount(instance)
expect(frame).to.be.ok()
expect(#frame:GetChildren()).to.be.equal(1)
expect(frame["1"]).to.be.ok()

Roact.unmount(instance)
end)
end)
end)

end
end
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ return function(name)
if animSaves then
local keyframeSequence = animSaves:FindFirstChild(name)
if keyframeSequence then
local newData
local newData, numKeyframes, numPoses, numEvents
if UseCustomFPS() then
local frameRate = RigUtils.calculateFrameRate(keyframeSequence)
newData, numKeyframes, numPoses, numEvents = RigUtils.fromRigAnimation(
Expand Down
2 changes: 0 additions & 2 deletions BuiltInPlugins/AnimationClipEditor/UILibrary.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ local Vote = require(Components.Preview.Vote)
local Spritesheet = require(Utils.Spritesheet)
local LayoutOrderIterator = require(Utils.LayoutOrderIterator)
local GetClassIcon = require(Utils.GetClassIcon)
local InsertAsset = require(Utils.InsertAsset)
local GetTextSize = require(Utils.GetTextSize)
local getTimeString = require(Utils.getTimeString)
local AssetType = require(Utils.AssetType)
Expand Down Expand Up @@ -150,7 +149,6 @@ local UILibrary = createStrictTable({
deepJoin = deepJoin,
join = join,
GetClassIcon = GetClassIcon,
InsertAsset = InsertAsset,
GetTextSize = GetTextSize,
getTimeString = getTimeString,
MathUtils = MathUtils,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ local withTheme = Theming.withTheme
local TextEntry = Roact.PureComponent:extend("TextEntry")
local FFlagAllowTextEntryToTakeSizeAndPositionProp = game:DefineFastFlag("AllowTextEntryToTakeSizeAndPositionProp", false)
local FFlagGameSettingsFixNameWhitespace = game:DefineFastFlag("GameSettingsFixNameWhitespace", false)
local FFlagFixTextChangedFromEmptyForTextEntry = game:DefineFastFlag("FixTextChangedFromEmptyForTextEntry", false)

function TextEntry:init()
self.textBoxRef = Roact.createRef()
Expand All @@ -28,13 +29,22 @@ function TextEntry:init()
else
rbx.TextXAlignment = Enum.TextXAlignment.Right
end
if rbx.Text ~= self.props.Text then
if FFlagFixTextChangedFromEmptyForTextEntry then
if FFlagGameSettingsFixNameWhitespace then
local processed = string.gsub(rbx.Text, "[\n\r]", " ")
self.props.SetText(processed)
else
self.props.SetText(rbx.Text)
end
else
if rbx.Text ~= self.props.Text then
if FFlagGameSettingsFixNameWhitespace then
local processed = string.gsub(rbx.Text, "[\n\r]", " ")
self.props.SetText(processed)
else
self.props.SetText(rbx.Text)
end
end
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-- TODO: Delete file when FFlagRemoveUILibraryTimeline is retired
--[[
A single keyframe which can be displayed on a media timeline.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-- TODO: Delete file when FFlagRemoveUILibraryTimeline is retired
return function()
local Library = script.Parent.Parent.Parent
local Roact = require(Library.Parent.Roact)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-- TODO: Delete file when FFlagRemoveUILibraryTimeline is retired
--[[
Generic implementation of a Scrubber for a Timeline
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-- TODO: Delete file when FFlagRemoveUILibraryTimeline is retired
return function()
local Library = script.Parent.Parent.Parent
local Roact = require(Library.Parent.Roact)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local FFlagFixGetAssetTypeErrorHandling = game:DefineFastFlag("FixGetAssetTypeErrorHandling", false)
local FFlagStudioUILibFixAssetTypeMap = game:DefineFastFlag("StudioUILibFixAssetTypeMap", false)
local FFlagStudioFixMeshPartPreview = game:DefineFastFlag("StudioFixMeshPartPreview", false)
local FFlagEnableToolboxVideos = game:GetFastFlag("EnableToolboxVideos")

local AssetType = {}

Expand All @@ -25,6 +26,7 @@ AssetType.AssetTypesPreviewEnabled = {
[Enum.AssetType.Audio.Value] = true,
[Enum.AssetType.Lua.Value] = true,
[Enum.AssetType.Plugin.Value] = true,
[Enum.AssetType.Video.Value] = FFlagEnableToolboxVideos or nil,
}

local classTypeMap = {
Expand Down

0 comments on commit 7a05e00

Please sign in to comment.