refactor layout to opitmize time to content

kazupon · kazupon · commit c3eaadf0e9a4 · 2016-11-12T01:54:01.000+09:00
NOTE:
  pick up from 36772a7b7c0bb93350245900a3c782a463a00c4e
diff --git a/themes/vue/layout/index.ejs b/themes/vue/layout/index.ejs
@@ -61,8 +61,6 @@
   Copyright &copy; 2014-<%- new Date().getFullYear() %> Evan You
 </div>
 
-<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
-<script src="/js/common.js"></script>
 <script>
 var topScrolled = false
 window.addEventListener('scroll', function () {
diff --git a/themes/vue/layout/layout.ejs b/themes/vue/layout/layout.ejs
@@ -17,16 +17,17 @@
         <meta name="twitter:description" content="<%- theme.site_description %>">
         <meta name="twitter:image" content="https://<%- theme.root_domain %>/images/logo.png">
 
+        <link rel="icon" href="/images/logo.png" type="image/x-icon">
+
         <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto Mono' rel='stylesheet' type='text/css'>
         <link href='//fonts.googleapis.com/css?family=Dosis:500&text=Vue.js' rel='stylesheet' type='text/css'>
-        <link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
-        <link rel="icon" href="/images/logo.png" type="image/x-icon">
-        <script>
-            window.PAGE_TYPE = "<%- page.type %>"
-        </script>
+
+        <!-- main page styles -->
         <%- css(isIndex ? 'css/index' : 'css/page') %>
-        <%- partial('partials/ga') %>
+
+        <!-- this needs to be loaded before guide's inline scripts -->
         <script src="/js/vue.js"></script>
+        <script>window.PAGE_TYPE = "<%- page.type %>"</script>
     </head>
     <body class="<%- isIndex ? '' : 'docs' -%>">
         <div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
@@ -42,18 +43,50 @@
                     <%- body %>
                 <% } %>
             </div>
-            <script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
             <script src="/js/smooth-scroll.min.js"></script>
-            <script src="/js/common.js"></script>
         <% } else { %>
             <%- body %>
         <% } %>
 
+        <!-- main custom script for sidebars, version selects etc. -->
+        <script src="/js/common.js"></script>
+
+        <!-- ga -->
+        <script>
+          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+          ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
+          ga('send', 'pageview');
+        </script>
+
+       <!-- search -->
+        <link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
+        <%- css('css/search') %>
+        <script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
+        <script>
+        [
+          '#search-query-nav',
+          '#search-query-sidebar'
+        ].forEach(function (selector) {
+          if (!document.querySelector(selector)) return
+          docsearch({
+            appId: 'BH4D9OD16A',
+            apiKey: '0a75952972806d9ad07e387d08e9cc4c',
+            indexName: 'vuejs_jp',
+            inputSelector: selector
+          })
+        })
+        </script>
+
+        <!-- fastclick -->
         <script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
         <script>
-            document.addEventListener('DOMContentLoaded', function() {
-                FastClick.attach(document.body);
-            }, false);
+          document.addEventListener('DOMContentLoaded', function() {
+            FastClick.attach(document.body);
+          }, false);
         </script>
     </body>
 </html>
diff --git a/themes/vue/layout/partials/ga.ejs b/themes/vue/layout/partials/ga.ejs
diff --git a/themes/vue/source/css/index.styl b/themes/vue/source/css/index.styl
@@ -1,6 +1,5 @@
 @import "_common"
 @import "_header"
-@import "_search"
 @import '_sidebar'
 
 $width = 900px
diff --git a/themes/vue/source/css/page.styl b/themes/vue/source/css/page.styl
@@ -1,7 +1,6 @@
 @import "_common"
 @import "_header"
 @import "_demo"
-@import "_search"
 @import "_sponsor"
 @import "_migration"
 @import "_sidebar"
diff --git a/themes/vue/source/css/search.styl b/themes/vue/source/css/search.styl
diff --git a/themes/vue/source/js/common.js b/themes/vue/source/js/common.js
@@ -1,6 +1,5 @@
 (function () {
 
-  initSearch()
   initMobileMenu()
   if (PAGE_TYPE) {
     initVersionSelect()
@@ -31,25 +30,6 @@
     }
   }
 
-  /**
-   * Swiftype search box
-   */
-
-  function initSearch () {
-    [
-      '#search-query-nav',
-      '#search-query-sidebar'
-    ].forEach(function (selector) {
-      if (!document.querySelector(selector)) return
-      docsearch({
-        //appId: 'BH4D9OD16A',
-        apiKey: '0a75952972806d9ad07e387d08e9cc4c',
-        indexName: 'vuejs_jp',
-        inputSelector: selector
-      })
-    })
-  }
-
   /**
    * Mobile burger menu button for toggling sidebar
    */
