Author: sletellier Date: 2012-06-19 17:38:21 +0200 (Tue, 19 Jun 2012) New Revision: 3533 Url: http://chorem.org/repositories/revision/pollen/3533 Log: Prepare image on adding choice Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 14:57:01 UTC (rev 3532) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-19 15:38:21 UTC (rev 3533) @@ -353,27 +353,36 @@ if (containerId == 'choicesIMAGE') { getAllChoices(containerId).each(function (index) { - var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); - var data = {imageIndex:index}; - imageChoice.click(data, function(evt){ - var index = evt.data['imageIndex']; - var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); - inputImageChoice.trigger('click'); - }); - var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); - inputImageChoice.change(data, function(evt) { - var index = evt.data['imageIndex']; - var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); - imageChoice.attr("src", "/pollen/img/7terOk.jpg"); - imageChoice.attr("title", this.value); - imageChoice.attr("alt", this.value); - }); + // prepare image to enable click on image to select file + prepareImageChoice(index); }); } updateUpdownActions(containerId); } +function prepareImageChoice(index) { + + // click on hidden input file on click on image + var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); + var data = {imageIndex:index}; + imageChoice.click(data, function(evt){ + var index = evt.data['imageIndex']; + var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); + inputImageChoice.trigger('click'); + }); + + // update image as selected + var inputImageChoice = $('[name="imageChoice[' + index + ']"]'); + inputImageChoice.change(data, function(evt) { + var index = evt.data['imageIndex']; + var imageChoice = $('[name="imageChoice_' + index + '.thumb"]'); + imageChoice.attr("src", "/pollen/img/7terOk.jpg"); + imageChoice.attr("title", this.value); + imageChoice.attr("alt", this.value); + }); +} + function updateUpdownActions(containerId) { reorder(containerId); @@ -445,6 +454,8 @@ } } }); + + return choiceNumber; } function addTextChoice(choiceNumber, nbChoices, tokenId) { @@ -464,10 +475,13 @@ } function addImageChoice(choiceNumber, nbChoices, tokenId) { - loadChoice('choicesIMAGE', 'imageChoice_', + choiceNumber = loadChoice('choicesIMAGE', 'imageChoice_', datas['displayImageChoiceUrl'], choiceNumber, nbChoices, tokenId ); + + // prepare image to enable click on image to select file + prepareImageChoice(choiceNumber); } function addNewChoice() {