Merge remote-tracking branch 'upstream/master'

personality-insights · Jul 13, 2016 · c34e1e3 · c34e1e3
2 parents 8d26a9f + d4cfc1d
commit c34e1e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/public/js/components/App.js b/public/js/components/App.js
@@ -26,7 +26,7 @@
  * @return {Object} exposed functions that interact with application state logic
  *
  */
-function App(documentTones, sentences, thresholds, selectedSample) {
+function App(documentTones, sentences, thresholds, selectedSample) { // eslint-disable-line no-unused-vars
   var _selectedFilter = 'Anger',
     _selectedTone = 'Emotion Tone',
     _selectedSample = selectedSample || 'customer-call',
@@ -131,8 +131,8 @@ function App(documentTones, sentences, thresholds, selectedSample) {
       category_name: 'Social Tone'
     }],      SCORE_DECIMAL_PLACE = 2,
     PERCENTAGE_DECIMAL_PLACE = 1,
-    SOCIAL_TONE_MIN_RANGE = -1,
-    SOCIAL_TONE_MAX_RANGE = 1,
+    SOCIAL_TONE_MIN_RANGE = -1, // eslint-disable-line no-unused-vars
+    SOCIAL_TONE_MAX_RANGE = 1,  // eslint-disable-line no-unused-vars
     output = {};
 
   /**

diff --git a/public/js/components/helpers.js b/public/js/components/helpers.js
@@ -77,7 +77,7 @@ function move(arr, oldIndex, newIndex) {
   if (internalNewIndex >= internalArray.length) {
     var k = internalNewIndex - internalArray.length;
     while ((k--) + 1) {
-      internalArray.push(undefined);
+      internalArray.push(undefined); // eslint-disable-line no-undefined
     }
   }
   internalArray.splice(internalNewIndex, 0, internalArray.splice(internalOldIndex, 1)[0]);

diff --git a/public/js/demo.js b/public/js/demo.js
@@ -86,13 +86,13 @@ function allReady(thresholds, sampleText) {
     $sentenceRankTable = $('.sentence-rank--table'),
     $sentenceJson = $('.json .json--code'),
     $outputResetButton = $('.output--reset-button'),
-    barGraph_template = barGraphTemplate.innerHTML,
-    emotionBarGraph_template = emotionBarGraphTemplate.innerHTML,
-    filters_template = filtersTemplate.innerHTML,
-    originalText_template = originalTextTemplate.innerHTML,
-    sentenceRank_template = sentenceRankTemplate.innerHTML,
-    originalTextTooltip_template = originalTextTooltipTemplate.innerHTML,
-    originalTextLegend_template = originalTextLegendTemplate.innerHTML,
+    barGraph_template = barGraphTemplate.innerHTML, // eslint-disable-line camelcase
+    emotionBarGraph_template = emotionBarGraphTemplate.innerHTML, // eslint-disable-line camelcase
+    filters_template = filtersTemplate.innerHTML, // eslint-disable-line camelcase
+    originalText_template = originalTextTemplate.innerHTML, // eslint-disable-line camelcase
+    sentenceRank_template = sentenceRankTemplate.innerHTML, // eslint-disable-line camelcase
+    originalTextTooltip_template = originalTextTooltipTemplate.innerHTML, // eslint-disable-line camelcase
+    originalTextLegend_template = originalTextLegendTemplate.innerHTML, // eslint-disable-line camelcase
     lastSentenceID = 0;
 
   /**