Move from highcharts-browserify to highcharts, upgrade eslint, lint f…

…iles

.eslintrc.yml

@@ -88,6 +88,7 @@ rules:
     func-style: [2, "expression"]
     indent: [1, 4]
     key-spacing: [1, {"beforeColon": false, "afterColon": true}]
+    keyword-spacing: [1, {"before": true, "after": true}]
     linebreak-style: 2
     max-len: [1, 120]
     new-cap: [2, {"capIsNewExceptions": ["HmacSHA256"]}]
@@ -103,7 +104,6 @@ rules:
     padded-blocks: [1, "never"]
     quotes: [1, "single"]
     semi: [2, "always"]
-    space-after-keywords: [1, "always"]
     space-before-blocks: [1, "always"]
     space-before-function-paren: [1, "never"]
     spaced-comment: [1, "always"]

js/directory.js

@@ -1,16 +1,9 @@
 /* eslint strict:0 */
 
-jQuery(function() {
+$(function() {
     'use strict';
 
-    var checkForDataTables = function() {
-        if (typeof($().DataTable) === 'undefined') {
-            setTimeout(checkForDataTables, 100);
-        } else {
-            init();
-        }
-    },
-    init = function() {
+    var init = function() {
         $.getJSON('/points/ajax/getDirectory.php', function(data) {
             var i;
             var path = 'http://slivka.northwestern.edu/points/img/slivkans/';
@@ -54,7 +47,15 @@ jQuery(function() {
                 $('#submitdirectorypass').click();
             }
         });
-    }
+    };
+
+    var checkForDataTables = function() {
+        if (typeof($().DataTable) === 'undefined') {
+            setTimeout(checkForDataTables, 100);
+        } else {
+            init();
+        }
+    };
 
     $.getScript('/points/node_modules/datatables/media/js/jquery.dataTables.min.js', checkForDataTables);
 });

js/points-center/admin.js

@@ -5,7 +5,7 @@ var _ = {
     forEach: require('lodash/forEach')
 };
 var utils = require('./utils');
-var slivkans, nicknames;
+var slivkans;
 var submitConfigOrQuarterInfo = function(name, value, confirmMessage) {
     if (window.confirm(confirmMessage)) {
         $.post(utils.ajaxRoot + '/ajax/submitConfigOrQuarterInfo.php', { name: name, value: value }, function(status) {

js/points-center/breakdown.js

@@ -4,7 +4,7 @@ var _ = {
     forEach: require('lodash/forEach'),
     template: require('lodash/template')
 };
-var highcharts = require('highcharts-browserify');
+var highcharts = require('highcharts');
 var ajaxRoot = require('./utils').ajaxRoot;
 var slivkans, qtrs;
 var eventsTemplate = _.template($('#eventsTemplate').html(), { imports: { forEach: _.forEach } });
@@ -19,8 +19,9 @@ var $eventsChart = $('#eventsChart');
 var $imsChart = $('#imsChart');
 
 var drawChart = function($el, tableData, titleIn, width) {
-    $el.highcharts({
+    highcharts.chart({
         chart: {
+            renderTo: $el[0],
             width: width
         },
         credits: {

js/points-center/committee-headquarters.js

@@ -172,7 +172,7 @@ module.exports = {
 
             if (newVal < -3) {
                 ptsInput.val(-3);
-            }else if (newVal > 3) {
+            } else if (newVal > 3) {
                 ptsInput.val(3);
             } else {
                 ptsInput.val(newVal);

js/points-center/correction.js

@@ -1,18 +1,7 @@
 'use strict';
 
-var _ = {
-    findIndex: require('lodash/findIndex')
-};
-var typeahead = require('typeahead.js');
 var utils = require('./utils');
 var slivkans;
-var resetForm = function() {
-    $('#filled-by').val('');
-    $('.filled-by-control').removeClass('has-success has-error');
-    $('#event-name').val('Select One');
-    $('#comments').val('');
-    $('#submit-error').fadeOut();
-};
 
 var validateFilledBy = function() {
     return utils.updateValidity($('.filled-by-control'), utils.findSlivkan(slivkans, $('#filled-by').val()));

js/points-center/index.js

@@ -3,6 +3,7 @@
 window.$ = window.jQuery = require('jquery');
 require('bootstrap-sass/assets/javascripts/bootstrap');
 require('bootstrap-multiselect/dist/js/bootstrap-multiselect');
+require('typeahead.js');
 
 $(function() {
     var nprogress = require('nprogress');

js/points-center/rankings.js

@@ -12,6 +12,7 @@ var qtrToQuarter = function(qtr) {
     case 2:
         return 'Spring 20' + yr;
     case 3:
+    default:
         return 'Fall 20' + yr;
     }
 };

js/points-center/submission.js

@@ -633,7 +633,7 @@ module.exports = {
         $(window).on('keydown', function(event) {
             if (event.keyCode === 13) { // prevent [Enter] from causing form submit
                 event.preventDefault();
-                return false;
+                event.stopPropogation();
             }
         });
 

js/points-center/table.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var datatables = require('datatables');
-var utils = require('./utils');
 var i, table, events;
 
 var columnFilter = function() {
@@ -31,6 +29,8 @@ var columnFilter = function() {
     table.draw();
 };
 
+require('datatables'); // used for its side-effects
+
 module.exports = {
     init: function() {
         var eventName, name, date;

js/points-center/utils.js

@@ -6,19 +6,6 @@ var _ = {
 };
 var Bloodhound = require('typeahead.js/dist/bloodhound');
 
-// Track TAB_PRESSED for destroyTypeahead
-var TAB_PRESSED = false;
-
-$(window).on('keydown',	function(event) {
-    if (event.keyCode === 9 && !event.shiftKey) {
-        TAB_PRESSED = true;
-    }
-}).on('keyup', function(event) {
-    if (event.keyCode === 9) {
-        TAB_PRESSED = false;
-    }
-});
-
 module.exports.ajaxRoot = '/points';
 
 module.exports.appendSlivkanInputs = function(n) {

package.json

@@ -1,14 +1,15 @@
 {
   "name": "points-center",
   "version": "0.1.0",
+  "private": true,
   "description": "Slivka Points Center",
   "main": "js/points-center/index.js",
   "dependencies": {
     "bootstrap-multiselect": "0.9.13",
     "bootstrap-sass": "^3.3.5",
     "datatables": "1.10.9",
     "font-awesome": "4.5.0",
-    "highcharts-browserify": "0.1.5",
+    "highcharts": "^4.2.3",
     "jquery": "1.11.1",
     "lodash": "4.5.1",
     "moment": "2.11.2",