From 6b77e342eebf27564db4fbd0ef6ddbef906b478f Mon Sep 17 00:00:00 2001 From: dnurkkala Date: Tue, 19 Jun 2018 13:31:18 -0700 Subject: [PATCH 1/3] Added a plugin action for the sync in command. --- plugin/src/Main.server.lua | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugin/src/Main.server.lua b/plugin/src/Main.server.lua index 0b21c11d..48ec6d2e 100644 --- a/plugin/src/Main.server.lua +++ b/plugin/src/Main.server.lua @@ -55,15 +55,17 @@ local function main() end) end) - toolbar:CreateButton("Sync In", "Sync into Roblox Studio", Config.icons.syncIn) - .Click:Connect(function() - checkUpgrade() + local function syncIn() + checkUpgrade() - pluginInstance:syncIn() - :catch(function(err) - warn(err) - end) - end) + pluginInstance:syncIn() + :catch(function(err) + warn(err) + end) + end + + toolbar:CreateButton("Sync In", "Sync into Roblox Studio", Config.icons.syncIn).Click:Connect(syncIn) + plugin:CreatePluginAction("RojoSyncIn", "Sync In Rojo Project", "Pulls the connected Rojo project into Studio.").Triggered:Connect(syncIn) toolbar:CreateButton("Toggle Polling", "Poll server for changes", Config.icons.togglePolling) .Click:Connect(function() From 89fc0c652f05145c47ec5e22d866cad386940e4e Mon Sep 17 00:00:00 2001 From: dnurkkala Date: Tue, 19 Jun 2018 13:47:45 -0700 Subject: [PATCH 2/3] Fixed a problem with a line being too long. --- plugin/src/Main.server.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugin/src/Main.server.lua b/plugin/src/Main.server.lua index 48ec6d2e..8cb50b01 100644 --- a/plugin/src/Main.server.lua +++ b/plugin/src/Main.server.lua @@ -64,8 +64,16 @@ local function main() end) end - toolbar:CreateButton("Sync In", "Sync into Roblox Studio", Config.icons.syncIn).Click:Connect(syncIn) - plugin:CreatePluginAction("RojoSyncIn", "Sync In Rojo Project", "Pulls the connected Rojo project into Studio.").Triggered:Connect(syncIn) + toolbar:CreateButton("Sync In", + "Sync into Roblox Studio", + Config.icons.syncIn) + .Click:Connect(syncIn) + + plugin:CreatePluginAction( + "RojoSyncIn", + "Sync In Rojo Project", + "Pulls the connected Rojo project into Studio.") + .Triggered:Connect(syncIn) toolbar:CreateButton("Toggle Polling", "Poll server for changes", Config.icons.togglePolling) .Click:Connect(function() From b62f345efec38a2111186e6951a0b79b36fbc663 Mon Sep 17 00:00:00 2001 From: dnurkkala Date: Tue, 19 Jun 2018 14:05:25 -0700 Subject: [PATCH 3/3] Made the lines more compact and shared. --- plugin/src/Main.server.lua | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/plugin/src/Main.server.lua b/plugin/src/Main.server.lua index 8cb50b01..d44d1387 100644 --- a/plugin/src/Main.server.lua +++ b/plugin/src/Main.server.lua @@ -64,16 +64,12 @@ local function main() end) end - toolbar:CreateButton("Sync In", - "Sync into Roblox Studio", - Config.icons.syncIn) - .Click:Connect(syncIn) - - plugin:CreatePluginAction( - "RojoSyncIn", - "Sync In Rojo Project", - "Pulls the connected Rojo project into Studio.") - .Triggered:Connect(syncIn) + local dShort = "Sync In" + local dLong = "Sync into Roblox Studio" + + toolbar:CreateButton(dShort, dLong, Config.icons.syncIn).Click:Connect(syncIn) + + plugin:CreatePluginAction("RojoSyncIn", dShort, dLong).Triggered:Connect(syncIn) toolbar:CreateButton("Toggle Polling", "Poll server for changes", Config.icons.togglePolling) .Click:Connect(function()