From 037efc2eb83fbc0ad247ede2ad7431c4ba1ce7c2 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 7 Sep 2017 18:27:30 +0100 Subject: [PATCH] bugfixes Former-commit-id: 38f7bdc4de8a29be11376e2321aaedb027b84a57 [formerly 72daa72c1b48182002bf81ac374b54dad2bae465] [formerly 8498a21191a043432e0a857cbc4aae49761bfdbf [formerly 2ad805d79369986ef8c1b73d49d6ed1a31277d3f]] Former-commit-id: 068d502148b08cfd8dc627739847888f018f4417 [formerly 882e3aff3891329a62374c448e839ba41edebb45] Former-commit-id: 7b71062e2c6e86c5e1ce36daaeb265972c941ca5 --- assets/src/css/dashboard.css | 3 ++- filemanager.go | 43 ++++++++++++++++++++++++------------ rice-box.go.REMOVED.git-id | 2 +- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/assets/src/css/dashboard.css b/assets/src/css/dashboard.css index ee747279..dbb22548 100644 --- a/assets/src/css/dashboard.css +++ b/assets/src/css/dashboard.css @@ -386,7 +386,8 @@ table tr>*:last-child { } .collapsible > label i { - transition: .2s ease transform + transition: .2s ease transform; + user-select: none; } .collapsible .collapse { diff --git a/filemanager.go b/filemanager.go index 3fa91863..c960aa48 100644 --- a/filemanager.go +++ b/filemanager.go @@ -82,6 +82,21 @@ type FileManager struct { NewFS FSBuilder } +var commandEvents = []string{ + "before_save", + "after_save", + "before_publish", + "after_publish", + "before_copy", + "after_copy", + "before_rename", + "after_rename", + "before_upload", + "after_upload", + "before_delete", + "after_delete", +} + // Command is a command function. type Command func(r *http.Request, m *FileManager, u *User) error @@ -130,24 +145,24 @@ func (m *FileManager) Setup() error { err = m.Store.Config.Get("commands", &m.Commands) if err == nil { - // ADD handlers to commands if dont exist + // Add hypothetically new command handlers. + for _, command := range commandEvents { + if _, ok := m.Commands[command]; ok { + continue + } + + m.Commands[command] = []string{} + } } if err != nil && err == ErrNotExist { - m.Commands = map[string][]string{ - "before_save": {}, - "after_save": {}, - "before_publish": {}, - "after_publish": {}, - "before_copy": {}, - "after_copy": {}, - "before_rename": {}, - "after_rename": {}, - "before_upload": {}, - "after_upload": {}, - "before_delete": {}, - "after_delete": {}, + m.Commands = map[string][]string{} + + // Initialize the command handlers. + for _, command := range commandEvents { + m.Commands[command] = []string{} } + err = m.Store.Config.Save("commands", m.Commands) } diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id index a4649500..c6ec51e1 100644 --- a/rice-box.go.REMOVED.git-id +++ b/rice-box.go.REMOVED.git-id @@ -1 +1 @@ -c249fdbec733fcd4aefc255262596bee379c471a \ No newline at end of file +02569a5e91d6d6dcfa2357521c46c159f5edd5c4 \ No newline at end of file