From c6fb57318f562aa457c2c42752b62aa7ebb8b6e4 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 13 Oct 2016 13:06:11 +0200 Subject: [PATCH] Added use of constants in JS [SCI-530] --- app/assets/javascripts/{comments.js => comments.js.erb} | 4 ++-- config/initializers/constants.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename app/assets/javascripts/{comments.js => comments.js.erb} (98%) diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js.erb similarity index 98% rename from app/assets/javascripts/comments.js rename to app/assets/javascripts/comments.js.erb index 52c8e094f..b0fe8f0cd 100644 --- a/app/assets/javascripts/comments.js +++ b/app/assets/javascripts/comments.js.erb @@ -182,7 +182,7 @@ var Comments = (function() { var parentTopPos = $el.offset().top; if (leftPos + menu.width() > $(window).width()) { menu.offset({ left: leftPos - menu.width(), - top: (parentTopPos + 20)}); + top: (parentTopPos + <%= DROPDOWN_TOP_OFFSET %>)}); } }); } @@ -208,7 +208,7 @@ var Comments = (function() { var $el = $(el); var offset = useParentOffset ? $el.offset().top : $el.position().top; $el.find('.dropdown-menu-fixed') - .offset({ top: (offset + 20) }); + .offset({ top: (offset + <%= DROPDOWN_TOP_OFFSET %>) }); }); } diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 13fb0bd59..8dededba7 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -40,6 +40,8 @@ FILE_MAX_SIZE = 50 AVATAR_MAX_SIZE = 0.2 # Max characters for text in dropdown list DROPDOWN_TEXT_MAX_LENGTH = 15 +# Dropdown top offset from the parent +DROPDOWN_TOP_OFFSET = 20 SEARCH_LIMIT = 20