diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-10 08:42:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-10 10:41:58 +0100 |
| commit | a99d25b174e07bf58ae8d0c5055291065038f81a (patch) | |
| tree | 6daf8901227404b5696715ce1dd5b77f4374abc4 | |
| parent | b0cf82105bbb3d61e559e8bb36abfa308cbee6ae (diff) | |
| download | gitlab-ce-issuable-sidebar-bold.tar.gz | |
Checks against date parsing instead of stringissuable-sidebar-bold
Removes template for html string that isn't needed
| -rw-r--r-- | app/assets/javascripts/due_date_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee index d5cb3f620b1..32c143cae16 100644 --- a/app/assets/javascripts/due_date_select.js.coffee +++ b/app/assets/javascripts/due_date_select.js.coffee @@ -50,7 +50,7 @@ class @DueDateSelect $selectbox.hide() $value.css('display', '') - cssClass = if mediumDate is "No due date" then 'no-value' else 'bold' + cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value' $valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>") $sidebarValue.html(mediumDate) diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index 6dff9fc4fd0..5df3af6091a 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -39,7 +39,7 @@ class @LabelsSelect </a> <% }); %>' ) - labelNoneHTMLTemplate = _.template('<span class="no-value">None</span>') + labelNoneHTMLTemplate = '<span class="no-value">None</span>' if newLabelField.length @@ -142,7 +142,7 @@ class @LabelsSelect template = labelHTMLTemplate(data) labelCount = data.labels.length else - template = labelNoneHTMLTemplate() + template = labelNoneHTMLTemplate $value .removeAttr('style') .html(template) |