From 4138eab15501e98d79154ac572b45d7e443a0638 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 18 Apr 2016 22:42:59 +0200 Subject: [PATCH] v3: undo changes to client that were necessary to test v2 --- website/public/js/controllers/footerCtrl.js | 3 +-- website/public/manifest.json | 4 ++++ website/src/controllers/api-v2/user.js | 2 +- website/views/index.jade | 1 - website/views/shared/footer.jade | 2 +- website/views/static/front.jade | 1 - 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/website/public/js/controllers/footerCtrl.js b/website/public/js/controllers/footerCtrl.js index 665f054f9d..42fd279944 100644 --- a/website/public/js/controllers/footerCtrl.js +++ b/website/public/js/controllers/footerCtrl.js @@ -70,8 +70,7 @@ function($scope, $rootScope, User, $http, Notification, ApiUrl, Social) { /** * Debug functions. Note that the server route for gems is only available if process.env.DEBUG=true */ - // enable debug menu to test v3 TODO remove - if (true || _.contains(['development','test'],window.env.NODE_ENV)) { + if (_.contains(['development','test'],window.env.NODE_ENV)) { $scope.setHealthLow = function(){ User.set({ diff --git a/website/public/manifest.json b/website/public/manifest.json index 4f722c5277..c4d107c03e 100644 --- a/website/public/manifest.json +++ b/website/public/manifest.json @@ -32,6 +32,8 @@ "bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js", "bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js", + "common/dist/scripts/habitrpg-shared.js", + "js/env.js", "js/app.js", @@ -108,6 +110,7 @@ "static": { "js": [ "bower_components/jquery/dist/jquery.min.js", + "common/dist/scripts/habitrpg-shared.js", "bower_components/angular/angular.js", "bower_components/angular-ui/build/angular-ui.js", "bower_components/angular-bootstrap/ui-bootstrap.js", @@ -140,6 +143,7 @@ "tmp_static_front": { "js": [ "bower_components/jquery/dist/jquery.min.js", + "common/dist/scripts/habitrpg-shared.js", "bower_components/angular/angular.js", "bower_components/angular-ui/build/angular-ui.js", "bower_components/jquery-colorbox/jquery.colorbox-min.js", diff --git a/website/src/controllers/api-v2/user.js b/website/src/controllers/api-v2/user.js index aa82123866..9ba77785bf 100644 --- a/website/src/controllers/api-v2/user.js +++ b/website/src/controllers/api-v2/user.js @@ -458,7 +458,7 @@ api.delete = function(req, res, next) { Development Only Operations ------------------------------------------------------------------------ */ -if (true || nconf.get('NODE_ENV') === 'development') { +if (nconf.get('NODE_ENV') === 'development') { api.addTenGems = function(req, res, next) { var user = res.locals.user; diff --git a/website/views/index.jade b/website/views/index.jade index c3dcdc08cb..b1568d254a 100644 --- a/website/views/index.jade +++ b/website/views/index.jade @@ -20,7 +20,6 @@ html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":a script(type='text/javascript'). window.env = !{JSON.stringify(env._.pick(env, env.clientVars))}; - script(type='text/javascript', src='https://habitica.com/common/dist/scripts/habitrpg-shared.js') != env.getManifestFiles("app") //webfonts diff --git a/website/views/shared/footer.jade b/website/views/shared/footer.jade index 97ab797516..30570f27b4 100644 --- a/website/views/shared/footer.jade +++ b/website/views/shared/footer.jade @@ -79,7 +79,7 @@ footer.footer(ng-controller='FooterCtrl') tr td iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px') - if (true || env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage + if (env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage h4 Debug .btn-group-vertical a.btn.btn-default(ng-click='setHealthLow()') Health = 1 diff --git a/website/views/static/front.jade b/website/views/static/front.jade index ea810152f1..23cb407c9d 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -32,7 +32,6 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') script(type='text/javascript'). window.env = !{JSON.stringify(env._.pick(env, env.clientVars))}; - script(type='text/javascript', src='https://habitica.com/common/dist/scripts/habitrpg-shared.js') != env.getManifestFiles("tmp_static_front") script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js')