Merge pull request #268 from hasgeek/payrange-slider

fix for #265
hasgeek · Apr 22, 2016 · a882d2f · a882d2f
2 parents 25fb58f + 089ff6a
commit a882d2f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/hasjob/static/css/app.css b/hasjob/static/css/app.css
@@ -266,7 +266,7 @@ header #hgnav .fa {
     width: 20em;
   }
   header #hgnav .header-section .pay-filter-dropdown {
-    width: 135%;
+    width: 190%;
     left: 0;
     right: auto;
   }

diff --git a/hasjob/static/js/app.js b/hasjob/static/js/app.js
@@ -548,18 +548,33 @@ window.Hasjob.PaySlider.toNumeric = function(str){
   return str.slice(1).replace(/,/g, '');
 };
 
+window.Hasjob.PaySlider.range = function(currency){
+  if(currency === '$') {
+    return {
+      'min': [0, 5000],
+      '2%': [200000, 50000],
+      '10%': [1000000, 100000],
+      'max': [10000000, 100000]
+    }
+  }
+  else {
+    return {
+      'min': [0, 50000],
+      '10%':  [1000000, 100000],
+      'max': [10000000, 100000]
+    }
+  }
+};
+
 window.Hasjob.PaySlider.prototype.init = function(){
   this.slider = $(this.selector).noUiSlider({
     start: [this.start, this.end],
-    step: 1,
     connect: true,
     behaviour: "tap",
     range: {
-      'min': [0, 5000],
-      '5%':  [100000, 10000],
-      '80%': [1000000, 50000],
-      '90%': [2000000, 100000],
-      'max': [10000000, 1000000],
+      'min': [0, 50000],
+      '10%':  [1000000, 100000],
+      'max': [10000000, 100000]
     },
     format: window.wNumb({
       decimals: 0,
@@ -578,6 +593,7 @@ window.Hasjob.PaySlider.prototype.resetSlider = function(currency) {
 
   this.slider.noUiSlider({
     start: [start, end],
+    range: Hasjob.PaySlider.range(window.Hasjob.Currency.prefix(currency)),
     format: Hasjob.Currency.wNumbFormat(currency)
   }, true);
 

diff --git a/hasjob/static/sass/_header.sass b/hasjob/static/sass/_header.sass
@@ -235,11 +235,12 @@ header
         padding: 10px 0 5px
         min-height: 0
 
+
         ul.multiselect-container
           width: 20em
 
         .pay-filter-dropdown
-          width: 135%
+          width: 190%
           left: 0
           right: auto