From 0f910b8da250345f5dfcd8194d262f7a1181ab3a Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 28 Jan 2015 17:36:19 +0100 Subject: [PATCH] EmberCLI compat: helper names with dashes --- assets/scripts/app/helpers.coffee | 16 ++++++++-------- assets/scripts/app/templates/account.hbs | 2 +- assets/scripts/app/templates/build.hbs | 10 +++++----- assets/scripts/app/templates/builds.hbs | 6 +++--- assets/scripts/app/templates/dashboard.hbs | 2 +- .../app/templates/dashboard/repositories.hbs | 2 +- assets/scripts/app/templates/events/list.hbs | 2 +- assets/scripts/app/templates/job.hbs | 10 +++++----- assets/scripts/app/templates/jobs.hbs | 2 +- assets/scripts/app/templates/repos.hbs | 2 +- assets/scripts/app/templates/request.hbs | 2 +- assets/scripts/app/templates/requests.hbs | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/assets/scripts/app/helpers.coffee b/assets/scripts/app/helpers.coffee index efc63b17..0a6b6e41 100644 --- a/assets/scripts/app/helpers.coffee +++ b/assets/scripts/app/helpers.coffee @@ -32,14 +32,14 @@ Ember.Handlebars.registerHelper('travis-field', Travis.Handlebars.travisField) Ember.Handlebars.registerHelper('filter-input', Travis.Handlebars.filterInput) Ember.Handlebars.registerBoundHelper('capitalize', Travis.Handlebars.capitalize) -Ember.Handlebars.registerBoundHelper('githubCommitLink', Travis.Handlebars.githubCommitLink) -Ember.Handlebars.registerBoundHelper('formatTime', Travis.Handlebars.formatTime) -Ember.Handlebars.registerBoundHelper('formatDuration', Travis.Handlebars.formatDuration) -Ember.Handlebars.registerBoundHelper('formatCommit', Travis.Handlebars.formatCommit, 'sha', 'branch') -Ember.Handlebars.registerBoundHelper('formatSha', Travis.Handlebars.formatSha) -Ember.Handlebars.registerBoundHelper('formatMessage', Travis.Handlebars.formatMessage) -Ember.Handlebars.registerBoundHelper('formatConfig', Travis.Handlebars.formatConfig) -Ember.Handlebars.registerBoundHelper('shortCompareShas', Travis.Handlebars.shortCompareShas) +Ember.Handlebars.registerBoundHelper('github-commit-link', Travis.Handlebars.githubCommitLink) +Ember.Handlebars.registerBoundHelper('format-time', Travis.Handlebars.formatTime) +Ember.Handlebars.registerBoundHelper('format-duration', Travis.Handlebars.formatDuration) +Ember.Handlebars.registerBoundHelper('format-commit', Travis.Handlebars.formatCommit, 'sha', 'branch') +Ember.Handlebars.registerBoundHelper('format-sha', Travis.Handlebars.formatSha) +Ember.Handlebars.registerBoundHelper('format-message', Travis.Handlebars.formatMessage) +Ember.Handlebars.registerBoundHelper('format-config', Travis.Handlebars.formatConfig) +Ember.Handlebars.registerBoundHelper('short-compare-shas', Travis.Handlebars.shortCompareShas) Ember.Handlebars.registerBoundHelper('mb', Travis.Handlebars.mb) Ember.LinkView.reopen diff --git a/assets/scripts/app/templates/account.hbs b/assets/scripts/app/templates/account.hbs index 37633139..54c9119e 100644 --- a/assets/scripts/app/templates/account.hbs +++ b/assets/scripts/app/templates/account.hbs @@ -20,7 +20,7 @@

{{else}}

- Last synchronized from GitHub: {{formatTime user.syncedAt}} + Last synchronized from GitHub: {{format-time user.syncedAt}} Sync now diff --git a/assets/scripts/app/templates/build.hbs b/assets/scripts/app/templates/build.hbs index ef6ef692..52b3b269 100644 --- a/assets/scripts/app/templates/build.hbs +++ b/assets/scripts/app/templates/build.hbs @@ -14,7 +14,7 @@

