Author: tchemit Date: 2013-04-28 21:08:18 +0200 (Sun, 28 Apr 2013) New Revision: 3777 Url: http://chorem.org/projects/pollen/repository/revisions/3777 Log: refs #894: Can not create or edit a poll while using IE9 Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -70,8 +70,6 @@ $(document).one('mousemove', function() { function KMe(node, attrName, pattern) { var attr = node.attr(attrName).replace( pattern + '\/', ''); - //console.info("Unlock " + pattern + " " + node.attr('id') + - // " - " + attrName + " = " + attr); node.attr(attrName, attr); node.removeClass(pattern); } 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 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-28 19:08:18 UTC (rev 3777) @@ -74,7 +74,6 @@ function displayVoteCountingHelp(type) { var help= $(document).data('voteCountingTypeHelp'); - console.info("Change vct to "+type+" : "+help[type]); $('#voteCountingHelp').html(help[type]); } $('[name="poll.voteCountingType"]').change(function () { @@ -385,7 +384,6 @@ var item = $(ui.item); var container = item.data('choiceType'); var choiceNumber = item.data('choiceNumber'); - //console.info('Moved ' + container + ' -- ' + choiceNumber); reorder(container); } }); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -386,35 +386,6 @@ function updateUpdownActions(containerId) { reorder(containerId); - /*var firstChoice = getFirstChoice(containerId); - var lastChoice = getLastChoice(containerId); - - getAllChoices(containerId).each(function (index) { - - var currentChoiceNumber = $(this).data('choiceNumber'); - - var labelWidget = $('#' + containerId + "_label_" + currentChoiceNumber); - labelWidget.html(datas['choiceText'] + ' ' + (index + 1)); - - var upWidget = $('#' + containerId + "_up_" + currentChoiceNumber); - if (firstChoice == currentChoiceNumber) { - // hide up - upWidget.addClass('hidden'); - } else { - //show up - upWidget.removeClass('hidden'); - } - - var downWidget = $('#' + containerId + "_down_" + currentChoiceNumber); - if (lastChoice == currentChoiceNumber) { - // hide down - downWidget.addClass('hidden'); - } else { - //show down - downWidget.removeClass('hidden'); - } - });*/ - } function loadChoice(containerId, choicePrefix, url, choiceNumber, nbChoices, tokenId) { @@ -504,78 +475,6 @@ return false; } -/*function upChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber - 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -} - -function downChoice(choiceId) { - var choice = $('#' + choiceId); - var choicePrefix = choice.data('choicePrefix'); - var choiceNumber = choice.data('choiceNumber'); - var newChoiceNumber = (choiceNumber + 1); - - return switchChoices(choicePrefix, choiceNumber, newChoiceNumber); -}*/ - -/*function switchChoices(choicePrefix, choiceNumber, newChoiceNumber) { - - // change topiaId - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.topiaId'); - // change description - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.description'); - - // change name - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.name'); - - if ('imageChoice_' == choicePrefix) { - - // change location - switchValue(choicePrefix, choiceNumber, newChoiceNumber, '.location'); - - // change thumb - switchThumb(choicePrefix, choiceNumber, newChoiceNumber); - } - return false; -} - -function switchValue(choicePrefix, choiceNumber, newChoiceNumber, suffix) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + suffix + '"]'); - var choiceTIVal = choiceTI.val(); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + suffix + '"]'); - var newChoiceTIVal = newChoiceTI.val(); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.val(newChoiceTIVal); - newChoiceTI.val(choiceTIVal); -} - -function switchThumb(choicePrefix, choiceNumber, newChoiceNumber) { - var choiceTI = $('[name="' + choicePrefix + choiceNumber + '.thumb"]'); - var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + '.thumb"]'); - - var choiceTIVal = choiceTI.attr("alt"); - var newChoiceTIVal = newChoiceTI.attr("alt"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("alt", newChoiceTIVal); - newChoiceTI.attr("alt", choiceTIVal); - - choiceTIVal = choiceTI.attr("title"); - newChoiceTIVal = newChoiceTI.attr("title"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("title", newChoiceTIVal); - newChoiceTI.attr("title", choiceTIVal); - - choiceTIVal = choiceTI.attr("src"); - newChoiceTIVal = newChoiceTI.attr("src"); - //console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.attr("src", newChoiceTIVal); - newChoiceTI.attr("src", choiceTIVal); -}*/ - function confirmClose() { $('.ui-dialog-title').html(datas['confirmCloseTitle']); var dialog = $("#confirmDialog"); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -88,13 +88,6 @@ return result; }, -// addAddRowTopic:function (gridId, url) { -// $.subscribe(gridId + '-rowAdd', function (event) { -// var url = event.data.url; -// window.location = url; -// }, {id:gridId, url:url}); -// }, - addSingleRowTopic:function (gridId, action, url, parameterName) { $.subscribe(gridId + '-row' + action, function (event) { var gridId = event.data.id; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-23 21:33:56 UTC (rev 3776) +++ trunk/pollen-ui-struts2/src/main/webapp/js/jquery.lightbox-0.5.js 2013-04-28 19:08:18 UTC (rev 3777) @@ -194,8 +194,8 @@ objImagePreloader.onload=function(){}; }; objImagePreloader.src = settings.imageArray[settings.activeImage][0]; - }; - /** + } + /** * Perfomance an effect in the image container resizing it * * @param integer intImageWidth The image�s width that will be showed @@ -222,8 +222,8 @@ } $('#lightbox-container-image-data-box').css({ width: intImageWidth }); $('#lightbox-nav-btnPrev,#lightbox-nav-btnNext').css({ height: intImageHeight + (settings.containerBorderSize * 2) }); - }; - /** + } + /** * Show the prepared image * */ @@ -234,8 +234,8 @@ _set_navigation(); }); _preload_neighbor_images(); - }; - /** + } + /** * Show the image information * */ @@ -436,8 +436,8 @@ } arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight); return arrayPageSize; - }; - /** + } + /** / THIRD FUNCTION * getPageScroll() by quirksmode.com * @@ -457,8 +457,8 @@ } arrayPageScroll = new Array(xScroll,yScroll); return arrayPageScroll; - }; - /** + } + /** * Stop the code execution from a escified time in milisecond * */ @@ -467,8 +467,8 @@ curDate = null; do { var curDate = new Date(); } while ( curDate - date < ms); - }; - // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once + } + // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once return this.unbind('click').click(_initialize); }; })(jQuery); // Call and execute the function immediately passing the jQuery object \ No newline at end of file