From e00d5d5d5ceba980de8a7dde7d8d38d6c69a3a32 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 29 Jan 2015 12:40:29 +0100 Subject: [PATCH] Move requires to travis.coffee --- assets/scripts/app/components.coffee | 1 - assets/scripts/app/controllers.coffee | 29 --- assets/scripts/app/helpers.coffee | 54 ------ assets/scripts/app/models.coffee | 16 -- assets/scripts/app/router.coffee | 37 ---- assets/scripts/app/{ => utils}/pusher.coffee | 0 assets/scripts/app/views.coffee | 33 ---- assets/scripts/travis.coffee | 189 ++++++++++++++++++- 8 files changed, 179 insertions(+), 180 deletions(-) delete mode 100644 assets/scripts/app/components.coffee delete mode 100644 assets/scripts/app/controllers.coffee delete mode 100644 assets/scripts/app/helpers.coffee delete mode 100644 assets/scripts/app/models.coffee rename assets/scripts/app/{ => utils}/pusher.coffee (100%) delete mode 100644 assets/scripts/app/views.coffee diff --git a/assets/scripts/app/components.coffee b/assets/scripts/app/components.coffee deleted file mode 100644 index 5877b6a4..00000000 --- a/assets/scripts/app/components.coffee +++ /dev/null @@ -1 +0,0 @@ -require 'components/travis-switch' diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee deleted file mode 100644 index 1d92508b..00000000 --- a/assets/scripts/app/controllers.coffee +++ /dev/null @@ -1,29 +0,0 @@ -require 'helpers' -require 'controllers/accounts' -require 'controllers/auth' -require 'controllers/account' -require 'controllers/build' -require 'controllers/builds' -require 'controllers/flash' -require 'controllers/job' -require 'controllers/profile' -require 'controllers/repos' -require 'controllers/repo' -require 'controllers/settings' -require 'controllers/current-user' -require 'controllers/request' -require 'controllers/requests' -require 'controllers/caches' -require 'controllers/env-var' -require 'controllers/env-vars' -require 'controllers/env-var-new' -require 'controllers/ssh-key' -require 'controllers/sidebar' -require 'controllers/top' -require 'controllers/first-sync' -require 'controllers/accounts/info' -require 'controllers/main/error' -require 'controllers/builds/item' -require 'controllers/queue' -require 'controllers/running-jobs' -require 'controllers/dashboard/repositories' diff --git a/assets/scripts/app/helpers.coffee b/assets/scripts/app/helpers.coffee deleted file mode 100644 index d1e23975..00000000 --- a/assets/scripts/app/helpers.coffee +++ /dev/null @@ -1,54 +0,0 @@ -require 'utils/helpers' -require 'utils/urls' -require 'helpers/status-image-formats' -require 'helpers/github-url-properties' - -Travis.Handlebars = {} - -require 'helpers/label' -require 'helpers/input' -require 'helpers/tipsy' -require 'helpers/travis-errors' -require 'helpers/travis-field' -require 'helpers/travis-field' -require 'helpers/filter-input' -require 'helpers/capitalize' -require 'helpers/github-commit-link' -require 'helpers/format-time' -require 'helpers/format-duration' -require 'helpers/format-commit' -require 'helpers/format-sha' -require 'helpers/format-message' -require 'helpers/format-config' -require 'helpers/short-compare-shas' -require 'helpers/mb' - -Ember.Handlebars.registerHelper('label', Travis.Handlebars.label) -Ember.Handlebars.registerHelper('input', Travis.Handlebars.input) -Ember.Handlebars.registerHelper('tipsy', Travis.Handlebars.tipsy) -Ember.Handlebars.registerHelper('travis-errors', Travis.Handlebars.travisErrors) -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('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 - init: -> - @_super() - eventName = Ember.get(this, 'eventName') - if Ember.get(this, 'trackEvent') - @on(eventName, this, @_trackEvent) - @on(eventName, this, @_invoke) - - _trackEvent: (event) -> - event.preventDefault() - diff --git a/assets/scripts/app/models.coffee b/assets/scripts/app/models.coffee deleted file mode 100644 index a6726754..00000000 --- a/assets/scripts/app/models.coffee +++ /dev/null @@ -1,16 +0,0 @@ -require 'models/extensions' -require 'models/account' -require 'models/broadcast' -require 'models/branch' -require 'models/build' -require 'models/commit' -require 'models/event' -require 'models/hook' -require 'models/job' -require 'models/log' -require 'models/annotation' -require 'models/repo' -require 'models/request' -require 'models/user' -require 'models/env-var' -require 'models/ssh-key' diff --git a/assets/scripts/app/router.coffee b/assets/scripts/app/router.coffee index 9a551816..37162ed1 100644 --- a/assets/scripts/app/router.coffee +++ b/assets/scripts/app/router.coffee @@ -52,40 +52,3 @@ Travis.Router.map -> @route 'notFound', path: "/*path" -require 'routes/abstract-builds' -require 'routes/account' -require 'routes/accounts/index' -require 'routes/accounts/info' -require 'routes/accounts' -require 'routes/application' -require 'routes/auth' -require 'routes/branches' -require 'routes/build' -require 'routes/builds' -require 'routes/caches' -require 'routes/env-vars' -require 'routes/first-sync' -require 'routes/getting-started' -require 'routes/insufficient-oauth-permissions' -require 'routes/job' -require 'routes/main/index' -require 'routes/main/my-repositories' -require 'routes/main/recent' -require 'routes/main/repositories' -require 'routes/main/search' -require 'routes/main' -require 'routes/main-tab' -require 'routes/not-found' -require 'routes/profile' -require 'routes/pull-requests' -require 'routes/repo/index' -require 'routes/repo' -require 'routes/request' -require 'routes/requests' -require 'routes/route' -require 'routes/settings/index' -require 'routes/settings' -require 'routes/simple-layout' -require 'routes/ssh-key' -require 'routes/dashboard' -require 'routes/dashboard/repositories' diff --git a/assets/scripts/app/pusher.coffee b/assets/scripts/app/utils/pusher.coffee similarity index 100% rename from assets/scripts/app/pusher.coffee rename to assets/scripts/app/utils/pusher.coffee diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee deleted file mode 100644 index f929e795..00000000 --- a/assets/scripts/app/views.coffee +++ /dev/null @@ -1,33 +0,0 @@ -require 'ext/ember/namespace' -require 'views/view' -require 'views/accounts' -require 'views/annotation' -require 'views/application' -require 'views/build' -require 'views/events' -require 'views/flash' -require 'views/job' -require 'views/jobs' -require 'views/jobs-item' -require 'views/log' -require 'views/repo' -require 'views/repos-list' -require 'views/repos-list-tabs' -require 'views/repo-show-tools' -require 'views/repo-show-tabs' -require 'views/repo-actions' -require 'views/profile' -require 'views/stats' -require 'views/signin' -require 'views/top' -require 'views/status-images' -require 'views/status-image-input' -require 'views/dashboard' -require 'views/show-more-button' -require 'views/main' -require 'views/not-found' -require 'views/auth/signin' -require 'views/insufficient-oauth-permissions' -require 'views/first-sync' -require 'views/application/loading' -require 'views/dashboard/loading' diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index bfd04461..b3f94287 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -114,21 +114,190 @@ require 'serializers/env-var' require 'adapters/env-var' require 'adapters/ssh-key' require 'transforms/object' + require 'store' -#require 'travis/adapter' -#require 'travis/adapters/env-vars' -#require 'travis/adapters/ssh-key' -require 'routes' + +require 'router' +require 'routes/abstract-builds' +require 'routes/account' +require 'routes/accounts/index' +require 'routes/accounts/info' +require 'routes/accounts' +require 'routes/application' +require 'routes/auth' +require 'routes/branches' +require 'routes/build' +require 'routes/builds' +require 'routes/caches' +require 'routes/env-vars' +require 'routes/first-sync' +require 'routes/getting-started' +require 'routes/insufficient-oauth-permissions' +require 'routes/job' +require 'routes/main/index' +require 'routes/main/my-repositories' +require 'routes/main/recent' +require 'routes/main/repositories' +require 'routes/main/search' +require 'routes/main' +require 'routes/main-tab' +require 'routes/not-found' +require 'routes/profile' +require 'routes/pull-requests' +require 'routes/repo/index' +require 'routes/repo' +require 'routes/request' +require 'routes/requests' +require 'routes/route' +require 'routes/settings/index' +require 'routes/settings' +require 'routes/simple-layout' +require 'routes/ssh-key' +require 'routes/dashboard' +require 'routes/dashboard/repositories' + require 'utils/auth' -require 'controllers' -require 'helpers' -require 'models' -require 'pusher' + +require 'controllers/accounts' +require 'controllers/auth' +require 'controllers/account' +require 'controllers/build' +require 'controllers/builds' +require 'controllers/flash' +require 'controllers/job' +require 'controllers/profile' +require 'controllers/repos' +require 'controllers/repo' +require 'controllers/settings' +require 'controllers/current-user' +require 'controllers/request' +require 'controllers/requests' +require 'controllers/caches' +require 'controllers/env-var' +require 'controllers/env-vars' +require 'controllers/env-var-new' +require 'controllers/ssh-key' +require 'controllers/sidebar' +require 'controllers/top' +require 'controllers/first-sync' +require 'controllers/accounts/info' +require 'controllers/main/error' +require 'controllers/builds/item' +require 'controllers/queue' +require 'controllers/running-jobs' +require 'controllers/dashboard/repositories' + +require 'utils/helpers' +require 'utils/urls' +require 'helpers/status-image-formats' +require 'helpers/github-url-properties' + +Travis.Handlebars = {} + +require 'helpers/label' +require 'helpers/input' +require 'helpers/tipsy' +require 'helpers/travis-errors' +require 'helpers/travis-field' +require 'helpers/travis-field' +require 'helpers/filter-input' +require 'helpers/capitalize' +require 'helpers/github-commit-link' +require 'helpers/format-time' +require 'helpers/format-duration' +require 'helpers/format-commit' +require 'helpers/format-sha' +require 'helpers/format-message' +require 'helpers/format-config' +require 'helpers/short-compare-shas' +require 'helpers/mb' + +Ember.Handlebars.registerHelper('label', Travis.Handlebars.label) +Ember.Handlebars.registerHelper('input', Travis.Handlebars.input) +Ember.Handlebars.registerHelper('tipsy', Travis.Handlebars.tipsy) +Ember.Handlebars.registerHelper('travis-errors', Travis.Handlebars.travisErrors) +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('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 + init: -> + @_super() + eventName = Ember.get(this, 'eventName') + if Ember.get(this, 'trackEvent') + @on(eventName, this, @_trackEvent) + @on(eventName, this, @_invoke) + + _trackEvent: (event) -> + event.preventDefault() + +require 'models/extensions' +require 'models/account' +require 'models/broadcast' +require 'models/branch' +require 'models/build' +require 'models/commit' +require 'models/event' +require 'models/hook' +require 'models/job' +require 'models/log' +require 'models/annotation' +require 'models/repo' +require 'models/request' +require 'models/user' +require 'models/env-var' +require 'models/ssh-key' + +require 'utlils/pusher' require 'slider' require 'tailing' require 'templates' -require 'views' -require 'components' + +require 'ext/ember/namespace' +require 'views/view' +require 'views/accounts' +require 'views/annotation' +require 'views/application' +require 'views/build' +require 'views/events' +require 'views/flash' +require 'views/job' +require 'views/jobs' +require 'views/jobs-item' +require 'views/log' +require 'views/repo' +require 'views/repos-list' +require 'views/repos-list-tabs' +require 'views/repo-show-tools' +require 'views/repo-show-tabs' +require 'views/repo-actions' +require 'views/profile' +require 'views/stats' +require 'views/signin' +require 'views/top' +require 'views/status-images' +require 'views/status-image-input' +require 'views/dashboard' +require 'views/show-more-button' +require 'views/main' +require 'views/not-found' +require 'views/auth/signin' +require 'views/insufficient-oauth-permissions' +require 'views/first-sync' +require 'views/application/loading' +require 'views/dashboard/loading' + +require 'components/travis-switch' require 'travis/instrumentation'