From ead5ed6d739ad2f5b773276b2ea4f34d4ea8d162 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 26 Jun 2016 16:42:13 -0700 Subject: Fix docs asset file paths in /grunt/configBridge.json (#20178) Previously, when running the docs locally, the site, rooted at: http://localhost:9001/ would reference docs assets using relative URLs such as: /../assets/js/vendor/anchor.min.js which is equivalent to: http://localhost:9001/../assets/js/vendor/anchor.min.js which is nonsense, since the root directory has no parent directory. Apparently browsers silently ignore this extra '..', hence why this wasn't noticed until now. But if you adjust Jekyll's `baseurl` setting, this mistake causes incorrect URLs to get generated. This commit corrects the problem by removing the extra '../' from the paths. These paths are also referenced in the Gruntfile, where the fix actually allows us to simplify the code. Previously, in the Gruntfile, we were doing, e.g.: path.join('./docs/assets', '../assets/js/vendor/anchor.min.js') which calculates to: ./docs/assets/../assets/js/vendor/anchor.min.js which can be simplified to: ./docs/assets/js/vendor/anchor.min.js So we can remove the '/assets' suffix from the left argument and the '../' prefix from the right argument and still obtain the same result. --- grunt/configBridge.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grunt') diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 2bda83394..140d9ab78 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -1,10 +1,10 @@ { "paths": { "docsJs": [ - "../assets/js/vendor/anchor.min.js", - "../assets/js/vendor/clipboard.min.js", - "../assets/js/vendor/holder.min.js", - "../assets/js/src/application.js" + "assets/js/vendor/anchor.min.js", + "assets/js/vendor/clipboard.min.js", + "assets/js/vendor/holder.min.js", + "assets/js/src/application.js" ] } } -- cgit v1.2.3