Adding some additional eslint flags, and adding base 10 to all parseFloat calls

Author: jonoomph

src/timeline/js/controllers.js

@@ -742,7 +742,7 @@ App.controller("TimelineCtrl", function ($scope) {
     y += scrolling_tracks.scrollTop();
 
     // Return number of track
-    return parseInt($scope.GetTrackAtY(y - scrolling_tracks_offset_top).number);
+    return parseInt($scope.GetTrackAtY(y - scrolling_tracks_offset_top).number, 10);
   };
 
   // Get JSON of most recent item (used by Qt)
@@ -1363,7 +1363,7 @@ App.controller("TimelineCtrl", function ($scope) {
   $scope.addClips = function (numClips) {
     var startNum = $scope.project.clips.length + 1;
     var positionNum = 0;
-    for (var x = 0; x < parseInt(numClips); x++) {
+    for (var x = 0; x < parseInt(numClips, 10); x++) {
       $scope.project.clips.push({
         id: x.toString(),
         layer: 0,
@@ -1407,7 +1407,7 @@ App.controller("TimelineCtrl", function ($scope) {
   // Debug method to add a marker to the $scope
   $scope.addMarker = function (markLoc) {
     $scope.project.markers.push({
-      position: parseInt(markLoc),
+      position: parseInt(markLoc, 10),
       icon: "blue.png"
     });
     $scope.markLoc = "";

src/timeline/js/directives/clip.js

@@ -41,7 +41,7 @@ var track_container_height = -1;
 // 3: class change when hovered over
 var dragLoc = null;
 
-/*global App, timeline*/
+/*global App, timeline, moveBoundingBox*/
 App.directive("tlClip", function ($timeout) {
   return {
     scope: "@",
@@ -72,8 +72,8 @@ App.directive("tlClip", function ($timeout) {
 
           // Does this bounding box overlap a locked track?
           var vert_scroll_offset = $("#scrolling_tracks").scrollTop();
-          var track_top = (parseInt(element.position().top) + parseInt(vert_scroll_offset));
-          var track_bottom = (parseInt(element.position().top) + parseInt(element.height()) + parseInt(vert_scroll_offset));
+          var track_top = (parseInt(element.position().top, 10) + parseInt(vert_scroll_offset, 10));
+          var track_bottom = (parseInt(element.position().top, 10) + parseInt(element.height(), 10) + parseInt(vert_scroll_offset, 10));
           if (hasLockedTrack(scope, track_top, track_bottom)) {
             resize_disabled = true;
           }

src/timeline/js/directives/playhead.js

@@ -38,7 +38,7 @@ App.directive("tlPlayhead", function () {
       playhead_y_max = element.position().top;
 
       // get the size of the playhead and line so we can determine the offset
-      var playhead_top_w = parseInt($(".playhead-top").css("width"));
+      var playhead_top_w = parseInt($(".playhead-top").css("width"), 10);
       scope.playheadOffset = 0.0 - (playhead_top_w / 2.0);
 
       // Move playhead to new position (if it's not currently being animated)

src/timeline/js/directives/ruler.js

@@ -38,7 +38,7 @@ var scroll_left_pixels = 0;
 
 // This container allows for tracks to be scrolled (with synced ruler)
 // and allows for panning of the timeline with the middle mouse button
-/*global App*/
+/*global App, secondsToTime*/
 App.directive("tlScrollableTracks", function () {
   return {
     restrict: "A",

src/timeline/js/directives/track.js

@@ -29,7 +29,7 @@
 
 // Treats element as a track
 // 1: allows clips, transitions, and effects to be dropped
-/*global App, timeline*/
+/*global App, timeline, findTrackAtLocation*/
 App.directive("tlTrack", function ($timeout) {
   return {
     // A = attribute, E = Element, C = Class and M = HTML Comment
@@ -118,7 +118,7 @@ App.directive("tlTrack", function ($timeout) {
             }
 
             // get track the item was dropped on
-            var drop_track_num = findTrackAtLocation(scope, parseInt(item_middle));
+            var drop_track_num = findTrackAtLocation(scope, parseInt(item_middle, 10));
 
             // if the droptrack was found, update the json
             if (drop_track_num != -1) {

src/timeline/js/directives/transition.js

@@ -41,7 +41,7 @@ var track_container_height = -1;
 // 3: class change when hovered over
 var dragLoc = null;
 
-/*global App, timeline*/
+/*global App, timeline, hasLockedTrack, moveBoundingBox*/
 App.directive("tlTransition", function () {
   return {
     scope: "@",
@@ -66,14 +66,14 @@ App.directive("tlTransition", function () {
 
           // Does this bounding box overlap a locked track?
           var vert_scroll_offset = $("#scrolling_tracks").scrollTop();
-          var track_top = (parseInt(element.position().top) + parseInt(vert_scroll_offset));
-          var track_bottom = (parseInt(element.position().top) + parseInt(element.height()) + parseInt(vert_scroll_offset));
+          var track_top = (parseInt(element.position().top, 10) + parseInt(vert_scroll_offset, 10));
+          var track_bottom = (parseInt(element.position().top, 10) + parseInt(element.height(), 10) + parseInt(vert_scroll_offset, 10));
           if (hasLockedTrack(scope, track_top, track_bottom)) {
             resize_disabled = true;
           }
 
           // Hide keyframe points
-          element.find(".point_icon").hide()
+          element.find(".point_icon").hide();
 
         },
         stop: function (e, ui) {
@@ -263,7 +263,7 @@ App.directive("tlTransition", function () {
         drag: function (e, ui) {
           var previous_x = ui.originalPosition.left;
           var previous_y = ui.originalPosition.top;
-          if (previous_drag_position != null) {
+          if (previous_drag_position !== null) {
             // if available, override with previous drag position
             previous_x = previous_drag_position.left;
             previous_y = previous_drag_position.top;

src/timeline/js/functions.js

@@ -30,9 +30,11 @@
 // Find a JSON element / object with a particular value in the json data
 function findElement(arr, propName, propValue) {
   // Loop through array looking for a matching element
-  for (var i = 0; i < arr.length; i++)
-    if (arr[i][propName] === propValue)
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i][propName] === propValue) {
       return arr[i];
+    }
+  }
 
 }
 
@@ -41,9 +43,11 @@ function getTrackContainerHeight() {
 
   var track_margin = 0;
   var track_object = $(".track");
-  if (track_object.length)
-    if (track_object.css("margin-bottom"))
-      track_margin = parseInt(track_object.css("margin-bottom").replace("px", ""));
+  if (track_object.length) {
+    if (track_object.css("margin-bottom")) {
+      track_margin = parseInt(track_object.css("margin-bottom").replace("px", ""), 10);
+    }
+  }
 
   return $("#track-container").height() - track_margin;
 }
@@ -173,12 +177,13 @@ function findTrackAtLocation(scope, top) {
     var layer = scope.project.layers[layer_index];
 
     // Compare position of track to Y param (of unlocked tracks)
-    if (!layer.lock)
+    if (!layer.lock) {
       if ((top < layer.y && top > track_position) || track_position === 0) {
         // return first matching layer
         track_position = layer.y;
         track_number = layer.number;
       }
+    }
   }
 
   return track_number;
@@ -223,16 +228,16 @@ function setBoundingBox(scope, item) {
     bounding_box.width = item.width();
   } else {
     //compare and change if item is a better fit for bounding box edges
-    if (item_top < bounding_box.top) bounding_box.top = item_top;
-    if (item_left < bounding_box.left) bounding_box.left = item_left;
-    if (item_bottom > bounding_box.bottom) bounding_box.bottom = item_bottom;
-    if (item_right > bounding_box.right) bounding_box.right = item_right;
+    if (item_top < bounding_box.top) { bounding_box.top = item_top };
+    if (item_left < bounding_box.left) { bounding_box.left = item_left };
+    if (item_bottom > bounding_box.bottom) { bounding_box.bottom = item_bottom };
+    if (item_right > bounding_box.right) { bounding_box.right = item_right };
 
     // compare height and width of bounding box (take the largest number)
     var height = bounding_box.bottom - bounding_box.top;
     var width = bounding_box.right - bounding_box.left;
-    if (height > bounding_box.height) bounding_box.height = height;
-    if (width > bounding_box.width) bounding_box.width = width;
+    if (height > bounding_box.height) { bounding_box.height = height };
+    if (width > bounding_box.width) { bounding_box.width = width };
   }
 
   // Get list of current selected ids (so we can ignore their snapping x coordinates)