From 094cafcaa7c135a839a7329ed06fdd5d19a05f4b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 13 Apr 2016 08:46:30 +0100 Subject: Removed GL Actions class --- app/assets/javascripts/gl_form.js.coffee | 11 ------ app/assets/javascripts/gl_form_actions.js.coffee | 43 ------------------------ app/views/projects/notes/_hints.html.haml | 3 -- 3 files changed, 57 deletions(-) delete mode 100644 app/assets/javascripts/gl_form_actions.js.coffee diff --git a/app/assets/javascripts/gl_form.js.coffee b/app/assets/javascripts/gl_form.js.coffee index aff3e909ce1..d540cc4dc46 100644 --- a/app/assets/javascripts/gl_form.js.coffee +++ b/app/assets/javascripts/gl_form.js.coffee @@ -11,13 +11,6 @@ class @GLForm @form.data 'gl-form', @ destroy: -> - # Destroy actions - actions = @form.data 'form-actions' - - if actions? - actions.clearEventListeners() - @form.data 'form-actions', null - # Clean form listeners @clearEventListeners() @form.data 'gl-form', null @@ -38,10 +31,6 @@ class @GLForm autosize(@textarea) - # Setup action buttons - actions = new GLFormActions @form, @textarea - @form.data 'form-actions', actions - # form and textarea event listeners @addEventListeners() diff --git a/app/assets/javascripts/gl_form_actions.js.coffee b/app/assets/javascripts/gl_form_actions.js.coffee deleted file mode 100644 index d8de63a2be9..00000000000 --- a/app/assets/javascripts/gl_form_actions.js.coffee +++ /dev/null @@ -1,43 +0,0 @@ -class @GLFormActions - constructor: (@form, @textarea) -> - @clearEventListeners() - @addEventListeners() - - clearEventListeners: -> - @form.off 'click', '.js-toolbar-button' - - addEventListeners: -> - @form.on 'click', '.js-toolbar-button', @toolbarButtonClick - - toolbarButtonClick: (e) => - $btn = $(e.currentTarget) - - # Get the prefix from the button - prefix = $btn.data('prefix') - @addPrefixToTextarea(prefix) - - addPrefixToTextarea: (prefix) -> - caretStart = @textarea.get(0).selectionStart - caretEnd = @textarea.get(0).selectionEnd - textEnd = @textarea.val().length - - beforeSelection = @textarea.val().substring 0, caretStart - afterSelection = @textarea.val().substring caretEnd, textEnd - - beforeSelectionSplit = beforeSelection.split '' - beforeSelectionLength = beforeSelection.length - - # Get the last character in the before selection - beforeSelectionLastChar = beforeSelectionSplit[beforeSelectionLength - 1] - - if beforeSelectionLastChar? and beforeSelectionLastChar isnt '' - # Append a white space char to the prefix if the previous char isn't a space - prefix = " #{prefix}" - - # Update the textarea - @textarea.val beforeSelection + prefix + afterSelection - @textarea.get(0).setSelectionRange caretStart + prefix.length, caretEnd + prefix.length - - # Focus the textarea - @textarea.focus() - @textarea.trigger('keyup') diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml index 0c6758210b1..0b002043408 100644 --- a/app/views/projects/notes/_hints.html.haml +++ b/app/views/projects/notes/_hints.html.haml @@ -1,7 +1,4 @@ .comment-toolbar.clearfix - %button.toolbar-button.js-toolbar-button{ type: 'button', data: { prefix: ':' }, tabindex: '-1' } - = icon('smile-o', class: 'toolbar-button-icon') - Emoji .toolbar-text Styling with = link_to 'Markdown', help_page_path('markdown', 'markdown'), target: '_blank', tabindex: -1 -- cgit v1.2.1