- {{formatTime build.finishedAt}} + {{format-time build.finishedAt}}
{{#if build.tagName}} @@ -24,14 +24,14 @@ {{/if}}
- Commit {{formatSha commit.sha}} + Commit {{format-sha commit.sha}}
{{#if build.pullRequest}} #{{build.pullRequestNumber}}: {{build.pullRequestTitle}} {{else}} {{#if build.commit.compareUrl}} - Compare {{shortCompareShas build.commit.compareUrl}} + Compare {{short-compare-shas build.commit.compareUrl}} {{/if}} {{/if}}
@@ -43,11 +43,11 @@
- - {{formatMessage build.commit.subject repoBinding=build.repo}} + - {{format-message build.commit.subject repoBinding=build.repo}}
- 
{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
+ 
{{format-message build.commit.body repoBinding=build.repo pre=true}}
diff --git a/assets/scripts/app/templates/builds.hbs b/assets/scripts/app/templates/builds.hbs index bac8dfb5..9aee7b62 100644 --- a/assets/scripts/app/templates/builds.hbs +++ b/assets/scripts/app/templates/builds.hbs @@ -32,11 +32,11 @@ {{/if}} - {{{formatMessage build.commit.message short="true" repoBinding=build.repo}}} + {{{format-message build.commit.message short="true" repoBinding=build.repo}}} - {{formatCommit build.commit}} + {{format-commit build.commit}} @@ -53,7 +53,7 @@ {{formatDuration build.duration}} - {{formatTime build.finishedAt}} + {{format-time build.finishedAt}} {{/each}} diff --git a/assets/scripts/app/templates/dashboard.hbs b/assets/scripts/app/templates/dashboard.hbs index e2147cab..c24cd689 100644 --- a/assets/scripts/app/templates/dashboard.hbs +++ b/assets/scripts/app/templates/dashboard.hbs @@ -1 +1 @@ -{{outlet}} \ No newline at end of file +{{outlet}} diff --git a/assets/scripts/app/templates/dashboard/repositories.hbs b/assets/scripts/app/templates/dashboard/repositories.hbs index edcb7e2c..0ba4449f 100644 --- a/assets/scripts/app/templates/dashboard/repositories.hbs +++ b/assets/scripts/app/templates/dashboard/repositories.hbs @@ -45,7 +45,7 @@

{{repo.owner.login}}

{{#link-to "repo" repo.owner.login repo.name}}{{repo.name}}{{/link-to}}

{{formatDuration repo.last_build.duration}}
-
{{formatTime repo.last_build.finished_at}}
+
{{format-time repo.last_build.finished_at}}

{{#link-to "build" repo.owner.login repo.name repo.last_build.id}} #{{repo.last_build.number}} {{repo.last_build.state}} diff --git a/assets/scripts/app/templates/events/list.hbs b/assets/scripts/app/templates/events/list.hbs index bc29f881..9e13db94 100644 --- a/assets/scripts/app/templates/events/list.hbs +++ b/assets/scripts/app/templates/events/list.hbs @@ -13,7 +13,7 @@ {{#each event in view.events}} {{#view Travis.EventsItemView contextBinding="event"}} - {{formatTime createdAt}} + {{format-time createdAt}} {{event.event_}} diff --git a/assets/scripts/app/templates/job.hbs b/assets/scripts/app/templates/job.hbs index a0139070..5fd34a27 100644 --- a/assets/scripts/app/templates/job.hbs +++ b/assets/scripts/app/templates/job.hbs @@ -15,7 +15,7 @@

- {{formatTime job.finishedAt}} + {{format-time job.finishedAt}}
{{#if job.tagName}} @@ -25,14 +25,14 @@ {{/if}}
-
Commit {{formatSha job.commit.sha}}
+
Commit {{format-sha job.commit.sha}}
{{#if job.build.pullRequest}}
#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
{{else}} {{#if job.build.commit.compareUrl}} -
Compare {{shortCompareShas job.build.commit.compareUrl}}
+
Compare {{short-compare-shas job.build.commit.compareUrl}}
{{/if}} {{/if}}
@@ -43,10 +43,10 @@
- - {{formatMessage job.commit.subject repoBinding=job.repo}} + - {{format-message job.commit.subject repoBinding=job.repo}}
- 
{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
+ 
{{format-message job.commit.body repoBinding=job.repo pre=true}}
diff --git a/assets/scripts/app/templates/jobs.hbs b/assets/scripts/app/templates/jobs.hbs index c9aee3f9..c2c0374a 100644 --- a/assets/scripts/app/templates/jobs.hbs +++ b/assets/scripts/app/templates/jobs.hbs @@ -33,7 +33,7 @@ {{formatDuration duration}} - {{formatTime finishedAt}} + {{format-time finishedAt}} {{#each value in configValues}} {{value}} diff --git a/assets/scripts/app/templates/repos.hbs b/assets/scripts/app/templates/repos.hbs index 574414ba..ebb9930f 100644 --- a/assets/scripts/app/templates/repos.hbs +++ b/assets/scripts/app/templates/repos.hbs @@ -31,7 +31,7 @@

Finished: - {{formatTime repo.lastBuildFinishedAt}} + {{format-time repo.lastBuildFinishedAt}}

{{/if}} diff --git a/assets/scripts/app/templates/request.hbs b/assets/scripts/app/templates/request.hbs index 82264dcc..0f556e01 100644 --- a/assets/scripts/app/templates/request.hbs +++ b/assets/scripts/app/templates/request.hbs @@ -7,7 +7,7 @@ #{{pullRequestNumber}} pull request. {{else}} - This request is based on a commit {{formatCommit commit}} by {{commit.authorName}} + This request is based on a commit {{format-commit commit}} by {{commit.authorName}} pushed to {{#if branchName}} to {{branchName}} diff --git a/assets/scripts/app/templates/requests.hbs b/assets/scripts/app/templates/requests.hbs index 7ce6cfcb..5d9c7e9f 100644 --- a/assets/scripts/app/templates/requests.hbs +++ b/assets/scripts/app/templates/requests.hbs @@ -25,7 +25,7 @@ {{id}} - {{githubCommitLink repo.slug commit.sha}} + {{github-commit-link repo.slug commit.sha}} {{#if build}} {{#link-to "build" build}}#{{build.number}}{{/link-to}} @@ -33,7 +33,7 @@ - {{/if}} - {{{formatMessage commit.message short="true" repoBinding=build.repo}}} + {{{format-message commit.message short="true" repoBinding=build.repo}}} {{type}} {{message}}