Skip to content

Commit

Permalink
[feature 157801302] remove comments and re-activate eslint where nece…
Browse files Browse the repository at this point in the history
…ssary
  • Loading branch information
saheedt committed Jun 25, 2018
1 parent cdb95f2 commit 0105b5d
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 213 deletions.
12 changes: 6 additions & 6 deletions app/controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/**
* Module dependencies.
*/
var mongoose = require('mongoose'), //eslint-disable-line
async = require('async'), //eslint-disable-line
_ = require('underscore'); //eslint-disable-line
const mongoose = require('mongoose'),
async = require('async'),
_ = require('underscore');


// Redirect users to /#!/app (forcing Angular to reload the page)
exports.play = function(req, res) { //eslint-disable-line
exports.play = (req, res) => {
if (Object.keys(req.query)[0] === 'custom') {
res.redirect('/#!/app?custom');
} else {
res.redirect('/#!/app');
}
};

exports.render = function(req, res) { //eslint-disable-line
exports.render = (req, res) => {
res.render('index', {
user: req.user ? JSON.stringify(req.user) : 'null'
user: req.user ? JSON.stringify(req.user) : null
});
};
5 changes: 0 additions & 5 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,9 @@
}

.chat-panel-slide-up {
/* animation-duration: 0.7s; */
/* animation-name: slideChatPanelUp; */
animation-timing-function: ease-in-out;
}
.chat-panel-slide-down {
/* animation-duration: 0.7s; */
/* animation-name: slideChatPanelDown; */
animation-timing-function: ease-in-out;
}

Expand Down Expand Up @@ -1025,7 +1021,6 @@
margin-bottom: 2px;
background-color: #999;
object-fit: cover
/* margin: auto auto; */
}

#profile-pic {
Expand Down
20 changes: 10 additions & 10 deletions public/js/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', 'ngSanitize', 'ngRoute', 'firebase', 'mean.system', 'mean.directives']) //eslint-disable-line
.config(['$routeProvider',
function($routeProvider) { //eslint-disable-line
function($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'views/index.html',
Expand Down Expand Up @@ -34,13 +34,13 @@ angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', '
});
}
]).config(['$locationProvider',
function($locationProvider) { //eslint-disable-line
function($locationProvider) {
$locationProvider.hashPrefix('!');
}
]).run(['$rootScope', function($rootScope) { //eslint-disable-line
$rootScope.safeApply = function(fn) { //eslint-disable-line
var phase = this.$root.$$phase; //eslint-disable-line
if (phase == '$apply' || phase == '$digest') { //eslint-disable-line
]).run(['$rootScope', function($rootScope) {
$rootScope.safeApply = function(fn) {
var phase = this.$root.$$phase;
if (phase == '$apply' || phase == '$digest') {
if (fn && (typeof (fn) === 'function')) {
fn();
}
Expand All @@ -49,11 +49,11 @@ angular.module('mean', ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.route', '
}
};
}])
.run(['DonationService', function (DonationService) { //eslint-disable-line
window.userDonationCb = function (donationObject) { //eslint-disable-line
.run(['DonationService', function (DonationService) {
window.userDonationCb = function (donationObject) {
DonationService.userDonated(donationObject);
};
}]);

angular.module('mean.system', []); //eslint-disable-line
angular.module('mean.directives', []); //eslint-disable-line
angular.module('mean.system', []);
angular.module('mean.directives', []);
Loading

0 comments on commit 0105b5d

Please sign in to comment.