diff -r 26dddb3f5804 -r be4eb4db3418 integration/v2/js/main.js --- a/integration/v2/js/main.js Thu Jun 27 16:16:18 2013 +0200 +++ b/integration/v2/js/main.js Thu Jun 27 17:31:15 2013 +0200 @@ -21,14 +21,6 @@ gutter : 16 }); - function masonry177(){ - var masonry177 = $('.masonry-177'); - masonry177.masonry({ - columnWidth: 177, - itemSelector: '.item-masonry' - }); - } - masonry177(); //popin $('.open-popin').bind('click', function(e){ e.preventDefault(); @@ -60,119 +52,7 @@ keywordsTagIt.tagit("createTag", tag); }); } -//mosaic - $('.toggle-comment').bind('click', function(e){ - e.preventDefault(); - $('.show-comment, .hide-comment').hide(); - if($('.mosaic').length){ - $('.mosaic').removeClass('mosaic').addClass('mosaic-comment'); - $('.hide-comment').show(); - }else{ - $('.mosaic-comment').removeClass('mosaic-comment').addClass('mosaic'); - $('.show-comment').show(); - } - masonry177(); - }); - $('.display-keyword').bind('click', function(e){ - e.preventDefault(); - var ul = $(this).parents('ul'), - li = $(this).parents('li'), - iconAction = li.find('.icon-action'), - index = li.index(), - keyword = $(this).attr('data-keyword'); - - if(!li.hasClass('disabled') && ul.find('li.disabled').length){ - ul.find('li').each(function(k, v){ - var displayKeyword = $(v).find('.display-keyword'), - iconAction = $(v).find('.icon-action'), - keyword = $.trim(displayKeyword.attr('data-keyword')); - enabledDisplayKeyword($(v), keyword, iconAction); - }); - }else{ - ul.find('li').each(function(k, v){ - if(index != k){ - var displayKeyword = $(v).find('.display-keyword'), - iconAction = $(v).find('.icon-action'), - keyword = displayKeyword.attr('data-keyword'); - disabledDisplayKeyword($(v), keyword, iconAction); - } - }); - enabledDisplayKeyword(li, keyword, iconAction); - } - }); - $('.icon-action').bind('click', function(e){ - e.preventDefault(); - var li = $(this).parents('li'); - toggleDisplayKeyword(li); - }); -/* - function toggleDisplayKeyword(li){ - var displayKeyword = li.find('.display-keyword'), - iconAction = li.find('.icon-action'), - keyword = displayKeyword.attr('data-keyword'); - if(li.hasClass('disabled')){ - enabledDisplayKeyword(li, keyword, iconAction); - }else{ - disabledDisplayKeyword(li, keyword, iconAction); - } - } - function enabledDisplayKeyword(li, keyword, iconAction){ - iconAction.removeClass('cross').removeClass('circle'); - li.removeClass('disabled'); - $('li.keyword-'+keyword).find('.curtain').hide(); - iconAction.addClass('cross'); - } - function disabledDisplayKeyword(li, keyword, iconAction){ - iconAction.removeClass('cross').removeClass('circle'); - li.addClass('disabled'); - $('li.keyword-'+keyword).find('.curtain').show(); - iconAction.addClass('circle'); - } -*/ - function toggleDisplayKeyword(li){ - var displayKeyword = li.find('.display-keyword'), - iconAction = li.find('.icon-action'), - keyword = displayKeyword.attr('data-keyword'); - if(li.hasClass('disabled')){ - enabledDisplayKeyword(li, keyword, iconAction); - }else{ - disabledDisplayKeyword(li, keyword, iconAction); - } - } - function enabledDisplayKeyword(li, keyword, iconAction){ - iconAction.removeClass('cross').removeClass('circle'); - li.removeClass('disabled'); - $('ul.mosaic > li').each(function(k, v){ - - var keywords = $(v).attr('data-keywords'), - item = $(v); - keywords = keywords.split(','); - for(var i=0; i<= keywords.length; i++){ - if($.trim(keywords[i]) == keyword){ - item.find('.curtain').hide(); - } - } - }); - $('li.keyword-'+keyword).find('.curtain').hide(); - iconAction.addClass('cross'); - } - function disabledDisplayKeyword(li, keyword, iconAction){ - iconAction.removeClass('cross').removeClass('circle'); - li.addClass('disabled'); - $('ul.mosaic > li').each(function(k, v){ - - var keywords = $(v).attr('data-keywords'), - item = $(v); - keywords = keywords.split(','); - for(var i=0; i<= keywords.length; i++){ - if($.trim(keywords[i]) == keyword){ - item.find('.curtain').show(); - } - } - }); - iconAction.addClass('circle'); - } //map if($('#map').length){ initmap()