From cb350338edd440ab6b89a566688c298c33cf13f1 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 4 Sep 2013 12:54:15 +0200 Subject: [PATCH 1/2] manage local js with connect-assets --- assets/js/appMain.js | 25 +++++++++++++++++++++++++ assets/js/staticMain.js | 3 +++ views/index.jade | 28 +--------------------------- views/static/layout.jade | 4 +--- 4 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 assets/js/appMain.js create mode 100644 assets/js/staticMain.js diff --git a/assets/js/appMain.js b/assets/js/appMain.js new file mode 100644 index 0000000000..9f57a33254 --- /dev/null +++ b/assets/js/appMain.js @@ -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 \ No newline at end of file diff --git a/assets/js/staticMain.js b/assets/js/staticMain.js new file mode 100644 index 0000000000..41ddde7826 --- /dev/null +++ b/assets/js/staticMain.js @@ -0,0 +1,3 @@ +//= require static +//= require services/userServices +//= require controllers/authCtrl \ No newline at end of file diff --git a/views/index.jade b/views/index.jade index e2f3d3d3f3..eafd0388e2 100644 --- a/views/index.jade +++ b/views/index.jade @@ -41,35 +41,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') diff --git a/views/static/layout.jade b/views/static/layout.jade index 53361e8145..a359505630 100644 --- a/views/static/layout.jade +++ b/views/static/layout.jade @@ -28,9 +28,7 @@ html 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 From 16bc90acb15e6ac0ad572114cb1e32c0fb799efb Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 4 Sep 2013 13:15:13 +0200 Subject: [PATCH 2/2] remove moment and lodash, using from habitrpg-shared --- bower.json | 2 -- views/index.jade | 2 -- views/static/layout.jade | 2 -- 3 files changed, 6 deletions(-) diff --git a/bower.json b/bower.json index b4cd0e8497..ab9a760b9b 100644 --- a/bower.json +++ b/bower.json @@ -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", diff --git a/views/index.jade b/views/index.jade index eafd0388e2..34795ac726 100644 --- a/views/index.jade +++ b/views/index.jade @@ -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') diff --git a/views/static/layout.jade b/views/static/layout.jade index a359505630..f2222d9d71 100644 --- a/views/static/layout.jade +++ b/views/static/layout.jade @@ -20,9 +20,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/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').