Merge
authorAnthony Ly <anthonyly.com@gmail.com>
Thu, 27 Jun 2013 15:43:24 +0200
changeset 178 962fb2da996c
parent 177 4b6734e93f02 (diff)
parent 175 8f6eef1d1fc8 (current diff)
child 180 928583c82325
child 186 26dddb3f5804
Merge
--- 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();