diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-04-17 10:59:20 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-04-17 10:59:20 +0200 |
| commit | 5456b00f27d631fb58e230a75cfe84c7daf4e207 (patch) | |
| tree | 8b43c66dfb5da6987d2b41a69ed63e08cfa81f47 | |
| parent | e988cdba47d7eec8b7fcffe4104af63f1e756294 (diff) | |
| parent | 92544df8da414d506d56b12a6f7077d6abc1e80b (diff) | |
| download | gitlab-ce-5456b00f27d631fb58e230a75cfe84c7daf4e207.tar.gz | |
Merge pull request #8212 from dmedvinsky/fix-url-field
Fix auto-selection of URL field with X11 selection
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 4 | ||||
| -rw-r--r-- | app/views/shared/_clone_panel.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 51f695b684d..4710d2fc53f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) - - + - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - - - diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index fda142293bc..bd52d3d4d70 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -115,8 +115,8 @@ if location.hash window.addEventListener "hashchange", shiftWindow $ -> - # Click a .one_click_select field, select the contents - $(".one_click_select").on 'click', -> $(@).select() + # Click a .js-select-on-focus field, select the contents + $(".js-select-on-focus").on "focusin", -> $(this).select() $('.remove-row').bind 'ajax:success', -> $(this).closest('li').fadeOut() diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index a1121750ca3..8b1e3a6dd5e 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -15,7 +15,7 @@ :"data-html" => "true", :"data-container" => "body"} = gitlab_config.protocol.upcase - = text_field_tag :project_clone, default_url_to_repo(project), class: "one_click_select form-control", readonly: true + = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true - if project.kind_of?(Project) .input-group-addon .visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} project" } |