From 9919b2d0bb749cbe5e795608c2b93c3504e3298b Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Sat, 20 Jul 2013 22:02:45 +0200 Subject: [PATCH] fix(app): order of script inclusions Plugins should be loaded before the application JS. Fixes #278 --- app/index.js | 10 ++++++++++ templates/common/index.html | 5 ----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/index.js b/app/index.js index 4920da999..51cc3bd5d 100644 --- a/app/index.js +++ b/app/index.js @@ -205,6 +205,16 @@ Generator.prototype.extraModules = function extraModules() { } }; +Generator.prototype.appJs = function appJs() { + this.indexFile = this.appendFiles({ + html: this.indexFile, + fileType: 'js', + optimizedPath: 'scripts/scripts.js', + sourceFileList: ['scripts/app.js', 'scripts/controllers/main.js'], + searchPath: ['.tmp', 'app'] + }); +}; + Generator.prototype.createIndexHtml = function createIndexHtml() { this.write(path.join(this.appPath, 'index.html'), this.indexFile); }; diff --git a/templates/common/index.html b/templates/common/index.html index 0b7fc0e67..e1c4bd3be 100644 --- a/templates/common/index.html +++ b/templates/common/index.html @@ -34,10 +34,5 @@ - - - - -