diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-09 02:32:05 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-09 02:32:05 +0300 |
commit | 9d62fdfae2b47015db324ac62ccde5ae93e69ff9 (patch) | |
tree | 6288c10a60de2ec13747a162aa4a02bcfefd2c93 /app/assets/javascripts/issuable_form.js | |
parent | 882027bd7ca7bbe5c2850e671971657324f1499a (diff) | |
parent | 12cc9a530c6540075c78239416027eb706fac386 (diff) |
Merge branch 'remove-jquery-ui-datepicker' into 'master'
Removed jQuery UI datepicker
See merge request !8421
Diffstat (limited to 'app/assets/javascripts/issuable_form.js')
-rw-r--r-- | app/assets/javascripts/issuable_form.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index 293b856dc4d..2ec545db665 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -3,6 +3,8 @@ /* global UsersSelect */ /* global ZenMode */ /* global Autosave */ +/* global dateFormat */ +/* global Pikaday */ (function() { var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; }; @@ -13,7 +15,7 @@ IssuableForm.prototype.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i; function IssuableForm(form) { - var $issuableDueDate; + var $issuableDueDate, calendar; this.form = form; this.toggleWip = bind(this.toggleWip, this); this.renderWipExplanation = bind(this.renderWipExplanation, this); @@ -35,12 +37,14 @@ this.initMoveDropdown(); $issuableDueDate = $('#issuable-due-date'); if ($issuableDueDate.length) { - $('.datepicker').datepicker({ - dateFormat: 'yy-mm-dd', - onSelect: function(dateText, inst) { - return $issuableDueDate.val(dateText); + calendar = new Pikaday({ + field: $issuableDueDate.get(0), + theme: 'gitlab-theme', + format: 'YYYY-MM-DD', + onSelect: function(dateText) { + $issuableDueDate.val(dateFormat(new Date(dateText), 'yyyy-mm-dd')); } - }).datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())); + }); } } |