From a891892bd83f91f5dc479abdfe82e69d2232a3dc Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 14 Jan 2015 18:20:26 +0100 Subject: [PATCH] Add missing requires in routes --- assets/scripts/app/helpers/helpers.coffee | 19 ++++++++++--------- assets/scripts/app/models/build.coffee | 1 + assets/scripts/app/models/job.coffee | 1 + assets/scripts/app/routes/accounts.coffee | 1 + assets/scripts/app/routes/application.coffee | 2 +- assets/scripts/app/routes/build.coffee | 1 + assets/scripts/app/routes/caches.coffee | 2 ++ assets/scripts/app/routes/job.coffee | 1 + assets/scripts/app/routes/request.coffee | 1 + assets/scripts/app/routes/requests.coffee | 1 + assets/scripts/app/routes/ssh_key.coffee | 2 ++ 11 files changed, 22 insertions(+), 10 deletions(-) diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee index 42cd88f1..ff935922 100644 --- a/assets/scripts/app/helpers/helpers.coffee +++ b/assets/scripts/app/helpers/helpers.coffee @@ -4,7 +4,6 @@ require 'helpers/urls' config_keys_map = Travis.CONFIG_KEYS_MAP config = Travis.config githubCommitUrl = Travis.Urls.githubCommit -currentDate = Travis.currentDate timeago = $.timeago intersect = $.intersect only = $.only @@ -47,9 +46,9 @@ formatConfig = (config) -> formatMessage = (message, options) -> message = message || '' message = message.split(/\n/)[0] if options.short - message = @_emojize(@_escape(message)) + message = _emojize(_escape(message)) if !!options.repo - message = @githubify(message, options.repo.get('owner'), options.repo.get('name')) + message = githubify(message, options.repo.get('owner'), options.repo.get('name')) if !!options.pre message = message.replace /\n/g, '
' message @@ -61,8 +60,8 @@ timeAgoInWords = (date) -> timeago.distanceInWords date durationFrom = (started, finished) -> - started = started and @_toUtc(new Date(@_normalizeDateString(started))) - finished = if finished then @_toUtc(new Date(@_normalizeDateString(finished))) else @_nowUtc() + started = started and _toUtc(new Date(_normalizeDateString(started))) + finished = if finished then _toUtc(new Date(_normalizeDateString(finished))) else _nowUtc() if started && finished then Math.round((finished - started) / 1000) else 0 timeInWords = (duration) -> @@ -83,11 +82,11 @@ timeInWords = (duration) -> githubify = (text, owner, repo) -> self = this - text = text.replace @_githubReferenceRegexp, (reference, matchedOwner, matchedRepo, matchedNumber) -> + text = text.replace _githubReferenceRegexp, (reference, matchedOwner, matchedRepo, matchedNumber) -> self._githubReferenceLink(reference, { owner: owner, repo: repo }, { owner: matchedOwner, repo: matchedRepo, number: matchedNumber } ) - text = text.replace @_githubUserRegexp, (reference, username) -> + text = text.replace _githubUserRegexp, (reference, username) -> self._githubUserLink(reference, username) - text = text.replace @_githubCommitReferenceRegexp, (reference, matchedOwner, matchedRepo, matchedSHA) -> + text = text.replace _githubCommitReferenceRegexp, (reference, matchedOwner, matchedRepo, matchedSHA) -> self._githubCommitReferenceLink(reference, { owner: owner, repo: repo }, { owner: matchedOwner, repo: matchedRepo, sha: matchedSHA }) text @@ -118,7 +117,9 @@ _normalizeDateString = (string) -> string _nowUtc = -> - @_toUtc currentDate() + # TODO: we overwrite Travis.currentDate in tests, so we need to leave this + # global usage as it is for now, but it should be removed at some point + _toUtc Travis.currentDate() _toUtc = (date) -> Date.UTC date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds() diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index a83fcf91..da755cd7 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,4 +1,5 @@ require 'travis/model' +require 'models/extensions' @Travis.Build = Travis.Model.extend Travis.DurationCalculations, repositoryId: Ember.attr('number') diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index b1d20d25..62824c60 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -1,4 +1,5 @@ require 'travis/model' +require 'models/extensions' @Travis.Job = Travis.Model.extend Travis.DurationCalculations, repoId: Ember.attr('string', key: 'repository_id') diff --git a/assets/scripts/app/routes/accounts.coffee b/assets/scripts/app/routes/accounts.coffee index 5834b65c..f5948f85 100644 --- a/assets/scripts/app/routes/accounts.coffee +++ b/assets/scripts/app/routes/accounts.coffee @@ -1,4 +1,5 @@ require 'routes/route' +require 'models/account' Account = Travis.Account TravisRoute = Travis.Route diff --git a/assets/scripts/app/routes/application.coffee b/assets/scripts/app/routes/application.coffee index 35bbe540..04dc6a7c 100644 --- a/assets/scripts/app/routes/application.coffee +++ b/assets/scripts/app/routes/application.coffee @@ -1,6 +1,6 @@ require 'routes/route' -TravisRoute = TravisRoute +TravisRoute = Travis.Route Route = TravisRoute.extend needsAuth: false diff --git a/assets/scripts/app/routes/build.coffee b/assets/scripts/app/routes/build.coffee index c85d9936..ac762ce9 100644 --- a/assets/scripts/app/routes/build.coffee +++ b/assets/scripts/app/routes/build.coffee @@ -1,4 +1,5 @@ require 'routes/route' +require 'models/build' Build = Travis.Build TravisRoute = Travis.Route diff --git a/assets/scripts/app/routes/caches.coffee b/assets/scripts/app/routes/caches.coffee index a6a1db7d..d478d3f3 100644 --- a/assets/scripts/app/routes/caches.coffee +++ b/assets/scripts/app/routes/caches.coffee @@ -1,4 +1,6 @@ require 'routes/route' +require 'models/request' +require 'travis/ajax' Request = Travis.Request Ajax = Travis.ajax diff --git a/assets/scripts/app/routes/job.coffee b/assets/scripts/app/routes/job.coffee index 60d50fdc..e0fcd136 100644 --- a/assets/scripts/app/routes/job.coffee +++ b/assets/scripts/app/routes/job.coffee @@ -1,4 +1,5 @@ require 'routes/route' +require 'models/job' Job = Travis.Job TravisRoute = Travis.Route diff --git a/assets/scripts/app/routes/request.coffee b/assets/scripts/app/routes/request.coffee index bca14684..3be4ddb0 100644 --- a/assets/scripts/app/routes/request.coffee +++ b/assets/scripts/app/routes/request.coffee @@ -1,4 +1,5 @@ require 'routes/route' +require 'models/request' Request = Travis.Request TravisRoute = Travis.Route diff --git a/assets/scripts/app/routes/requests.coffee b/assets/scripts/app/routes/requests.coffee index ac60955b..74d25f62 100644 --- a/assets/scripts/app/routes/requests.coffee +++ b/assets/scripts/app/routes/requests.coffee @@ -1,4 +1,5 @@ require 'routes/route' +require 'models/request' TravisRoute = Travis.Route Request = Travis.Request diff --git a/assets/scripts/app/routes/ssh_key.coffee b/assets/scripts/app/routes/ssh_key.coffee index 6aaaa362..782541c9 100644 --- a/assets/scripts/app/routes/ssh_key.coffee +++ b/assets/scripts/app/routes/ssh_key.coffee @@ -1,4 +1,6 @@ require 'routes/route' +require 'models/ssh_key' +require 'travis/ajax' SshKey = Travis.SshKey Ajax = Travis.ajax