docs: properly format anchor names and hrefs (#11648)

anchor names should not include any path info hrefs need to include the baseURL in addition to the path Fixes #11644. Relates to #11634. Relates to #11285.
angular · Feb 23, 2019 · 163b762 · 163b762
1 parent d3773a5
commit 163b762
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/docs/app/js/anchor.js b/docs/app/js/anchor.js
@@ -25,7 +25,7 @@
         return;
       }
 
-      var anchorEl = $compile('<a class="docs-anchor" ng-href="{{ name }}" name="{{ name }}"></a>')(scope);
+      var anchorEl = $compile('<a class="docs-anchor" ng-href="{{ href }}" name="{{ name }}"></a>')(scope);
 
       // Wrap contents inside of the anchor element.
       anchorEl.append(element.contents());
@@ -40,16 +40,23 @@
        * Creates URL from the text content of the element and writes it into the scope.
        */
       function createContentURL() {
-        var path = scope.$root.$location ? scope.$root.$location.path() : '';
+        var path = '';
         var name = element.text();
+        // Use $window.location.pathname to get the path with the baseURL included.
+        // $location.path() does not include the baseURL. This is important to support how the docs
+        // are deployed with baseURLs like /latest, /HEAD, /1.1.13, etc.
+        if (scope.$root.$window && scope.$root.$window.location) {
+          path = scope.$root.$window.location.pathname;
+        }
         name = name
           .trim()                           // Trim text due to browsers extra whitespace.
           .replace(/'/g, '')                // Transform apostrophes words to a single one.
           .replace(unsafeCharRegex, '-')    // Replace unsafe chars with a dash symbol.
           .replace(/-{2,}/g, '-')           // Remove repeating dash symbols.
           .replace(/^-|-$/g, '')            // Remove preceding or ending dashes.
           .toLowerCase();                   // Link should be lower-case for accessible URL.
-        scope.name = path + '#' + name;
+        scope.name = name;
+        scope.href = path + '#' + name;
       }
     }
   }

diff --git a/docs/app/js/app.js b/docs/app/js/app.js
@@ -148,9 +148,9 @@ function(SERVICES, COMPONENTS, DEMOS, PAGES,
    AngularyticsProvider.setEventHandlers(['GoogleUniversal']);
 }])
 
-.run(['$rootScope', '$location', 'Angularytics', function($rootScope, $location, Angularytics) {
+.run(['$rootScope', '$window', 'Angularytics', function($rootScope, $window, Angularytics) {
   Angularytics.init();
-  $rootScope.$location = $location;
+  $rootScope.$window = $window;
 }])
 
 .factory('menu', [
@@ -453,7 +453,7 @@ function(SERVICES, COMPONENTS, DEMOS, PAGES, $location, $rootScope, $http, $wind
       type: "link"
     };
 
-    if (path == '/') {
+    if (path === '/') {
       self.selectSection(introLink);
       self.selectPage(introLink, introLink);
       return;