diff options
author | Gareth Rees <gareth@mysociety.org> | 2014-03-31 13:41:18 +0100 |
---|---|---|
committer | Gareth Rees <gareth@mysociety.org> | 2014-03-31 13:41:18 +0100 |
commit | 051d5062dfb4a6f60b6c4fec5058039661afadc7 (patch) | |
tree | 89a25986b60928718d5485cce0e7d1654dfbe059 | |
parent | 0adf9399cbef42054809479c8f1b64dad7bbf8ca (diff) | |
parent | 37b801c7cb193f6fe69fd6b938873665a91b1ded (diff) |
Merge branch 'issues/1405-link-to-this-box' into rails-3-develop
-rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/general.js | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d8aed6346..1b6c98535 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,6 +1,7 @@ // ... //= require jquery //= require jquery.ui.datepicker +//= require jquery.ui.position //= require jquery.cookie //= require general //= require ba-throttle-debounce diff --git a/app/assets/javascripts/general.js b/app/assets/javascripts/general.js index 529bbeb04..002eef760 100644 --- a/app/assets/javascripts/general.js +++ b/app/assets/javascripts/general.js @@ -27,8 +27,8 @@ $(document).ready(function() { return false; }); - // "link to this" widget - $('a.link_to_this').click(function() { + // "link to this" widget + $('a.link_to_this').click(function() { var box = $('div#link_box'); var location = window.location.protocol + "//" + window.location.hostname + $(this).attr('href'); box.width(location.length + " em"); @@ -36,12 +36,12 @@ $(document).ready(function() { box.show(); box.find('input').select(); box.position({ - my: "left top", + my: "right center", at: "left bottom", of: this, collision: "fit" }); return false; - }); + }); $('.close-button').click(function() { $(this).parent().hide() }); $('div#variety-filter a').each(function() { |