From 294654c73ddcc6c548e813325d93f1d77fbe5c0d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 17 Jun 2014 19:16:35 +0200
Subject: [PATCH] Added unit tests for data-* attributes.

---
 .../_application_controller_table.js.coffee      |  2 +-
 .../javascripts/app/views/generic/table.jst.eco  |  4 ++--
 public/assets/tests/table.js                     | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
index 058a842c9..af3ad74af 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
@@ -63,7 +63,7 @@ class App.ControllerTable extends App.Controller
       bindCol:
         host:
           events:
-            'click': colEvent
+            'click': colClick
       bindCheckbox:
         events:
           'click':      rowClick
diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco
index 5328cfda5..e42bbd1ee 100644
--- a/app/assets/javascripts/app/views/generic/table.jst.eco
+++ b/app/assets/javascripts/app/views/generic/table.jst.eco
@@ -78,13 +78,13 @@
       <% end %>
       <% #console.log('HH', item_clone.name, item_clone.type, item_clone.translate, item_clone, object.translate(), refObject, translation) %>
       <td>
-      <% if item_clone.link: %><a href="<%- item_clone.link %>"><% end %>
+      <% if item_clone.link: %><a href="<%- item_clone.link %>" <% if item_clone.target: %>target="<%= item_clone.target %>"<% end %>><% end %>
       <% if item_clone.translate || ( translation && !refObject && object.translate && object.translate() ) || ( translation && refObject && refObject.translate && refObject.translate() ) : %>
         <span <% if item_clone.class: %>class="<%= item_clone.class %>"<% end %>><%- @T( @P( value, item_clone ) ) %></span>
       <% else if item_clone.type is 'time': %>
         <span class="humanTimeFromNow <% if item_clone.class: %><%= item_clone.class %><% end %>" data-time="<%- object[item_clone.name] %>">?</span>
       <% else: %>
-        <span <% if item_clone.class: %>class="<%= item_clone.class %>"<% end %> <% if item_clone.title: %>title="<%= item_clone.title %>"<% end %> <% if item_clone.data: %>data-id="<%= item_clone.data.id %><% end %>"><%= @P(value) %></span>
+        <span <% if item_clone.class: %>class="<%= item_clone.class %>"<% end %> <% if item_clone.title: %>title="<%= item_clone.title %>"<% end %> <% if item_clone.data: %><% for data_key, data_item of item_clone.data: %>data-<%- data_key %>="<%= data_item %>" <% end %><% end %>><%= @P(value) %></span>
       <% end %>
       <% if item_clone.link: %></a><% end %>
       </td>
diff --git a/public/assets/tests/table.js b/public/assets/tests/table.js
index cc6d01a74..ffd3f9aa4 100644
--- a/public/assets/tests/table.js
+++ b/public/assets/tests/table.js
@@ -459,6 +459,18 @@ test( "table test 3", function() {
     attribute.class = 'glyphicon glyphicon-user'
     attribute.link  = '#'
     attribute.title  = App.i18n.translateInline('Switch to')
+    if (object.id == 55) {
+      attribute.data = {
+        some: 'value55',
+        xxx: 55,
+      }
+    }
+    else {
+      attribute.data = {
+        some: 'value56',
+        xxx: 56,
+      }
+    }
     return value
   }
   var switchTo = function(id, e) {
@@ -494,6 +506,8 @@ test( "table test 3", function() {
   equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3) > a > span').hasClass('glyphicon-user'), true, 'check row 1')
   equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3) > a > span').hasClass('glyphicon'), true, 'check row 1')
   equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3) > a > span').attr('title'), 'Switch to', 'check row 1')
+  equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3) > a > span').data('some'), 'value55', 'check row 2')
+  equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3) > a > span').data('xxx'), '55', 'check row 2')
   equal( el.find('tbody > tr:nth-child(2) > td').length, 3, 'check row 2')
   equal( el.find('tbody > tr:nth-child(2) > td:nth-child(1)').text().trim(), 'realname 56', 'check row 2')
   equal( el.find('tbody > tr:nth-child(2) > td:nth-child(2)').text().trim(), 'email 56', 'check row 2')
@@ -501,5 +515,7 @@ test( "table test 3", function() {
   equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3) > a > span').hasClass('glyphicon-user'), true, 'check row 2')
   equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3) > a > span').hasClass('glyphicon'), true, 'check row 2')
   equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3) > a > span').attr('title'), 'Switch to', 'check row 2')
+  equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3) > a > span').data('some'), 'value56', 'check row 2')
+  equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3) > a > span').data('xxx'), '56', 'check row 2')
 
 });