From 899419269bb1566ef52aada043ec16afdf5f221a Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Wed, 24 May 2017 10:24:37 +0300 Subject: [PATCH 01/13] fix: linkify in json formatter closes #267 --- lib/utils/JsonFormatterPipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utils/JsonFormatterPipe.ts b/lib/utils/JsonFormatterPipe.ts index 3be316e6..8de93236 100644 --- a/lib/utils/JsonFormatterPipe.ts +++ b/lib/utils/JsonFormatterPipe.ts @@ -42,7 +42,7 @@ function valueToHTML(value) { } else if (valueType === 'number') { output += decorateWithSpan(value, 'type-number'); } else if (valueType === 'string') { - if (/^(http|https):\/\/[^\\s]+$/.test(value)) { + if (/^(http|https):\/\/[^\s]+$/.test(value)) { output += decorateWithSpan('"', 'type-string') + '' + htmlEncode(value) + '' + decorateWithSpan('"', 'type-string'); } else { From b4e2e9d47bda7ab6234f8200e6b8ee487520bfe9 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Wed, 24 May 2017 10:28:40 +0300 Subject: [PATCH 02/13] fix: links color in json sample --- lib/components/SchemaSample/schema-sample.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/components/SchemaSample/schema-sample.scss b/lib/components/SchemaSample/schema-sample.scss index b85f561c..70a26a73 100644 --- a/lib/components/SchemaSample/schema-sample.scss +++ b/lib/components/SchemaSample/schema-sample.scss @@ -86,6 +86,10 @@ pre { .type-string { color: #66B16E; + & + a { + color: #66B16E; + text-decoration: underline; + } } .callback-function { From a08c3b962ea50e46b5a260e7e1572e0c173930f2 Mon Sep 17 00:00:00 2001 From: Skyler Lewis Date: Wed, 24 May 2017 03:36:23 -0600 Subject: [PATCH 03/13] Use a small docker image (600MB savings) (#271) by @alairock node 7 666 MB node 7-alpine 59.1 MB --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f61847b9..b1fe9826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ dev: - image: node:7 + image: node:7-alpine command: sh -c "npm install; npm start -- --host=0.0.0.0" ports: - "9000:9000" From 75bb68c9ca08f6e9fb866947eb197b60aed326bb Mon Sep 17 00:00:00 2001 From: Blake Erickson Date: Thu, 1 Jun 2017 08:19:19 -0600 Subject: [PATCH 04/13] Update README.md (#279) fix discourse URL. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e60afee1..f10f44c5 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ We host the latest and all the previous ReDoc releases on GitHub Pages-based **C - [Docker Engine](https://docs.docker.com/engine/api/v1.25/) - [Zuora](https://www.zuora.com/developer/api-reference/) - [Shopify Draft Orders](https://help.shopify.com/api/draft-orders) -- [Discourse](https://docs.discourse.org) +- [Discourse](http://docs.discourse.org) - [APIs.guru](https://apis.guru/api-doc/) ## Deployment From f50bfb182344e0c38f082f6d21ecdbe328e46dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Pincoli=C4=8D?= Date: Fri, 2 Jun 2017 08:36:55 +0200 Subject: [PATCH 05/13] fix: (#276) Issue with stick sidebar when there is content above reDoc (#277) fixes #276 --- lib/shared/components/StickySidebar/sticky-sidebar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shared/components/StickySidebar/sticky-sidebar.ts b/lib/shared/components/StickySidebar/sticky-sidebar.ts index f4e822af..05700aa0 100644 --- a/lib/shared/components/StickySidebar/sticky-sidebar.ts +++ b/lib/shared/components/StickySidebar/sticky-sidebar.ts @@ -40,7 +40,7 @@ export class StickySidebar implements OnInit, OnDestroy { this.unstick(); } - if ( this.scrollY + window.innerHeight - this.scrollYOffset() >= this.$redocEl.scrollHeight) { + if ( this.scrollY + window.innerHeight - this.scrollYOffset() >= this.$redocEl.scrollHeight && this.$element.parentElement.parentElement.className != 'loading') { this.stickBottom(); stuck = true; } else { From 4dd8a0acdff1a33057734087ac6bd534e434de03 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Fri, 2 Jun 2017 09:37:49 +0300 Subject: [PATCH 06/13] fix: update fix for #276 to not use className checking --- lib/components/Redoc/redoc.html | 3 ++- lib/shared/components/StickySidebar/sticky-sidebar.ts | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/components/Redoc/redoc.html b/lib/components/Redoc/redoc.html index 49550648..2bb172a7 100644 --- a/lib/components/Redoc/redoc.html +++ b/lib/components/Redoc/redoc.html @@ -7,7 +7,8 @@
-