Merge branch 'rs-editor-submit' into 'master'

Persist blob editor's value on submit, not on click Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted. See merge request !1712

Merge branch 'rs-editor-submit' into 'master'
cbd1c3e3 · Douwe Maan · 8f75200d · 3b0039f6 · cbd1c3e3 · cbd1c3e3
Commit cbd1c3e3 authored Nov 02, 2015 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

edit_blob.js.coffee app/assets/javascripts/blob/edit_blob.js.coffee +4 -4

new_blob.js.coffee app/assets/javascripts/blob/new_blob.js.coffee +4 -4

No files found.
--- 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")

--- 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