Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 2e8c8ab

Browse files
nlitwinnlitwin
committed
Merge pull request #20 from appirio-tech/order-injected-files
Order injected angular files
2 parents e6b8471 + 70bc6d4 commit 2e8c8ab

File tree

4 files changed

+61
-61
lines changed

4 files changed

+61
-61
lines changed

‎app/index.jade

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -58,79 +58,78 @@ html
5858
script(src='../bower_components/angular/angular.js')
5959
script(src='../bower_components/angular-ui-router/release/angular-ui-router.js')
6060
script(src='../bower_components/angular-cookies/angular-cookies.js')
61+
script(src='../bower_components/auth0-lock/build/auth0-lock.js')
62+
script(src='../bower_components/auth0.js/build/auth0.js')
63+
script(src='../bower_components/auth0-angular/build/auth0-angular.js')
64+
script(src='../bower_components/a0-angular-storage/dist/angular-storage.js')
6165
script(src='../bower_components/angular-jwt/dist/angular-jwt.js')
6266
script(src='../bower_components/moment/moment.js')
6367
script(src='../bower_components/bootstrap/dist/js/bootstrap.js')
6468
script(src='../bower_components/lodash/lodash.js')
6569
script(src='../bower_components/restangular/dist/restangular.js')
66-
script(src='../bower_components/a0-angular-storage/dist/angular-storage.js')
67-
script(src='../bower_components/auth0.js/build/auth0.js')
68-
script(src='../bower_components/auth0-lock/build/auth0-lock.js')
69-
script(src='../bower_components/auth0-angular/build/auth0-angular.js')
70+
script(src='../bower_components/jstzdetect/jstz.min.js')
7071
//- endbower
7172
//- inject:nonBowerScripts
72-
script(src="/scripts/auth0-1.6.4.js")
73-
script(src="/scripts/jstz-1.0.4.js")
7473
script(src="/scripts/moment-timezone-with-data-2010-2020.js")
7574
//- endinject
7675
// endbuild
7776
7877
// build:js js/app.js
7978
//- inject:js
80-
script(src="topcoder.module.js")
81-
script(src="topcoder.constants.js")
82-
script(src="topcoder.controller.js")
83-
script(src="topcoder.interceptors.js")
84-
script(src="topcoder.routes.js")
85-
script(src="account/account.module.js")
86-
script(src="layout/layout.module.js")
87-
script(src="member-dashboard/member-dashboard.module.js")
8879
script(src="peer-review/peer-review.module.js")
89-
script(src="sample/sample.module.js")
90-
script(src="blocks/exception/exception.module.js")
80+
script(src="peer-review/review-status/review-status.filter.js")
81+
script(src="peer-review/review-status/review-status.controller.js")
82+
script(src="peer-review/readOnlyScorecard/readOnlyScorecard.controller.js")
83+
script(src="peer-review/edit-review/edit-review.controller.js")
84+
script(src="peer-review/completed-review/completed-review.controller.js")
85+
script(src="member-dashboard/member-dashboard.module.js")
86+
script(src="member-dashboard/upcoming-srms/upcoming-srms.controller.js")
87+
script(src="member-dashboard/subscribe-updates/subscribe-updates.controller.js")
88+
script(src="member-dashboard/my-challenges/my-challenges.controller.js")
89+
script(src="member-dashboard/member-program/member-program.controller.js")
90+
script(src="member-dashboard/member-profile/welcome-back.controller.js")
91+
script(src="member-dashboard/marketing-message/marketing-message.controller.js")
92+
script(src="member-dashboard/helpful-links/helpful-links.controller.js")
93+
script(src="member-dashboard/blog-post/blog-post.controller.js")
94+
script(src="layout/layout.module.js")
95+
script(src="layout/header/header.controller.js")
9196
script(src="blocks/logger/logger.module.js")
92-
script(src="account/account.routes.js")
93-
script(src="account/validateLogin.directive.js")
94-
script(src="account/validateRegister.directive.js")
95-
script(src="filters/local-time.filter.js")
96-
script(src="member-dashboard/member-dashboard.controller.js")
97-
script(src="member-dashboard/member-dashboard.routes.js")
98-
script(src="peer-review/peer-review.routes.js")
99-
script(src="peer-review/slideable.directive.js")
100-
script(src="sample/sample.controller.js")
101-
script(src="sample/sample.routes.js")
102-
script(src="services/api.service.js")
103-
script(src="services/authtoken.service.js")
104-
script(src="services/blog.service.js")
105-
script(src="services/challenge.service.js")
106-
script(src="services/helpers.service.js")
107-
script(src="services/memberCert.service.js")
108-
script(src="services/profile.service.js")
109-
script(src="services/review.service.js")
110-
script(src="services/scorecard.service.js")
111-
script(src="services/srm.service.js")
112-
script(src="services/tcAuth.service.js")
113-
script(src="services/user.service.js")
114-
script(src="account/login/login.controller.js")
115-
script(src="account/register/register.controller.js")
116-
script(src="account/reset-password/reset-password.controller.js")
117-
script(src="blocks/exception/exception-handler.provider.js")
118-
script(src="blocks/exception/exception.js")
11997
script(src="blocks/logger/logger.js")
120-
script(src="layout/header/header.controller.js")
121-
script(src="member-dashboard/blog-post/blog-post.controller.js")
122-
script(src="member-dashboard/helpful-links/helpful-links.controller.js")
123-
script(src="member-dashboard/marketing-message/marketing-message.controller.js")
124-
script(src="member-dashboard/member-profile/welcome-back.controller.js")
125-
script(src="member-dashboard/member-program/member-program.controller.js")
126-
script(src="member-dashboard/my-challenges/my-challenges.controller.js")
127-
script(src="member-dashboard/subscribe-updates/subscribe-updates.controller.js")
128-
script(src="member-dashboard/upcoming-srms/upcoming-srms.controller.js")
129-
script(src="peer-review/completed-review/completed-review.controller.js")
130-
script(src="peer-review/edit-review/edit-review.controller.js")
131-
script(src="peer-review/readOnlyScorecard/readOnlyScorecard.controller.js")
132-
script(src="peer-review/review-status/review-status.controller.js")
133-
script(src="peer-review/review-status/review-status.filter.js")
98+
script(src="blocks/exception/exception.module.js")
99+
script(src="blocks/exception/exception.js")
100+
script(src="blocks/exception/exception-handler.provider.js")
101+
script(src="account/account.module.js")
102+
script(src="account/reset-password/reset-password.controller.js")
103+
script(src="account/register/register.controller.js")
104+
script(src="account/login/login.controller.js")
105+
script(src="topcoder.module.js")
106+
script(src="services/user.service.js")
107+
script(src="services/tcAuth.service.js")
108+
script(src="services/srm.service.js")
109+
script(src="services/scorecard.service.js")
110+
script(src="services/review.service.js")
111+
script(src="services/profile.service.js")
112+
script(src="services/memberCert.service.js")
113+
script(src="services/helpers.service.js")
114+
script(src="services/challenge.service.js")
115+
script(src="services/blog.service.js")
116+
script(src="services/authtoken.service.js")
117+
script(src="services/api.service.js")
118+
script(src="sample/sample.module.js")
119+
script(src="sample/sample.routes.js")
120+
script(src="sample/sample.controller.js")
121+
script(src="peer-review/slideable.directive.js")
122+
script(src="peer-review/peer-review.routes.js")
123+
script(src="member-dashboard/member-dashboard.routes.js")
124+
script(src="member-dashboard/member-dashboard.controller.js")
125+
script(src="filters/local-time.filter.js")
126+
script(src="account/validateRegister.directive.js")
127+
script(src="account/validateLogin.directive.js")
128+
script(src="account/account.routes.js")
129+
script(src="topcoder.routes.js")
130+
script(src="topcoder.interceptors.js")
131+
script(src="topcoder.controller.js")
132+
script(src="topcoder.constants.js")
134133
//- endinject
135134
136135
// inject:templates.js

