Merge branch 'SAndreeva/calendar-views-poc' of https://github.com/Ign…

…iteUI/igniteui-angular into SAndreeva/calendar-views-poc
IgniteUI · Feb 13, 2019 · 893e59d · 893e59d
2 parents 40d65ba + 5ee9c87
commit 893e59d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/extras/docs/themes/sassdoc/assets/js/versioning/tag-versions.req.js b/extras/docs/themes/sassdoc/assets/js/versioning/tag-versions.req.js
@@ -1,5 +1,5 @@
 (function () {
-    const baseUrl = $('body').data('base-url');
+    let baseUrl = $('body').data('base-url');
     const versionsJson = $('body').data('api-versions-json');
 
     $.ajax({
@@ -12,25 +12,27 @@
     }).done(function (data) {
         let folders = data.folders;
         const select = $('#versions');
+
         folders = folders.reverse();
 
+        baseUrl += "/products/ignite-ui-angular/docs/";
         folders.forEach(function (f) {
             select.append($('<option>', {
-                value: baseUrl + "/products/ignite-ui-angular/docs/" + f + "/sass",
+                value: baseUrl + f + "/sass",
                 text: f
             }));
         });
 
-        select.val(baseUrl + "/products/ignite-ui-angular/docs/" + folders[0] + "/sass");
-
-        if (sessionStorage.sassOption) {
-            select.val(sessionStorage.sassOption);
+        const version = folders.filter(function(v){ return window.location.href.indexOf(v) >= 0; })[0];
+        if (version) {
+            select.val(baseUrl + version + "/sass");
+        } else {
+            select.val(baseUrl + folders[0] + "/sass");
         }
     });
 
     $('#versions').on('change', function () {
         const val = $('#versions').val();
-        sessionStorage.sassOption = val;
         window.location.assign(val);
     });
 })();
diff --git a/extras/docs/themes/typedoc/src/assets/js/src/versioning/tag-versions.req.js b/extras/docs/themes/typedoc/src/assets/js/src/versioning/tag-versions.req.js
@@ -1,5 +1,5 @@
 (function () {
-    const baseUrl = $('body').data('base-url');
+    let baseUrl = $('body').data('base-url');
     const versionsJson = $('body').data('api-versions-json');
 
     $.ajax({
@@ -11,26 +11,28 @@
         }
     }).done(function (data) {
         let folders = data.folders;
-        const select = $('#versions')
+        const select = $('#versions');
+
         folders = folders.reverse();
 
+        baseUrl += "/products/ignite-ui-angular/docs/";
         folders.forEach(function (f) {
             select.append($('<option>', {
-                value: baseUrl + "/products/ignite-ui-angular/docs/" + f + "/typescript",
+                value: baseUrl + f + "/typescript",
                 text: f
             }));
         });
 
-        select.val(baseUrl + "/products/ignite-ui-angular/docs/" + folders[0] + "/typescript");
-
-        if (sessionStorage.typedocOption) {
-            select.val(sessionStorage.typedocOption);
+        const version = folders.filter(function(v){ return window.location.href.indexOf(v) >= 0;})[0];
+        if (version) {
+            select.val(baseUrl + version + "/typescript");
+        } else {
+            select.val(baseUrl + folders[0] + "/typescript");
         }
     });
 
     $('#versions').on('change', function () {
         const val = $('#versions').val();
-        sessionStorage.typedocOption = val;
         window.location.assign(val);
     });
 })();