From 8e0e727f7d2b78f582273c6b3281ee5de63fbbd8 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Wed, 22 Apr 2015 10:12:55 -0700 Subject: [PATCH] fixes --- public/_includes/_code-box.jade | 7 ---- public/_includes/_docs-nav.jade | 56 +++++++++++++------------- public/_includes/_footer.jade | 2 +- public/docs/js/latest/_data.json | 6 +-- public/docs/js/latest/guide/setup.jade | 13 +++--- 5 files changed, 37 insertions(+), 47 deletions(-) delete mode 100644 public/_includes/_code-box.jade diff --git a/public/_includes/_code-box.jade b/public/_includes/_code-box.jade deleted file mode 100644 index 58ba6a7981..0000000000 --- a/public/_includes/_code-box.jade +++ /dev/null @@ -1,7 +0,0 @@ -.code-box - header.code-box-header - nav.code-box-nav - button(class="button" aria-label="View ES5" ng-class="(language == 'es5') ? 'is-selected' : ''" ng-click="toggleCodeLanguage($event, 'es5')" ) ES5 - button(class="button" aria-label="View TypeScript" ng-class="(language == 'typescript') ? 'is-selected' : ''" ng-click="toggleCodeLanguage($event, 'typescript')") TypeScript - - .code-box-content diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade index 6f4019aad3..4f3678a7ab 100644 --- a/public/_includes/_docs-nav.jade +++ b/public/_includes/_docs-nav.jade @@ -3,7 +3,7 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav form.st-input-inner label(for="search-io" class="is-hidden") Search Docs input(type="search" id="search-io" placeholder="SEARCH DOCS...") - button(class="mobile-trigger button" aria-label="View Docs Menu" ng-click="toggleDocsMenu($event)" md-button) Docs + button(aria-label="Docs Menu" class="mobile-trigger button" aria-label="View Docs Menu" ng-click="toggleDocsMenu($event)" md-button) Docs ul(class="side-nav-primary" ng-class="showDocsNav ? 'is-visible' : ''") if current.path[2] @@ -18,38 +18,38 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav else li(class="#{selected}") #{name} - // SECONDARY NAVIGATION - if selected - secondarySection = public.docs[current.path[1]][current.path[2]][current.path[3]] + // SECONDARY NAVIGATION + if selected + secondarySection = public.docs[current.path[1]][current.path[2]][current.path[3]] - if secondarySection - listType = public.docs[current.path[1]][current.path[2]][current.path[3]]._data._listtype || 'unordered' - ordered = listType == "ordered" ? "is-ordered" : "" - number = 0 + if secondarySection + listType = public.docs[current.path[1]][current.path[2]][current.path[3]]._data._listtype || 'unordered' + ordered = listType == "ordered" ? "is-ordered" : "" + number = 0 - ul(class="side-nav-secondary #{ordered}") + ul(class="side-nav-secondary #{ordered}") - for page, slug in public.docs[current.path[1]][current.path[2]][current.path[3]]._data - if slug != "index" - name = page.menuTitle || page.title - selected = current.path[4] == slug ? 'is-selected':'' - num = (listType == "ordered") ? number++ : '' + for page, slug in public.docs[current.path[1]][current.path[2]][current.path[3]]._data + if slug != "index" + name = page.menuTitle || page.title + selected = current.path[4] == slug ? 'is-selected':'' + num = (listType == "ordered") ? number++ : '' - if slug != "_listtype" - if num - li(class="#{selected}") #{num}. #{page.title} + if slug != "_listtype" + if num + li(class="#{selected}") #{num}. #{page.title} - else - li(class="#{selected}") #{page.title} + else + li(class="#{selected}") #{page.title} - // TERTIARY NAVIGATION - if selected - tertiarySection = public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]] + // TERTIARY NAVIGATION + if selected + tertiarySection = public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]] - if tertiarySection - ul.side-nav-tertiary - for page, slug in public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]]._data - name = page.menuTitle || page.title - selected = current.path[5] == slug ? 'is-selected':'' - li(class="#{selected}")#{name} + if tertiarySection + ul.side-nav-tertiary + for page, slug in public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]]._data + name = page.menuTitle || page.title + selected = current.path[5] == slug ? 'is-selected':'' + li(class="#{selected}")#{name} diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade index 5cce1c39de..aa933f2143 100644 --- a/public/_includes/_footer.jade +++ b/public/_includes/_footer.jade @@ -43,5 +43,5 @@ footer(class="background-steel") small.text-caption Powered by Google ©2010-2015. Code licensed under the Apache License, Version 2.0. Documentation licensed under CC BY 3.0. - a(href="/docs/styleguide.html" title="Style Guide" class="styleguide-trigger text-snow" md-button) + a(aria-label="View Style Guide" href="/docs/styleguide.html" title="Style Guide" class="styleguide-trigger text-snow" md-button) span.icon-favorite \ No newline at end of file diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index a6f4daf6c5..471dc1e1f5 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -1,6 +1,4 @@ { - "strict": true, - "index": { "icon": "home", "title": "Angular Docs", @@ -21,9 +19,7 @@ "api": { "icon": "book", - "title": "API Preview", - "strict": true - + "title": "API Preview" }, "help": { diff --git a/public/docs/js/latest/guide/setup.jade b/public/docs/js/latest/guide/setup.jade index 274f32e102..1df18e421b 100644 --- a/public/docs/js/latest/guide/setup.jade +++ b/public/docs/js/latest/guide/setup.jade @@ -182,16 +182,17 @@ .code-box pre.prettyprint.lang-typescript(data-name="es5") + code. + // window.angular is available because the script file attaches the angular property to the window + document.addEventListener('DOMContentLoaded', function() { + angular.bootstrap(AppComponent); + }); + pre.prettyprint.lang-typescript(data-name="typescript") code. import {Component, View, bootstrap} from 'angular2/angular2'; ... // bootstrap is available for use because it was imported from angular core bootstrap(AppComponent); - pre.prettyprint.lang-typescript(data-name="typescript") - code. - // window.angular is available because the script file attaches the angular property to the window - document.addEventListener('DOMContentLoaded', function() { - angular.bootstrap(AppComponent); - }); +