Author: tchemit Date: 2012-06-19 15:21:32 +0200 (Tue, 19 Jun 2012) New Revision: 3527 Url: http://chorem.org/repositories/revision/pollen/3527 Log: refs #562: improve choice layout (make sure sortable is done at the very end of page loading) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-19 13:20:24 UTC (rev 3526) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-19 13:21:32 UTC (rev 3527) @@ -346,6 +346,19 @@ if (<s:property value="%{voteStarted}"/>) { disableWhenVoteStarted(); } + + $.struts2_jquery.require('js/base/jquery.ui.sortable.js', function () { + + $(".choices").sortable({placeholder:"ui-state-highlight", + update:function (event, ui) { + var item = $(ui.item); + var container = item.data('choiceType'); + var choiceNumber = item.data('choiceNumber'); + console.info('Moved ' + container + ' -- ' + choiceNumber); + reorder(container); + } + }).disableSelection(); + }); }); </script> Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:20:24 UTC (rev 3526) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 13:21:32 UTC (rev 3527) @@ -688,19 +688,4 @@ $('img[src$="tooltip.png"]').addClass("tooltip"); $('.tooltip').tipTip({ defaultPosition:'top' }); - - $.struts2_jquery.require('js/base/jquery.ui.sortable.js', function () { - - $(".choices").sortable({placeholder:"ui-state-highlight", - update:function (event, ui) { - var item = $(ui.item); - var container = item.data('choiceType'); - var choiceNumber = item.data('choiceNumber'); - console.info('Moved ' + container + ' -- ' + choiceNumber); - reorder(container); - } - }).disableSelection(); - }); - - });