Merge remote-tracking branch 'origin/master'

Yarik
2 parents 031cdeed 5a24921e
Showing 3 changed files with 38 additions and 1 deletions Show diff stats
frontend/views/category/view.php
frontend/web/css/style.css
frontend/web/js/script.js
@@ -185,6 +185,9 @@ _________________________________________________________ --&gt;
                             <input type="text" name="price-max" id="price-max">
                         </div>
                     </div>
+                    <div class="col-md-12 row">
+                        <button class="price-apply">применить</button>
+                    </div>
                 </div>
             </div>
@@ -4884,4 +4884,16 @@ a i.fa, button i.fa, span.fa {
 .irs-from, .irs-to, .irs-single {display: none;}
 .lt-ie9 .irs-from, .lt-ie9 .irs-to, .lt-ie9 .irs-single {background: #999;}
-/* Range Slider Styles End */
 \ No newline at end of file
+/* Range Slider Styles End */
+
+button.price-apply{
+    background-color: #428bca;
+    border: none;
+    padding: 8px 20px;
+    border-radius: 5px;
+    color: #fff;
+}
+
+button.price-apply:hover{
+    background-color:#005bac;
+}
 \ No newline at end of file
@@ -280,6 +280,10 @@ $(document).ready(function ($) {
 });
 $(function(){
+    $('.price-inputs input').keypress(function(key) {
+        if(key.charCode < 48 || key.charCode > 57) return false;
+    });
+
     var pricemin = $(".price_slider input").data("pricemin");
         pricemax = $(".price_slider input").data("pricemax");
     $(".price-inputs #price-min").val(pricemin);
@@ -301,10 +305,28 @@ $(function(){
     $(document).on('change','.price-inputs #price-min',function(){
         var newmin = $(this).val();
+            currentmax = $(".price-inputs #price-max").val();
+            if(newmin > currentmax){
+                newmin = currentmax;
+                $('.price-inputs #price-min').val(currentmax);
+            }
+            else if(newmin > pricemax){
+                newmin = pricemax;
+                $('.price-inputs #price-min').val(pricemax);
+            }
         slider.update({from: newmin});
     });
     $(document).on('change','.price-inputs #price-max',function(){
         var newmax = $(this).val();
+            currentmin = $(".price-inputs #price-min").val();
+        if(newmax < currentmin){
+            newmax = currentmin;
+            $('.price-inputs #price-max').val(currentmin);
+        }
+        else if(newmax > pricemax){
+            newmax = pricemax;
+            $('.price-inputs #price-max').val(pricemax);
+        }
         slider.update({to: newmax});
     });
 });