PPM2: select

2016-12-12 22:21:01 +01:00
parent 1b35f02647 b2f022ec66
commit 552b7cc942
10 changed files with 340 additions and 5 deletions
--- a/Praktikum2/ppm1/static/functions.js
+++ b/Praktikum2/ppm1/static/functions.js
@@ -41,6 +41,14 @@ function select(category, mode) {
 function highlight(e) {
   if (selected[0]) selected[0].className = '';
   e.target.parentNode.className = 'selected';
+<<<<<<< HEAD
   var tr = e.target.parentNode;
+=======
+<<<<<<< HEAD
+   var tr = e.target.parentNode;
+=======
+   var tr = event_opl.target.parentNode;
+>>>>>>> 8825fc510535fc545cb82dcdf3e43792144e6d2e
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
   selectedId = tr.getAttribute('id');
 }