Merge pull request #114 from webdev-dev/master

 extLink module fix

Author: kmiyauchi

docker-compose.yml

@@ -21,10 +21,10 @@ services:
      - VIRTUAL_HOST=webdevff0b3218aaad11e7abc4cec278b6b50a_JEKYLL_HOST
      - CERT_NAME=webdevff0b3218aaad11e7abc4cec278b6b50a_ENV_DOMAIN
     ports:
-     - "4000:4000"
+     - "4000"
     volumes:
      - .:/usr/src/app
-    command: bash -c 'cd /usr/src/app; sudo bundle update; jekyll serve -d _site --watch --host=0.0.0.0 --port webdevff0b3218aaad11e7abc4cec278b6b50a_JEKYLL_PORT'
+    command: bash -c 'cd /usr/src/app; jekyll serve -d _site --watch --host=0.0.0.0 --port webdevff0b3218aaad11e7abc4cec278b6b50a_JEKYLL_PORT'
     image: jekyll:docker
     container_name: webdevff0b3218aaad11e7abc4cec278b6b50a_JEKYLL_CONTAINER
     external_links:

lib/util/jquery.extLink.js

@@ -39,9 +39,12 @@ var extLink = exports.extLink = function extLink($, _config) {
         }
 
         // Strip the host name down, removing ports, subdomains, or www.
-        var pattern = /^(([^\/:]+?\.)*)([^\.:]{1,})((\.[a-z0-9]{1,253})*)(:[0-9]{1,5})?$/;
+        var pattern = /^(([^\/:]+?\.)*)([^\.:]{4,})((\.[a-z]{1,4})*)(:[0-9]{1,5})?$/;
         var host = window.location.host.replace(pattern, '$3$4');
         var subdomain = window.location.host.replace(pattern, '$1');
+        if (subdomain == host) {
+            subdomain = "";
+        }
 
         // Determine what subdomains are considered internal.
         var subdomains;

src/util/jquery.extLink.js

@@ -31,9 +31,12 @@ export const extLink = ($, _config) => {
         }
 
         // Strip the host name down, removing ports, subdomains, or www.
-        var pattern = /^(([^\/:]+?\.)*)([^\.:]{1,})((\.[a-z0-9]{1,253})*)(:[0-9]{1,5})?$/;
+        var pattern = /^(([^\/:]+?\.)*)([^\.:]{4,})((\.[a-z]{1,4})*)(:[0-9]{1,5})?$/;
         var host = window.location.host.replace(pattern, '$3$4');
         var subdomain = window.location.host.replace(pattern, '$1');
+        if (subdomain == host) {
+            subdomain = "";
+        }
 
         // Determine what subdomains are considered internal.
         var subdomains;