Merge pull request #8 from dynamsoft-docs/main

synchronize changes from main

Author: a362758199

_layouts/default-layout.html

@@ -92,29 +92,47 @@
 
     <!-- for dcv -->
     <script type="text/javascript">
-        $(document).ready(function() {
-
+        $(document).ready(function(){
             $('#txtSearch').keydown(function(e) {
                 if (e.keyCode == 13) {
                     let lang = getCurrentUrlLang(document.URL, true)
+                    var searchUrl = getSearchUrl()
                     if (!lang || lang == '') {
-                        window.location.href = '/capture-vision2/search.html?q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?q=' + $('#txtSearch').val();
                     } else if (lang == 'android' || lang == 'objectivec-swift') {
-                        window.location.href = '/capture-vision2/search.html?refinement=mobile_native_app&q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?refinement=mobile_native_app&q=' + $('#txtSearch').val();
                     } else if (lang == 'javascript') {
-                        window.location.href = '/capture-vision2/search.html?refinement=javascript_web&q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?refinement=javascript_web&q=' + $('#txtSearch').val();
                     } else if (lang == 'cplusplus' || lang == 'c') {
-                        window.location.href = '/capture-vision2/search.html?refinement=c/c++&q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?refinement=c/c++&q=' + $('#txtSearch').val();
                     } else if (lang == 'java') {
-                        window.location.href = '/capture-vision2/search.html?refinement=java&q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?refinement=java&q=' + $('#txtSearch').val();
                     } else if (lang == 'dotnet') {
-                        window.location.href = '/capture-vision2/search.html?refinement=.net&q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?refinement=.net&q=' + $('#txtSearch').val();
                     } else {
-                        window.location.href = '/capture-vision2/search.html?q=' + $('#txtSearch').val();
+                        window.location.href = searchUrl + '?q=' + $('#txtSearch').val();
                     }
                 }
             })
         })
+
+        function getSearchUrl() {
+            var searchUrl = "";
+            var product = getUrlVars(document.URL)["product"]
+            var repoType = getUrlVars(document.URL)["repoType"]
+            if (product) {
+                product = getDoumentName(product)
+                searchUrl += ("/" + product + "/docs")
+                repoType = repoType && repoType == "js" ? "web" : repoType;
+                if(repoType) {
+                    searchUrl += ("/" + repoType)
+                }
+                searchUrl += '/search.html'
+            } else {
+                searchUrl = '/capture-vision/docs/web/search.html'
+            }
+            return searchUrl
+        }
     </script>
 
     <!-- Google Tag Manager -->

_layouts/search-page.html

@@ -122,7 +122,7 @@
                       <div class="row">
                           <div class="col-xs-12">
                               <h1>Search</h1>                        
-                              <script async src="https://cse.google.com/cse.js?cx=32039cdf85bc7ae2b"></script>
+                              <script async src="https://cse.google.com/cse.js?cx=b5ca9ca31b6a640a2"></script>
                               <div class="gcse-search"></div>
                           </div>
                       </div>
@@ -139,26 +139,6 @@ <h1>Search</h1>
         {%- include page_footer.html -%}
     </div>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js"
-        integrity="sha256-lZaRhKri35AyJSypXXs4o6OPFTbTmUoltBbDCbdzegg=" crossorigin="anonymous"></script>
-    <script>anchors.add();</script>
-
-    {%- if page.needAutoGenerateSidebar -%}
-    {%- unless page.needGenerateH3Content -%}
-    <script>
-        FullTreeMenuList(true, false);
-    </script>
-    {%- else -%}
-    <script>
-        FullTreeMenuList(true);
-    </script>
-    {%- endunless -%}
-    {%- else -%}
-    <script>
-        FullTreeMenuList(false);
-    </script>
-    {%- endif -%}
-
     <script type="text/javascript">
       $('#sideBarCnt').css({'width': $('.sideBar').width() + 'px'})
       $('.container .head').css({'width': $('.docContainer').width() + 'px'})
@@ -218,39 +198,7 @@ <h1>Search</h1>
               }
           }
       }
-
-      $('.sideBarIcon').click(function() {
-          $(".sideBar").toggleClass('hide-sm');
-          $(".sideBar").toggleClass('hide-xs');
-          setTimeout(function() {
-              $('#sideBarCnt').css({'width': $('.sideBar').width() + 'px'})
-          }, 100)
-      })
-
-    //   let timeInt = setInterval(function() {
-    //       var container = $('#sideBarCnt'), scrollTo = $('#sideBarCnt .activeLink');
-    //       if (scrollTo.length>0) {
-    //           container.scrollTop(
-    //               scrollTo.offset().top - container.offset().top + container.scrollTop()
-    //           );
-    //           clearInterval(timeInt)
-    //       }
-    //   }, 500)
-  
-      function onSearchFinish(e) {
-          var evt = window.event || e;
-          if (evt.keyCode == 13) {
-
-          }
-      }
-
-      $('#txtSearch').keydown(function(e) { 
-          if (e.keyCode == 13) {
-              window.location.href = '/barcode-reader/search.html?q=' + $('#txtSearch').val()
-          }
-      })
-
-  </script>
+    </script>
 
     {%- include livehelp.html -%}
 </body>