Merge pull request #258 from zhx828/bug-fix

 Change underscore to lodash & Bug fixes

Author: zhx828

app/index.html

@@ -245,6 +245,7 @@
 <script src="bower_components/angular-swagger-ui/dist/scripts/swagger-ui.min.js"></script>
 <script src="bower_components/marked/lib/marked.js"></script>
 <script src="bower_components/Blob/Blob.js"></script>
+<script src="bower_components/lodash/lodash.js"></script>
 <!-- endbower -->
 <!-- endbuild -->
 

app/lib/mutation-mapper/mutationMapper.js

@@ -69,7 +69,7 @@ var DataTableUtil = (function()
 	{
 		var map = {};
 
-		_.each(_.pairs(columns), function(pair, index)
+		_.each(_.toPairs(columns), function(pair, index)
 		{
 			var name = pair[0];
 			var options = pair[1];
@@ -227,7 +227,7 @@ var DataTableUtil = (function()
 	{
 		var columnRenderers = [];
 
-		_.each(_.pairs(renderers), function(pair) {
+		_.each(_.toPairs(renderers), function(pair) {
 			var columnName = pair[0];
 			var renderFn = pair[1];
 
@@ -270,7 +270,7 @@ var DataTableUtil = (function()
 
 		// iterate over list of renderers
 		// (assuming each column has its corresponding renderer)
-		_.each(_.pairs(columnRender), function(pair) {
+		_.each(_.toPairs(columnRender), function(pair) {
 			var columnName = pair[0];
 			var renderFn = pair[1];
 			var sortFn = columnSort[columnName];
@@ -336,7 +336,7 @@ var DataTableUtil = (function()
 
 		// now process columnData ("mData") functions
 		// (this will override prev definition, if any)
-		_.each(_.pairs(columnData), function(pair) {
+		_.each(_.toPairs(columnData), function(pair) {
 			var columnName = pair[0];
 			var mDataFn = pair[1];
 			var columnIdx = indexMap[columnName];
@@ -367,7 +367,7 @@ var DataTableUtil = (function()
 		var columnOpts = [];
 
 		// set column options
-		_.each(_.pairs(columns), function(pair) {
+		_.each(_.toPairs(columns), function(pair) {
 			var name = pair[0];
 			var column = pair[1];
 
@@ -4281,7 +4281,7 @@ var MutationDetailsUtil = function(mutations)
 				var value = mutations[i].get(dataField);
 
 				if (value &&
-				    !_.contains(excludeList, value))
+				    !_.includes(excludeList, value))
 				{
 					if (valueCountMap[value] === undefined)
 					{
@@ -4293,7 +4293,7 @@ var MutationDetailsUtil = function(mutations)
 			}
 		}
 
-		var pairs = _.pairs(valueCountMap);
+		var pairs = _.toPairs(valueCountMap);
 
 		pairs.sort(function(a, b) {
 			return (b[1] - a[1]);
@@ -5769,7 +5769,7 @@ function RequestQueue(options)
 	{
 		// get the first element from the queue
 		var element = _.first(_queryQueue);
-		_queryQueue = _.rest(_queryQueue);
+		_queryQueue = _.drop(_queryQueue);
 
 		// still elements in queue
 		if (element)
@@ -6264,7 +6264,7 @@ var VepParser = (function()
 		{
 			hgvspShort = hgvsp.substr(hgvsp.indexOf(":")+1);
 
-			_.each(_.pairs(_aa3to1), function(pair, idx) {
+			_.each(_.toPairs(_aa3to1), function(pair, idx) {
 				hgvspShort = hgvspShort.replace(new RegExp(pair[0], 'g'), pair[1]);
 			});
 
@@ -13338,7 +13338,7 @@ function AdvancedDataTable(options)
 	 */
 	self._addSortFunctions = function()
 	{
-		_.each(_.pairs(self._options.customSort), function(pair) {
+		_.each(_.toPairs(self._options.customSort), function(pair) {
 			var fnName = pair[0];
 			var sortFn = pair[1];
 

app/scripts/app.js

@@ -119,6 +119,7 @@ angular
         if(!onLocalhost) {
             $provide.decorator('$exceptionHandler', function() {
                 return function(exception) {
+                    console.log(exception);
                     Sentry.captureException(exception);
                 };
             });

app/scripts/controllers/gene.js

@@ -303,7 +303,7 @@ angular.module('oncokbStaticApp')
                         studyCountMapping[item.cancerStudy].push(item.sampleId);
                     }
                 });
-                var countsByGene = _.map(_.pairs(studyCountMapping), function(item) {
+                var countsByGene = _.map(_.toPairs(studyCountMapping), function(item) {
                     return [item[0], _.uniq(item[1]).length];
                 });
 
@@ -480,7 +480,7 @@ angular.module('oncokbStaticApp')
                     });
 
                     mutationMapperConstructor(newMutationData, true);
-                    colors.fill('#1c75cd');
+                    _.fill(colors, '#1c75cd');
                     colors[tempIndex] = '#064885';
                     for (var i = 0; i < shortNames.length; i++) {
                         boldedNames[i] = shortNames[i];
@@ -491,7 +491,7 @@ angular.module('oncokbStaticApp')
 
                     $('.mutation-details-filter-reset').click(function() {
                         // show all of the data again
-                        colors.fill('#1c75cd');
+                        _.fill(colors, '#1c75cd');
                         singleStudyFlag = false;
                         for (var i = 0; i < shortNames.length; i++) {
                             boldedNames[i] = shortNames[i];

bower.json

@@ -24,11 +24,11 @@
     "plotlyjs": "plotly#~1.4.1",
     "qtip2": "^2.2.1",
     "string": "^3.3.1",
-    "underscore": "^1.8.3",
     "jquery": "^2.0.x",
     "angular-swagger-ui": "0.3.3",
     "marked": "^0.3.6",
-    "Blob": "*"
+    "Blob": "*",
+    "lodash": "^4.17.11"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.9"