wait #5642 @0.75

diff --git a/Michelin/Michelin.zip b/Michelin/Michelin.zip
index 1ca800b8d642dce3cb120840aae76f23a43cde1b..20076b2b758afe6aed523391cef6a3c6fa0a2256 100644 (file)
Binary files a/Michelin/Michelin.zip and b/Michelin/Michelin.zip differ

diff --git a/Michelin/index.html b/Michelin/index.html
index 6b8bfa3ad77fa1869f904cf5e575225e383e6579..72ea05b6bd04919714f685a009969f130f153e8b 100644 (file)
--- a/Michelin/index.html
+++ b/Michelin/index.html
@@ -40,7 +40,7 @@
         <form></form>
         <div id="noresult" data-l10n="No product found"></div>
         <div id="results"></div>
-        <a href="#" id="back" data-l10n="New search"></a>
+        <a href="#" id="reset" data-l10n="New search"></a>
     </main>
 </div>
 <div id="preload">

diff --git a/Michelin/script.js b/Michelin/script.js
index dfa5e4284ae2155e24367667b19d85ab58f34f72..5e4cb231dba4f77004e3af8eaa9c0467759acda8 100644 (file)
--- a/Michelin/script.js
+++ b/Michelin/script.js
@@ -27,23 +27,15 @@ $(function () {
         window.parent.location.hash = "#/page/" + $(this).data('page');
     });
 
-    let existingSearch = getExistingSearch();
-    $.each(existingSearch, function (k, v) {
-        $('[name=' + k).each(function () {
-            if ($(this).is('select')) {
-                $(this).val(v);
-            } else if ($(this).is('input[type=radio]')) {
-                $(this).prop('checked', $(this).attr('value') == v);
-            }
-        });
-    });
+    updateForm(getExistingSearch());
 
     $(document).on('change', 'select,input', function () {
         updateForm();
     });
 
-    $('#back').on('click', function () {
+    $('#reset').on('click', function () {
         $('select[name="universe"]').val('');
+        saveExistingSearch({});
         updateForm();
         return false;
     });
@@ -52,15 +44,20 @@ $(function () {
         $("#holder").css('min-height', $(window).outerHeight() - 60);
     });
 
-
     updateForm();
-
 });
 
 function getExistingSearch() {
     return parent.fluidbook.cache.get('find_tyre', {});
 }
 
+function saveExistingSearch(data) {
+    if (data === undefined) {
+        data = $('form').serializeObject();
+    }
+    return parent.fluidbook.cache.set('find_tyre', data);
+}
+
 function valueExists(array, value) {
     var found = false;
     $.each(array, function (k, v) {
@@ -72,9 +69,13 @@ function valueExists(array, value) {
     return found;
 }
 
-function updateForm() {
+function updateForm(data) {
     STEP = 1;
-    FORMDATA = $('form').serializeObject();
+    if (data === undefined) {
+        FORMDATA = $('form').serializeObject();
+    } else {
+        FORMDATA = data;
+    }
     $('header').find('.tyre,.set').hide();
     $('#noresult').hide();
     $("#results").hide();
@@ -150,6 +151,7 @@ function isDefined(v) {
 function noResult() {
     $('form').hide();
     $('#noresult').show();
+    saveExistingSearch({});
 }
 
 function getValuesOfProductList(list, key, sort) {
@@ -241,9 +243,9 @@ function updateSteps() {
     $('header li:visible:eq(' + (STEP - 2) + ')').addClass('previous');
     $('form .field:last').show();
     if (STEP > 1) {
-        $("#back").show();
+        $("#reset").show();
     } else {
-        $("#back").hide();
+        $("#reset").hide();
     }
 }
 
@@ -252,7 +254,7 @@ function createSelect(name, options, placeholder) {
         placeholder = getTranslation('Select...');
     }
     let value = FORMDATA[name];
-    var s = $('<select name="' + name + '"><option>' + placeholder + '</option></select>');
+    var s = $('<select name="' + name + '"><option value="">' + placeholder + '</option></select>');
     $.each(options, function (k, v) {
         s.append('<option value="' + v.key + '"' + (v.key == value ? ' selected' : '') + '>' + v.value + '</option>');
     });
@@ -275,6 +277,7 @@ function createResults(options) {
     $("#results").html('');
     $("#results").show();
     $("#results").append(list);
+    saveExistingSearch();
 }
 
 function createSetList(name, options, placeholder) {

diff --git a/Michelin/style.css b/Michelin/style.css
index 024a231674b93c14e1ead090e5026ce0f54fe7bc..991e0048820eb628a8c0e37a5637b6d258a89d49 100644 (file)
--- a/Michelin/style.css
+++ b/Michelin/style.css
@@ -189,7 +189,7 @@ header ul li.active.last::after {
   position: relative;
   padding-bottom: 20px;
 }
-#back {
+#reset {
   cursor: pointer;
   color: #fff;
   text-decoration: none;
@@ -197,7 +197,7 @@ header ul li.active.last::after {
   left: 20px;
   bottom: 20px;
 }
-#back:before {
+#reset:before {
   content: '';
   display: inline-block;
   width: 10px;
@@ -206,6 +206,7 @@ header ul li.active.last::after {
   margin-right: 20px;
   position: relative;
   top: 1px;
+  transform: rotate(180deg);
 }
 .list-item {
   list-style: none;

diff --git a/Michelin/style.css.map b/Michelin/style.css.map
index b3db01a03b6e2b32dee97be4f0a1990a33fb6c4e..8804241c7044ed266b6ca32cafb092b2dc0f594b 100644 (file)
--- a/Michelin/style.css.map
+++ b/Michelin/style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style.less"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file
+{"version":3,"sources":["style.less"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file

diff --git a/Michelin/style.less b/Michelin/style.less
index 64021c2d2e380e60567eb7fbd95009eda0fca565..9bcc38987f58f4ce2891a85427dc398edd3cd1f6 100644 (file)
--- a/Michelin/style.less
+++ b/Michelin/style.less
@@ -180,7 +180,7 @@ header {
 }
 
 
-#back {
+#reset {
        cursor: pointer;
        color: #fff;
        text-decoration: none;
@@ -196,7 +196,8 @@ header {
                background-image: url("images/back.svg");
                margin-right: 20px;
                position: relative;
-               top: 1px
+               top: 1px;
+               transform: rotate(180deg);
        }
 }