mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-05-22 21:57:03 +00:00
Merge pull request #1420 from lefnire/paglias/optimizations
Optimizations
This commit is contained in:
commit
6e33878d07
5 changed files with 30 additions and 36 deletions
25
assets/js/appMain.js
Normal file
25
assets/js/appMain.js
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
//= require app
|
||||
//= require services/authServices
|
||||
//= require services/notificationServices
|
||||
//= require services/sharedServices
|
||||
//= require services/userServices
|
||||
//= require services/groupServices
|
||||
|
||||
//= require filters/filters
|
||||
|
||||
//= require directives/directives
|
||||
|
||||
//= require controllers/authCtrl
|
||||
//= require controllers/characterCtrl
|
||||
//= require controllers/menuCtrl
|
||||
//= require controllers/notificationCtrl
|
||||
//= require controllers/rootCtrl
|
||||
//= require controllers/settingsCtrl
|
||||
//= require controllers/statsCtrl
|
||||
//= require controllers/tasksCtrl
|
||||
//= require controllers/taskDetailsCtrl
|
||||
//= require controllers/filtersCtrl
|
||||
//= require controllers/userAvatarCtrl
|
||||
//= require controllers/groupsCtrl
|
||||
//= require controllers/petsCtrl
|
||||
//= require controllers/footerCtrl
|
||||
3
assets/js/staticMain.js
Normal file
3
assets/js/staticMain.js
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
//= require static
|
||||
//= require services/userServices
|
||||
//= require controllers/authCtrl
|
||||
|
|
@ -20,8 +20,6 @@
|
|||
"angular-ui": "~0.4.0",
|
||||
"angular-bootstrap": "~0.5.0",
|
||||
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite",
|
||||
"lodash": "~1.3.1",
|
||||
"moment": "~2.1.0",
|
||||
"bootstrap-tour": "~0.5.1",
|
||||
"BrowserQuest": "https://github.com/mozilla/BrowserQuest.git",
|
||||
"github-buttons": "git://github.com/mdo/github-buttons.git",
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ html
|
|||
|
||||
// JS
|
||||
script(type='text/javascript', src='/bower_components/jquery/jquery.min.js')
|
||||
script(type='text/javascript', src='/bower_components/lodash/dist/lodash.min.js')
|
||||
script(type='text/javascript', src='/bower_components/bootstrap-growl/jquery.bootstrap-growl.min.js')
|
||||
script(type='text/javascript', src='/bower_components/moment/min/moment.min.js')
|
||||
script(type='text/javascript', src='/bower_components/angular/angular.min.js')
|
||||
script(type='text/javascript', src='/bower_components/angular-route/angular-route.min.js')
|
||||
script(type='text/javascript', src='/bower_components/angular-resource/angular-resource.min.js')
|
||||
|
|
@ -41,35 +39,9 @@ html
|
|||
script(type='text/javascript', src='/bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js')
|
||||
script(type='text/javascript', src='/bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js')
|
||||
|
||||
|
||||
script(type='text/javascript', src='/bower_components/habitrpg-shared/dist/habitrpg-shared.js')
|
||||
|
||||
!= js('app')
|
||||
|
||||
!= js('services/authServices')
|
||||
!= js('services/notificationServices')
|
||||
!= js('services/sharedServices')
|
||||
!= js('services/userServices')
|
||||
!= js('services/groupServices')
|
||||
|
||||
!= js('filters/filters')
|
||||
|
||||
!= js('directives/directives')
|
||||
|
||||
!= js('controllers/authCtrl')
|
||||
!= js('controllers/characterCtrl')
|
||||
!= js('controllers/menuCtrl')
|
||||
!= js('controllers/notificationCtrl')
|
||||
!= js('controllers/rootCtrl')
|
||||
!= js('controllers/settingsCtrl')
|
||||
!= js('controllers/statsCtrl')
|
||||
!= js('controllers/tasksCtrl')
|
||||
!= js('controllers/taskDetailsCtrl')
|
||||
!= js('controllers/filtersCtrl')
|
||||
!= js('controllers/userAvatarCtrl')
|
||||
!= js('controllers/groupsCtrl')
|
||||
!= js('controllers/petsCtrl')
|
||||
!= js('controllers/footerCtrl')
|
||||
!= js('appMain')
|
||||
|
||||
//webfonts
|
||||
link(href='//fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic', rel='stylesheet', type='text/css')
|
||||
|
|
|
|||
|
|
@ -20,17 +20,13 @@ html
|
|||
|
||||
// JS
|
||||
script(type='text/javascript', src='/bower_components/jquery/jquery.min.js')
|
||||
script(type='text/javascript', src='/bower_components/lodash/dist/lodash.min.js')
|
||||
script(type='text/javascript', src='/bower_components/habitrpg-shared/dist/habitrpg-shared.js')
|
||||
script(type='text/javascript', src='/bower_components/moment/min/moment.min.js')
|
||||
script(type='text/javascript', src='/bower_components/angular/angular.min.js')
|
||||
script(type='text/javascript', src='/bower_components/bootstrap/docs/assets/js/bootstrap.min.js')
|
||||
script(type='text/javascript').
|
||||
$.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
|
||||
|
||||
!= js('static')
|
||||
!= js('services/userServices')
|
||||
!= js('controllers/authCtrl')
|
||||
!= js('staticMain')
|
||||
|
||||
body
|
||||
block content
|
||||
|
|
|
|||
Loading…
Reference in a new issue