From f3edb10f44d4cf5214b732ae892e1b78af7adc0d Mon Sep 17 00:00:00 2001
From: X O <xo@wvvw.me>
Date: Sat, 21 Nov 2015 23:17:10 +1030
Subject: [PATCH] add travis grunt task
---
.build/Gruntfile.js | 18 +++++++++++++++---
.jshintignore | 1 +
gui/slick/js/addTrendingShow.js | 4 ++--
gui/slick/js/apibuilder.js | 14 +++++++-------
gui/slick/js/blackwhite.js | 14 +++++++-------
gui/slick/js/meta.js | 6 +++---
gui/slick/js/newShow.js | 2 +-
gui/slick/js/qualityChooser.js | 4 ++--
gui/slick/js/restart.js | 10 +++++-----
9 files changed, 43 insertions(+), 30 deletions(-)
create mode 100644 .jshintignore
diff --git a/.build/Gruntfile.js b/.build/Gruntfile.js
index c17b6261b..8cb9dbda0 100644
--- a/.build/Gruntfile.js
+++ b/.build/Gruntfile.js
@@ -53,9 +53,14 @@ module.exports = function(grunt) {
},
jshint: {
options: {
- eqeqeq: true
+ jshintrc: '../.jshintrc'
},
- uses_defaults: ['../gui/slick/js/**/*.js']
+ all: [
+ '../gui/slick/js/**/*.js',
+ '!../gui/slick/js/lib/**/*.js',
+ '!../gui/slick/js/ajaxNotifications.js',
+ '!../gui/slick/js/**/*.min.js', // We use this because ignores doesn't seem to work :(
+ ]
}
});
@@ -64,5 +69,12 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-jshint');
- grunt.registerTask('default', ['bower_concat', 'uglify', 'cssmin']);
+ grunt.registerTask('default', [
+ 'bower_concat',
+ 'uglify',
+ 'cssmin']
+ );
+ grunt.registerTask('travis', [
+ 'jshint'
+ ]);
};
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000000000..121531af8
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/gui/slick/js/addTrendingShow.js b/gui/slick/js/addTrendingShow.js
index 84f00c70e..ef5abbc17 100644
--- a/gui/slick/js/addTrendingShow.js
+++ b/gui/slick/js/addTrendingShow.js
@@ -1,7 +1,7 @@
$.fn.loadContent = function(path, loadingTxt, errorTxt) {
$(this).html('<img id="searchingAnim" src="' + srRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> ' + loadingTxt);
- $(this).load(srRoot + path + ' #container', function(response, status, xhr) {
- if (status == "error") $(this).empty().html(errorTxt);
+ $(this).load(srRoot + path + ' #container', function(response, status) {
+ if (status === "error") { $(this).empty().html(errorTxt); }
});
};
diff --git a/gui/slick/js/apibuilder.js b/gui/slick/js/apibuilder.js
index b80668708..5623ba810 100644
--- a/gui/slick/js/apibuilder.js
+++ b/gui/slick/js/apibuilder.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
var name = $(item).attr('name');
var value = $(item).val();
- if(name !== undefined && value !== undefined && name != value && value) {
+ if(name !== undefined && value !== undefined && name !== value && value) {
if($.isArray(value)) {
value = value.join('|');
}
@@ -33,7 +33,7 @@ $(document).ready(function() {
$(timeId).text(responseTime + 'ms');
$(urlId).text(url + (jsonp ? '&jsonp=foo' : ''));
- if(responseType.slice(0, 6) == 'image/') {
+ if(responseType.slice(0, 6) === 'image/') {
target.html($('<img/>').attr('src', url));
} else {
var json = JSON.stringify(data, null, 4);
@@ -65,10 +65,10 @@ $(document).ready(function() {
select.removeClass('hidden');
select.find('option:gt(0)').remove();
- for(var episode in episodes[show][season]) {
+ for(var episode in episodes[show][season]) { // jshint ignore:line
select.append($('<option>', {
- value: episodes[show][season][episode],
- label: 'Episode ' + episodes[show][season][episode],
+ value: episodes[show][season][episode], // jshint ignore:line
+ label: 'Episode ' + episodes[show][season][episode], // jshint ignore:line
}));
}
}
@@ -84,7 +84,7 @@ $(document).ready(function() {
select.removeClass('hidden');
select.find('option:gt(0)').remove();
- for(var season in episodes[show]) {
+ for(var season in episodes[show]) { // jshint ignore:line
select.append($('<option>', {
value: season,
label: (season === 0) ? 'Specials' : 'Season ' + season,
@@ -95,7 +95,7 @@ $(document).ready(function() {
// Enable command search
$('#command-search').typeahead({
- source: commands,
+ source: commands, // jshint ignore:line
});
$('#command-search').on('change', function() {
var command = $(this).typeahead('getActive');
diff --git a/gui/slick/js/blackwhite.js b/gui/slick/js/blackwhite.js
index 09ac602ae..39199e8ce 100644
--- a/gui/slick/js/blackwhite.js
+++ b/gui/slick/js/blackwhite.js
@@ -1,4 +1,4 @@
-function generateBlackWhiteList() {
+function generateBlackWhiteList() { // jshint ignore:line
var realvalues = [];
$('#white option').each(function(i, selected) {
@@ -13,7 +13,7 @@ function generateBlackWhiteList() {
$("#blacklist").val(realvalues.join(","));
}
-function updateBlackWhiteList(showName) {
+function updateBlackWhiteList(showName) { // jshint ignore:line
$('#pool').children().remove();
$('#blackwhitelist').show();
@@ -34,23 +34,23 @@ function updateBlackWhiteList(showName) {
}
$('#removeW').click(function() {
- !$('#white option:selected').remove().appendTo('#pool');
+ !$('#white option:selected').remove().appendTo('#pool'); // jshint ignore:line
});
$('#addW').click(function() {
- !$('#pool option:selected').remove().appendTo('#white');
+ !$('#pool option:selected').remove().appendTo('#white'); // jshint ignore:line
});
$('#addB').click(function() {
- !$('#pool option:selected').remove().appendTo('#black');
+ !$('#pool option:selected').remove().appendTo('#black'); // jshint ignore:line
});
$('#removeP').click(function() {
- !$('#pool option:selected').remove();
+ !$('#pool option:selected').remove(); // jshint ignore:line
});
$('#removeB').click(function() {
- !$('#black option:selected').remove().appendTo('#pool');
+ !$('#black option:selected').remove().appendTo('#pool'); // jshint ignore:line
});
$('#addToWhite').click(function() {
diff --git a/gui/slick/js/meta.js b/gui/slick/js/meta.js
index e380c8821..89e1ed36c 100644
--- a/gui/slick/js/meta.js
+++ b/gui/slick/js/meta.js
@@ -1,4 +1,4 @@
-function metaToBool(pyVar){
+function metaToBool(pyVar){ // jshint ignore:line
var meta = $('meta[data-var="' + pyVar + '"]').data('content');
if(meta === undefined){
console.log(pyVar + ' is empty, did you forget to add this to main.mako?');
@@ -9,11 +9,11 @@ function metaToBool(pyVar){
}
}
-function getMeta(pyVar){
+function getMeta(pyVar){ // jshint ignore:line
return $('meta[data-var="' + pyVar + '"]').data('content');
}
-function isMeta(pyVar, result){
+function isMeta(pyVar, result){ // jshint ignore:line
var reg = new RegExp(result.length > 1 ? result.join('|') : result);
return (reg).test($('meta[data-var="' + pyVar + '"]').data('content'));
}
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index 4df4b1500..df8b4cce3 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -101,7 +101,7 @@ $(document).ready(function () {
* Visit http://www.dynamicdrive.com/ for this script and 100s more.
***********************************************/
- var myform = new formtowizard({
+ var myform = new formtowizard({ // jshint ignore:line
formid: 'addShowForm',
revealfx: ['slide', 500],
oninit: function () {
diff --git a/gui/slick/js/qualityChooser.js b/gui/slick/js/qualityChooser.js
index fe2880be8..42827f448 100644
--- a/gui/slick/js/qualityChooser.js
+++ b/gui/slick/js/qualityChooser.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
}
$('#anyQualities option').each(function() {
- var result = preset & $(this).val(); // @TODO Find out what this does
+ var result = preset & $(this).val(); // jshint ignore:line
if (result > 0) {
$(this).attr('selected', 'selected');
} else {
@@ -17,7 +17,7 @@ $(document).ready(function() {
});
$('#bestQualities option').each(function() {
- var result = preset & ($(this).val() << 16); // @TODO Find out what this does
+ var result = preset & ($(this).val() << 16); // jshint ignore:line
if (result > 0) {
$(this).attr('selected', 'selected');
} else {
diff --git a/gui/slick/js/restart.js b/gui/slick/js/restart.js
index 645e5019f..9c7ec6f07 100644
--- a/gui/slick/js/restart.js
+++ b/gui/slick/js/restart.js
@@ -38,7 +38,7 @@ $(document).ready(function() {
$('#restart_loading').hide();
$('#restart_success').show();
$('#refresh_message').show();
- setTimeout(function(){window.location = srRoot + '/' + sbDefaultPage + '/';}, 5000);
+ setTimeout(function(){window.location = srRoot + '/' + sbDefaultPage + '/';}, 5000); // jshint ignore:line
}
}
@@ -52,13 +52,13 @@ $(document).ready(function() {
function ajaxError(x) {
if (console_debug) { // jshint ignore:line
if (x.status === 0) {
- console.log(console_prefix + 'isAlive: Sickrage is not responding.');
+ console.log(console_prefix + 'isAlive: Sickrage is not responding.'); // jshint ignore:line
} else if (x.status === 404) {
- console.log(console_prefix + 'isAlive: Requested URL not found.');
+ console.log(console_prefix + 'isAlive: Requested URL not found.'); // jshint ignore:line
} else if (x.status === 500) {
- console.log(console_prefix + 'isAlive: Internel Server Error.');
+ console.log(console_prefix + 'isAlive: Internel Server Error.'); // jshint ignore:line
} else {
- console.log(console_prefix + 'isAlive: Unknow Error.\n' + x.responseText);
+ console.log(console_prefix + 'isAlive: Unknow Error.\n' + x.responseText); // jshint ignore:line
}
}
}
--
GitLab