diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 17:01:28 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 17:01:28 +0100 |
| commit | 0b540a0fadf172277639910023fcf8b713ad35aa (patch) | |
| tree | 9efe6d84cebdca7bc31bcc0e6e2e3b7bdf2e3185 /app/assets/javascripts/blob | |
| parent | 3d50b99d016af91c06a40f7a8bf4c298e241220a (diff) | |
| parent | df0110ba81a86b3e066c8b703e1c26d6d05a75da (diff) | |
| download | gitlab-ce-0b540a0fadf172277639910023fcf8b713ad35aa.tar.gz | |
Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
Diffstat (limited to 'app/assets/javascripts/blob')
| -rw-r--r-- | app/assets/javascripts/blob/edit_blob.js.coffee | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/blob/new_blob.js.coffee | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/blob/edit_blob.js.coffee b/app/assets/javascripts/blob/edit_blob.js.coffee index a6f65642d78..bf4cd85aee0 100644 --- a/app/assets/javascripts/blob/edit_blob.js.coffee +++ b/app/assets/javascripts/blob/edit_blob.js.coffee @@ -18,10 +18,10 @@ class @EditBlob $('.form-group.destination').hide() $('#create_merge_request').prop('checked', false) - $(".js-commit-button").click -> - $("#file-content").val editor.getValue() - $(".file-editor form").submit() - return false + # Before a form submission, move the content from the Ace editor into the + # submitted textarea + $('form').submit -> + $("#file-content").val(editor.getValue()) editModePanes = $(".js-edit-mode-pane") editModeLinks = $(".js-edit-mode a") diff --git a/app/assets/javascripts/blob/new_blob.js.coffee b/app/assets/javascripts/blob/new_blob.js.coffee index f4e06ad088b..c2d6c7acfef 100644 --- a/app/assets/javascripts/blob/new_blob.js.coffee +++ b/app/assets/javascripts/blob/new_blob.js.coffee @@ -18,10 +18,10 @@ class @NewBlob $('.form-group.destination').hide() $('#create_merge_request').prop('checked', false) - $(".js-commit-button").click -> - $("#file-content").val editor.getValue() - $(".file-editor form").submit() - return false + # Before a form submission, move the content from the Ace editor into the + # submitted textarea + $('form').submit -> + $("#file-content").val(editor.getValue()) editor: -> return @editor |