Merge pull request #189 from open-craft/chris/FAL-4041-fix-prevent-de…

…fault

* Move the preventDefault function before the conditional in poll-move-up and poll-move-down click events.
* This change is to avoid opening a new tab page when clicking the Move up/Move down buttons when the Poll block is in an Iframe

poll/__init__.py

@@ -23,4 +23,4 @@
 
 from .poll import PollBlock, SurveyBlock
 
-__version__ = "1.14.0"
+__version__ = "1.14.1"

poll/public/js/poll_edit.js

@@ -108,24 +108,24 @@ function PollEditUtil(runtime, element, pollType) {
     this.empowerArrows = function(scope, topMarker, bottomMarker) {
         // Activates the arrows on rendered line items.
         $('.poll-move-up', scope).click(function (ev) {
+            ev.preventDefault();
             var tag = $(this).parents('li');
             if (tag.index() <= ($(topMarker).index() + 1)){
                 return;
             }
             tag.prev().before(tag);
             tag.fadeOut(0).fadeIn('slow', 'swing');
             self.scrollTo(tag);
-            ev.preventDefault();
         });
-        $('.poll-move-down', scope).click(function () {
+        $('.poll-move-down', scope).click(function (ev) {
+            ev.preventDefault();
             var tag = $(this).parents('li');
             if ((tag.index() >= ($(bottomMarker).index() - 1))) {
                 return;
             }
             tag.next().after(tag);
             tag.fadeOut(0).fadeIn('slow', 'swing');
             self.scrollTo(tag);
-            ev.preventDefault();
         });
     };