fixed dateFormat method for special characters

majgame · Feb 13, 2016 · d9aea00 · d9aea00
1 parent fbb3557
commit d9aea00
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/dist/js/datepicker.js b/dist/js/datepicker.js
@@ -302,6 +302,7 @@ var Datepicker;
  formatDate: function (string, date) {
  date = date || this.date;
  var result = string,
+ boundary = this._getWordBoundaryRegExp,
  locale = this.loc,
  decade = datepicker.getDecade(date),
  d = datepicker.getParsedDate(date);
@@ -310,34 +311,38 @@ var Datepicker;
  case /@/.test(result):
  result = result.replace(/@/, date.getTime());
  case /dd/.test(result):
- result = result.replace(/\bdd\b/, d.fullDate);
+ result = result.replace(boundary('dd'), d.fullDate);
  case /d/.test(result):
- result = result.replace(/\bd\b/, d.date);
+ result = result.replace(boundary('d'), d.date);
  case /DD/.test(result):
- result = result.replace(/\bDD\b/, locale.days[d.day]);
+ result = result.replace(boundary('DD'), locale.days[d.day]);
  case /D/.test(result):
- result = result.replace(/\bD\b/, locale.daysShort[d.day]);
+ result = result.replace(boundary('D'), locale.daysShort[d.day]);
  case /mm/.test(result):
- result = result.replace(/\bmm\b/, d.fullMonth);
+ result = result.replace(boundary('mm'), d.fullMonth);
  case /m/.test(result):
- result = result.replace(/\bm\b/, d.month + 1);
+ result = result.replace(boundary('m'), d.month + 1);
  case /MM/.test(result):
- result = result.replace(/\bMM\b/, this.loc.months[d.month]);
+ result = result.replace(boundary('MM'), this.loc.months[d.month]);
  case /M/.test(result):
- result = result.replace(/\bM\b/, locale.monthsShort[d.month]);
+ result = result.replace(boundary('M'), locale.monthsShort[d.month]);
  case /yyyy/.test(result):
- result = result.replace(/\byyyy\b/, d.year);
+ result = result.replace(boundary('yyyy'), d.year);
  case /yyyy1/.test(result):
- result = result.replace(/\byyyy1\b/, decade[0]);
+ result = result.replace(boundary('yyyy1'), decade[0]);
  case /yyyy2/.test(result):
- result = result.replace(/\byyyy2\b/, decade[1]);
+ result = result.replace(boundary('yyyy2'), decade[1]);
  case /yy/.test(result):
- result = result.replace(/\byy\b/, d.year.toString().slice(-2));
+ result = result.replace(boundary('yy'), d.year.toString().slice(-2));
  }
 
  return result;
  },
 
+ _getWordBoundaryRegExp: function (sign) {
+ return new RegExp('\\b(?=[a-zA-Z0-9äöüßÄÖÜ<])' + sign + '(?![>a-zA-Z0-9äöüßÄÖÜ])');
+ },
+
  selectDate: function (date) {
  var _this = this,
  opts = _this.opts,

diff --git a/dist/js/datepicker.min.js b/dist/js/datepicker.min.js
diff --git a/src/js/datepicker.js b/src/js/datepicker.js
@@ -302,6 +302,7 @@ var Datepicker;
  formatDate: function (string, date) {
  date = date || this.date;
  var result = string,
+ boundary = this._getWordBoundaryRegExp,
  locale = this.loc,
  decade = datepicker.getDecade(date),
  d = datepicker.getParsedDate(date);
@@ -310,34 +311,38 @@ var Datepicker;
  case /@/.test(result):
  result = result.replace(/@/, date.getTime());
  case /dd/.test(result):
- result = result.replace(/\bdd\b/, d.fullDate);
+ result = result.replace(boundary('dd'), d.fullDate);
  case /d/.test(result):
- result = result.replace(/\bd\b/, d.date);
+ result = result.replace(boundary('d'), d.date);
  case /DD/.test(result):
- result = result.replace(/\bDD\b/, locale.days[d.day]);
+ result = result.replace(boundary('DD'), locale.days[d.day]);
  case /D/.test(result):
- result = result.replace(/\bD\b/, locale.daysShort[d.day]);
+ result = result.replace(boundary('D'), locale.daysShort[d.day]);
  case /mm/.test(result):
- result = result.replace(/\bmm\b/, d.fullMonth);
+ result = result.replace(boundary('mm'), d.fullMonth);
  case /m/.test(result):
- result = result.replace(/\bm\b/, d.month + 1);
+ result = result.replace(boundary('m'), d.month + 1);
  case /MM/.test(result):
- result = result.replace(/\bMM\b/, this.loc.months[d.month]);
+ result = result.replace(boundary('MM'), this.loc.months[d.month]);
  case /M/.test(result):
- result = result.replace(/\bM\b/, locale.monthsShort[d.month]);
+ result = result.replace(boundary('M'), locale.monthsShort[d.month]);
  case /yyyy/.test(result):
- result = result.replace(/\byyyy\b/, d.year);
+ result = result.replace(boundary('yyyy'), d.year);
  case /yyyy1/.test(result):
- result = result.replace(/\byyyy1\b/, decade[0]);
+ result = result.replace(boundary('yyyy1'), decade[0]);
  case /yyyy2/.test(result):
- result = result.replace(/\byyyy2\b/, decade[1]);
+ result = result.replace(boundary('yyyy2'), decade[1]);
  case /yy/.test(result):
- result = result.replace(/\byy\b/, d.year.toString().slice(-2));
+ result = result.replace(boundary('yy'), d.year.toString().slice(-2));
  }
 
  return result;
  },
 
+ _getWordBoundaryRegExp: function (sign) {
+ return new RegExp('\\b(?=[a-zA-Z0-9äöüßÄÖÜ<])' + sign + '(?![>a-zA-Z0-9äöüßÄÖÜ])');
+ },
+
  selectDate: function (date) {
  var _this = this,
  opts = _this.opts,

diff --git a/tests/index.html b/tests/index.html
@@ -8,6 +8,7 @@
  <script type="text/javascript" src="../bower_components/jquery/dist/jquery.min.js"></script>
  <script type="text/javascript" src="../dist/js/datepicker.js"></script>
  <script type="text/javascript" src="../dist/js/i18n/datepicker.en.js"></script>
+ <script type="text/javascript" src="../dist/js/i18n/datepicker.de.js"></script>
 
  <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
  <script type="text/javascript" src="../node_modules/chai/chai.js"></script>

diff --git a/tests/specs/options.js b/tests/specs/options.js
@@ -136,7 +136,6 @@ describe('Options', function () {
  'yy': 15,
  'yyyy1': 2010,
  'yyyy2': 2019
-
  };
 
  for (var format in formats) {
@@ -151,6 +150,15 @@ describe('Options', function () {
  })
  }(format))
  }
+
+ it('should work with special characters', function () {
+ dp = $input.datepicker({
+ language: 'de',
+ dateFormat: 'Month is MM'
+ }).data('datepicker');
+ dp.selectDate(new Date(2016, 2, 1));
+ expect(dp.$el.val()).to.be.equal('Month is März');
+ })
  });
 
  describe('altField', function () {