diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-11-02 20:21:03 -0600 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-11-02 20:21:03 -0600 |
| commit | 860e24cc7b01280fad7d6351e8dcf891b45f5dd3 (patch) | |
| tree | b506dc2c2d13205ea7ef5c760d623cdf190d69f3 /app/assets | |
| parent | c843722de2d778b6ec8fef0656797fd5a8074666 (diff) | |
| parent | 5782217bfce973b0a654e32b6318cb82d0b4e066 (diff) | |
| download | gitlab-ce-860e24cc7b01280fad7d6351e8dcf891b45f5dd3.tar.gz | |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/assets')
| -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 050888f9c15..f6bf836f19f 100644 --- a/app/assets/javascripts/blob/edit_blob.js.coffee +++ b/app/assets/javascripts/blob/edit_blob.js.coffee @@ -11,10 +11,10 @@ class @EditBlob if ace_mode editor.getSession().setMode "ace/mode/" + ace_mode - $(".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 1f36a53f191..68c5e5195e3 100644 --- a/app/assets/javascripts/blob/new_blob.js.coffee +++ b/app/assets/javascripts/blob/new_blob.js.coffee @@ -11,10 +11,10 @@ class @NewBlob if ace_mode editor.getSession().setMode "ace/mode/" + ace_mode - $(".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 |