diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-10 22:11:06 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-10 22:11:06 +0000 |
| commit | 279c61f3cbe79f37578ff4366adfc55a63cc5b5b (patch) | |
| tree | 0a1fb2ee34a5bbb087861177cb575ec49a765607 /app | |
| parent | ad8390bc4e7fbe7974104e5c86cd0f6cf7fea112 (diff) | |
| parent | 8f3e3f6b8070d6887f0d267fcaea89579d909287 (diff) | |
| download | gitlab-ce-279c61f3cbe79f37578ff4366adfc55a63cc5b5b.tar.gz | |
Merge branch 'cs-remove-inline-js' into 'master'
Remove two simple instances of inline JavaScript.
Not very complicated, they're moved to the dispatcher.
See merge request !5513
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 7 | ||||
| -rw-r--r-- | app/views/admin/labels/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 20f2b1d69b5..3946e861976 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -186,6 +186,12 @@ break; case 'projects': new NamespaceSelects(); + break; + case 'labels': + switch (path[2]) { + case 'edit': + new Labels(); + } } break; case 'dashboard': @@ -211,6 +217,7 @@ new ProjectNew(); break; case 'show': + new Star(); new ProjectNew(); new ProjectShow(); new NotificationsDropdown(); diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 448aa953548..602cfa9b6fc 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -28,6 +28,3 @@ .form-actions = f.submit 'Save', class: 'btn btn-save js-save-button' = link_to "Cancel", admin_labels_path, class: 'btn btn-cancel' - -:javascript - new Labels(); diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 51f74f3b7ce..8ef31ca3bda 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -24,6 +24,3 @@ .project-clone-holder = render "shared/clone_panel" - -:javascript - new Star(); |