‎gulp.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ module.exports = function() {
3131
indexHtml: temp + 'index.html',
3232
jade: app + '**/*.jade',
3333
js: [
34-
app + 'topcoder.module.js',
35-
app + 'topcoder.*.js',
36-
app + '**/*.module.js',
3734
app + '**/*.js',
3835
'!' + app + '**/*.spec.js'
3936
],

‎gulpfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ gulp.task('wiredep', ['jade'], function() {
134134
return gulp
135135
.src(config.index)
136136
.pipe(wiredep(options))
137-
.pipe($.inject(gulp.src(config.js, {read: false}), {relative: true}))
137+
.pipe($.inject(
138+
gulp.src(config.js)
139+
.pipe($.angularFilesort()),
140+
{relative: true}))
138141
.pipe($.inject(gulp.src(config.nonBowerScripts, {read: false}), {
139142
starttag: '//- inject:nonBowerScripts',
140143
endtag: '//- endinject',

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"connect-history-api-fallback": "^1.1.0",
2626
"del": "^1.2.0",
2727
"gulp": "^3.9.0",
28+
"gulp-angular-filesort": "^1.1.1",
2829
"gulp-angular-templatecache": "^1.6.0",
2930
"gulp-autoprefixer": "^2.3.1",
3031
"gulp-awspublish": "^2.0.2",

0 commit comments

Comments
 (0)