# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1372340604 -7200
# Node ID 962fb2da996c53d532203c8e3f921f1f8fb8854f
# Parent  4b6734e93f02452498f0c5fb4bc0044328abf9e5# Parent  8f6eef1d1fc86428c85b78d59ea7107cbc9b3aaa
Merge

diff -r 8f6eef1d1fc8 -r 962fb2da996c integration/v2/js/main.js
--- a/integration/v2/js/main.js	Thu Jun 27 15:42:46 2013 +0200
+++ b/integration/v2/js/main.js	Thu Jun 27 15:43:24 2013 +0200
@@ -82,17 +82,24 @@
 			index = li.index(),
 			keyword = $(this).attr('data-keyword');
 		
-
-		ul.find('li').each(function(k, v){
-			if(index != k){
+		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 = displayKeyword.attr('data-keyword');
-				disabledDisplayKeyword($(v), keyword, iconAction);
-			}
-		});
-
-		enabledDisplayKeyword(li, keyword, iconAction);
+				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();