summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-08 18:18:54 +0300
committerFatih Acet <acetfatih@gmail.com>2016-06-08 18:18:54 +0300
commit480d74685dff61fdbcf3034224fa201d60181445 (patch)
tree427fd713633c982c8a23f36dfc9945a42dd7ace2
parenta18a58625751611dba4400c574fabfd4a4507a56 (diff)
downloadgitlab-ce-480d74685dff61fdbcf3034224fa201d60181445.tar.gz
Use title attribute instead of data-original-title.
-rw-r--r--app/assets/javascripts/milestone_select.js.coffee4
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index a5c5a349f10..df6ba3167db 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -25,7 +25,7 @@ class @MilestoneSelect
if issueUpdateURL
milestoneLinkTemplate = _.template(
'<a href="/<%= namespace %>/<%= path %>/milestones/<%= iid %>">
- <span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>">
+ <span class="has-tooltip" data-container="body" data-title="<%= remaining %>">
<%= _.escape(title) %>
</span>
</a>'
@@ -34,7 +34,7 @@ class @MilestoneSelect
milestoneLinkNoneTemplate = '<div class="light">None</div>'
collapsedSidebarLabelTemplate = _.template(
- '<span class="has-tooltip" data-container="body" data-original-title="<%= remaining %>" data-placement="left">
+ '<span class="has-tooltip" data-container="body" data-title="<%= remaining %>" data-placement="left">
<%= _.escape(title) %>
</span>'
)
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index dafd11b90da..8cfda130836 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -56,7 +56,7 @@
= icon('clock-o')
%span
- if issuable.milestone
- %span.has-tooltip{"data-container" => "body", "data-placement" => "left", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+ %span.has-tooltip{title: milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1, placement: 'left'}}
= issuable.milestone.title
- else
None
@@ -68,7 +68,7 @@
.value.bold.hide-collapsed
- if issuable.milestone
= link_to namespace_project_milestone_path(@project.namespace, @project, issuable.milestone) do
- %span.has-tooltip{"data-container" => "body", "data-original-title" => milestone_remaining_days(issuable.milestone, false)}
+ %span.has-tooltip{ "title" => milestone_remaining_days(issuable.milestone), data: {container: 'body', html: 1 } }
= issuable.milestone.title
- else
.light None