From 64e6316ed1d8f6231349d7e4090c2fe764030bd3 Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Fri, 30 Nov 2012 11:51:09 -0800 Subject: [PATCH] Array.join -> String concatenation r=lightsofapollo --- apps/calendar/js/templates/account.js | 26 +++++++---------- apps/calendar/js/templates/calendar.js | 24 +++++++--------- apps/calendar/js/templates/day.js | 40 ++++++++++++-------------- apps/calendar/js/templates/month.js | 38 ++++++++++-------------- apps/calendar/js/templates/week.js | 22 ++++++-------- 5 files changed, 64 insertions(+), 86 deletions(-) diff --git a/apps/calendar/js/templates/account.js b/apps/calendar/js/templates/account.js index fc5fe0fd73f0..4fcff709f2b5 100644 --- a/apps/calendar/js/templates/account.js +++ b/apps/calendar/js/templates/account.js @@ -2,24 +2,20 @@ var Account = Calendar.Template.create({ provider: function() { - return [ - '
  • ', - '', - this.l10n('name', 'preset-'), - '', - '
  • ' - ].join(''); + return '
  • ' + + '' + + this.l10n('name', 'preset-') + + '' + + '
  • '; }, account: function() { - return [ - '
  • ', - '', - '', this.l10n('preset', 'preset-'), '', - '', this.h('user'), '', - '', - '
  • ' - ].join(''); + return '
  • ' + + '' + + '' + this.l10n('preset', 'preset-') + '' + + '' + this.h('user') + '' + + '' + + '
  • '; } }); diff --git a/apps/calendar/js/templates/calendar.js b/apps/calendar/js/templates/calendar.js index 9eb3a1469d58..27cb0d54a146 100644 --- a/apps/calendar/js/templates/calendar.js +++ b/apps/calendar/js/templates/calendar.js @@ -2,19 +2,17 @@ var Cal = Calendar.Template.create({ item: function() { - return [ - '
  • ', - '
    ', - '', - '
  • ' - ].join(''); + return '
  • ' + + '
    ' + + '' + + '
  • '; } }); diff --git a/apps/calendar/js/templates/day.js b/apps/calendar/js/templates/day.js index 6fa6e1386556..5ba5f1bba57e 100644 --- a/apps/calendar/js/templates/day.js +++ b/apps/calendar/js/templates/day.js @@ -2,15 +2,13 @@ var Day = Calendar.Template.create({ hour: function() { - return [ - '
    ', - '

    ', - '', this.h('displayHour'), '', - '

    ', + return '
    ' + + '

    ' + + '' + this.h('displayHour') + '' + + '

    ' + /** has no semantic value - re-evaluate */ - '
    ', this.s('items'), '
    ', - '
    ' - ].join(''); + '
    ' + this.s('items') + '
    ' + + '
    '; }, attendee: function() { @@ -18,20 +16,18 @@ }, event: function() { - return [ - '
    ', - '
    ', - '
    ', this.h('title'), '
    ', - '', - '', - this.h('location'), - '', - this.s('attendees'), - '', - '
    ', - '
    ' - ].join(''); + return '
    ' + + '
    ' + + '
    ' + this.h('title') + '
    ' + + '' + + '' + + this.h('location') + + '' + + this.s('attendees') + + '' + + '
    ' + + '
    '; } }); diff --git a/apps/calendar/js/templates/month.js b/apps/calendar/js/templates/month.js index 3adf17766940..e49e8452458d 100644 --- a/apps/calendar/js/templates/month.js +++ b/apps/calendar/js/templates/month.js @@ -13,38 +13,30 @@ }, weekDaysHeader: function() { - return [ - '
    ', - '
      ', - this.s('value'), - '
    ', - '
    ' - ].join(''); + return '
    ' + + '
      ' + + this.s('value') + + '
    ' + + '
    '; }, weekDaysHeaderDay: function() { - return [ - '
  • ', - this.h('dayName'), - '
  • ' - ].join(''); + return '
  • ' + + this.h('dayName') + + '
  • '; }, week: function() { - return [ - '
      ', - this.s('value'), - '
    ' - ].join(''); + return '
      ' + + this.s('value') + + '
    '; }, day: function() { - return [ - '
  • ', - '', this.h('date'), '', - '
    ', this.s('busy'), '
    ', - '
  • ' - ].join(''); + return '
  • ' + + '' + this.h('date') + '' + + '
    ' + this.s('busy') + '
    ' + + '
  • '; } }); diff --git a/apps/calendar/js/templates/week.js b/apps/calendar/js/templates/week.js index 09ea597a179b..1276c8868b06 100644 --- a/apps/calendar/js/templates/week.js +++ b/apps/calendar/js/templates/week.js @@ -9,22 +9,18 @@ }, hour: function() { - return [ - '
      ', - this.s('items'), - '
    ' - ].join(''); + return '
      ' + + this.s('items') + + '
    '; }, event: function() { - return [ - '
  • ', - '
    ', - this.h('title'), - '
    ', - '
  • ' - ].join(''); + return '
  • ' + + '
    ' + + this.h('title') + + '
    ' + + '
  • '; } });