Skip to content

Commit

Permalink
Fix #490 - Correctly replace <year> tag in custom notifications
Browse files Browse the repository at this point in the history
Add .eslintrc.yaml to define the code style standards for better formatting.
Ran eslint against the entire project to get all code in a standardized format
Begin cleaning up old code that was not using best practices. Still have a bunch to do on this front but things are much cleaner now.
Add firstRun entry into the Settings collection which will give the ability to perform specific actions the first time Plexrequests is started up.
Various minor bug fixes

Signed-off-by: Ricky Grassmuck <[email protected]>
  • Loading branch information
RickyGrassmuck committed Sep 27, 2017
1 parent 8a0a74d commit 5d95537
Show file tree
Hide file tree
Showing 7,116 changed files with 466,607 additions and 3,871 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
.meteor/
57 changes: 57 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
env:
browser: true
es6: true
node: true
meteor: true

extends:
- eslint:recommended
- plugin:meteor/recommended

plugins:
- meteor

parserOptions:
sourceType: module

rules:
indent:
- error
- 4
linebreak-style:
- error
- unix
quotes:
- error
- single
semi: [2, 'never']
no-unexpected-multiline: 2
no-throw-literal: 0

# eslint-plugin-meteor
meteor/no-session: [0] # allow Session
meteor/prefer-session-equals: [2] # prefer Session.equals instead

globals:
logger: true
TV: true
Settings: true
Movie: true
AdminConfig: true
Async: true
AutoForm: true
Bert: true
CouchPotato: true
media: true
moment: true
Movies: true
Radarr: true
request: true
SickRage: true
SimpleSchema: true
Sonarr: true
SyncedCron: true
tmdbId: true
TMDBSearch: true
xml2js: true
Permissions: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ _site
*.log
/data
*.idea/
*.msg
10 changes: 0 additions & 10 deletions client/helpers/authentication.js

This file was deleted.

8 changes: 4 additions & 4 deletions client/helpers/bert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bert.defaults = {
hideDelay: 4500,
style: 'fixed-bottom',
type: 'default'
};
hideDelay: 4500,
style: 'fixed-bottom',
type: 'default'
}
30 changes: 15 additions & 15 deletions client/helpers/globalHelpers.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Template.registerHelper('plexUser', function () {
return Session.get("user");
});
return Session.get('user')
})

Template.registerHelper('auth', function () {
var auth = function () {
if (Session.get("auth") === "true") {
return true;
} else if (Meteor.userId()) {
return true;
} else {
return false;
}
};
return auth();
});
var auth = function () {
if (Session.equals('auth', 'true')) {
return true
} else if (Meteor.userId()) {
return true
} else {
return false
}
}
return auth()
})

Template.registerHelper('plexAuth', function () {
return Session.get("auth") === "true";
});
return Session.equals('auth', 'true')
})
Loading

0 comments on commit 5d95537

Please sign in to comment.