YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp

@@ -8,7 +8,7 @@
 <script type='text/javascript' src='./dwr/util.js'></script>
 <script type='text/javascript' src='./dwr/interface/DelegateArticlesJS.js'></script>
 <script type="text/javascript">
-//<![CDATA[
+
 	var selectedArticleId;
 	var articleId;
 	var pattern;
@@ -91,17 +91,8 @@
 	
 	function removeRemote() {
 		var itemsToRemove = $('refereesList'+articleId).select('div.selected');
-<<<<<<< .mine
 		var refereesId = itemsToRemove.pluck('id');
-=======
-		var refereeId = itemsToRemove.pluck('id');
->>>>>>> .r446
-		//var articleId = $('articleId').value;
-<<<<<<< .mine
 		DelegateArticlesJS.removeReferees(refereesId, articleId, remove);
-=======
-		DelegateArticlesJS.removeReferee(refereeId, articleId, remove);
->>>>>>> .r446
 	}
 			
 	function remove() {
@@ -122,13 +113,8 @@
 	function addRemote(){
 		var itemsToAdd = $('refereesList'+articleId).select('div.selected');
 		var refereesId = itemsToAdd.pluck('id');
-		//var articleId = $('articleId').value;
-<<<<<<< .mine
 		DelegateArticlesJS.addReferees(refereesId, articleId, add());
-=======
-		DelegateArticlesJS.addReferee(refereeId, articleId, add());
 
->>>>>>> .r446
 	}
 	
 	function add() {
@@ -151,8 +137,7 @@
 		itemsToRemove.invoke('remove');
 		itemsToRemove = $('refereesList'+artId).select('div.dynamicListItem');
 		itemsToRemove.invoke('remove');
-	}
-//]]>
+	}
 </script>
 
 </head>