From f08cb87031a3eab313ffc318822b7c8ab8ad4143 Mon Sep 17 00:00:00 2001
From: Kayla Altepeter <kayla.altepeter@merrillcorp.com>
Date: Mon, 28 Oct 2019 23:57:18 -0500
Subject: [PATCH] Update Angular documentation to include 7 and 8

---
 .../templates/pages/about_tmpl.coffee         |   2 +-
 lib/docs/scrapers/angular.rb                  |  42 +++++++++++++++++-
 public/icons/docs/angular/16.png              | Bin 727 -> 1108 bytes
 public/icons/docs/angular/16@2x.png           | Bin 1306 -> 2266 bytes
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 0165ade2..fd3d9a7c 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -83,7 +83,7 @@ app.templates.aboutPage = -> """
 
 credits = [
   [ 'Angular<br>Angular.js',
-    '2010-2018 Google, Inc.',
+    '2010-2019 Google, Inc.',
     'CC BY',
     'https://creativecommons.org/licenses/by/4.0/'
   ], [
diff --git a/lib/docs/scrapers/angular.rb b/lib/docs/scrapers/angular.rb
index 3365ec67..b5db97e9 100644
--- a/lib/docs/scrapers/angular.rb
+++ b/lib/docs/scrapers/angular.rb
@@ -11,7 +11,7 @@ module Docs
     options[:max_image_size] = 256_000
 
     options[:attribution] = <<-HTML
-      &copy; 2010&ndash;2018 Google, Inc.<br>
+      &copy; 2010&ndash;2019 Google, Inc.<br>
       Licensed under the Creative Commons Attribution License 4.0.
     HTML
 
@@ -59,6 +59,46 @@ module Docs
     end
 
     version do
+      self.release = '8.2.12'
+      self.base_url = 'https://v7.angular.io/'
+      self.root_path = 'docs'
+
+      html_filters.push 'angular/clean_html', 'angular/entries'
+
+      options[:follow_links] = false
+      options[:only_patterns] = [/\Aguide/, /\Atutorial/, /\Aapi/]
+      options[:fix_urls_before_parse] = ->(url) do
+        url.sub! %r{\Aguide/}, '/guide/'
+        url.sub! %r{\Atutorial/}, '/tutorial/'
+        url.sub! %r{\Aapi/}, '/api/'
+        url.sub! %r{\Agenerated/}, '/generated/'
+        url
+      end
+
+      include Docs::Angular::Common
+    end
+
+    version '7' do
+      self.release = '7.2.15'
+      self.base_url = 'https://v7.angular.io/'
+      self.root_path = 'docs'
+
+      html_filters.push 'angular/clean_html', 'angular/entries'
+
+      options[:follow_links] = false
+      options[:only_patterns] = [/\Aguide/, /\Atutorial/, /\Aapi/]
+      options[:fix_urls_before_parse] = ->(url) do
+        url.sub! %r{\Aguide/}, '/guide/'
+        url.sub! %r{\Atutorial/}, '/tutorial/'
+        url.sub! %r{\Aapi/}, '/api/'
+        url.sub! %r{\Agenerated/}, '/generated/'
+        url
+      end
+
+      include Docs::Angular::Common
+    end
+
+    version '6' do
       self.release = '6.0.4'
       self.base_url = 'https://angular.io/'
       self.root_path = 'docs'
diff --git a/public/icons/docs/angular/16.png b/public/icons/docs/angular/16.png
index c2da47ddac62d6fc78411ddb0385be40bd474b3a..ace09120ce692ba589feaec994970f64ac361053 100644
GIT binary patch
literal 1108
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pn}NEkcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5
z!d3~a!V1U+3F|8<fR&VF+bTu)1}He^7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se
z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F
z7L;V>=P7{9O-#x!EwNQn0$BtH5O<bjrXg&~D~5Ut=s|sujJ~0sfj-=9pjI1@sFi<F
zW-8ETkok6oHei(~Vo-Z*^g)&*IR@fWuqe>0c3d|4@L;p!@;Rg)$-uxg#nZ(x#6mDP
z*w-T@P~_jc--TBSr7nLGkKt8RJl7)}vP9Ks<qfS(IvL@o!vwFKYB>?PV^!;xJVoD&
zTDQ_B&73eLE%V<ci$0^aWWHA)p6#u+{{C^E&(p@!KYyS5e$MiH>;neDhEJS=cYQsh
zkH!3V_}jq1w072&0u{0Dl}&xGPv5y+Z*a!<*=tr4vlXF7r}uunnl1f6pmeLVm(Ax-
zJZZ~57hbxj9^tZtudB3E^Np5vp#RTp*CxDv>C(mdVd3=~YuB*eH@3f|abEOl)zvxw
z#O|wiFlM>%o(*&0Ptg&+nQS+4wzOgPv13<x7N+^l-@?^zo?T_*d`HTxb?1aT^VaNV
zijXoi$~qjyaw+;u)5B!8XF<E-?yssotSBOMu;_4PtN(iL#h0>k($6yS&6{>~(=@Sb
zx%$0xT8=A~Oby>?aQe?h>l3M)8RpJvFLzwS^EB@0VaeRtYfpSjUCWkZQJugU8m<tu
z`<v;H+ff_;<#1FBtk_*BTa@rI+g+pO;hm_dPY;J=*T-6Q2^3xtbN(|=;NJ1(fLhfH
z-hTsLicE<8m?Dt&%J{~_Bn?ZopE(!XWSfgO9%7A^Jo|M24aUS-8n5>-*nd5Ka^1^U
z2X5sWc;ARFc3Y6tnD^T~((3xvPm}LFS<L7>LFL`oF8L?>7k_?Qx1OhS{a@x|)t`=Y
zYVX(1?{}+koMPhSTI%#_Q^4YV#-?*myZzn~RL2xmD!lF2?;mPMwKUZY3pU*EJo7Cz
z_)-MlmM!{+>}M`I(xtETtozWh7Y`>GmTmF$3CLk_oh<(<`j+aowG+4L{%l-&;pc4c
zD2thwl#*TrMD$Eyo4nXJcRSyqU53%8+nw6(p0#0`XQ?Y8`<ZodJ`-a<a|++H^}GJh
k`Lq0u+Wcp>`Q~b0<=5r%ba?tXrhu}#r>mdKI;Vst0Cnfe<NyEw

delta 704
zcmV;x0zduK2-gLWBYy&(Nkl<ZcmZ{jL%=LY5P-j`(K5De+cqz;&0}om8si${8e7jV
zwr%`c@AP!7H~!i#H9ZW(I6QcX-9rAtXUpxp^qbwnU+C@W?KKb>R)0IhT1gldb~g!*
zc4>OxZ+VYT;wQvs56{drUOa%$Tl@t9c%3bya+q!xnjQ%pRDY0Q)yO%TD=ovXd5`??
zD_I=U@Yy#Yk7s6&lq%7@t#~6<fW<?1?XniXx(LC!Ids)Vfd7L@x9CNu_+`#N#ZT5J
zT}$yvcdaaX?ot}Q+AO!P1yK5kWxxzsqbcTntF2LSxv+TLfx66*2WztQa$(k;Ym51c
z&l(=<pZW6wlYh?#lf)7P>ZwpZ;SgA~L{u)Z%&~{!Y8B|NA;ccY;0u5dKt+CZW{4n`
zrYHrLxZ+GEZoMC;u=2%c@zdQ8(pwW1aTqH6FqXi?ern>8AXM)wRy<@cbor&2yz)-I
zx&C&NWtU>fL-xc~D%RW6GLKXJc`QMi`rpGqYN1(CP=8zWoFfEa`Fn3<iNNUhPd|#^
z9(~f(Oj4-%mi;!Cpg>_l!r%{WS4lS6jQqYk(tLR#5=Z?q{n|nn-)l$8+inKaRWu0x
z$TtcT{FN`_trmXA+E#yNcIs;l`-1iDV^*=3S=nBW*R`xWH~IXmbPj9UtR*&I$Pl%m
z6ttT^FMqe#N=PnY;*wjO;Rp-M5-+(--*{hLb+gkXVfmF-#5bBh0~n|nh=6^~CaY&r
zaATCVk4jK#Vdyi=e$5+RkwVM$jhE%(hhyy0ZKvP;YIqh#mjHZ~-*&sqr8g|%WsjB^
zzZ5(wP#1X-mCJUTcyr!A&oC0F_sbaaZLry)pE*XGel)wh$w#j)w(+41d35j-mH%P*
mT@io}*f8#u(Tlw`{y_&8D>M%?^xdZb0000<MNUMnLSTZ9uweZF

diff --git a/public/icons/docs/angular/16@2x.png b/public/icons/docs/angular/16@2x.png
index 10125c544b39a582ce9fafe3b3cdacfd10558583..f6c6a096ee23c745aa699c26d09a4e754ffee060 100644
GIT binary patch
literal 2266
zcmY*bcUaTQ68+IhcoZ*EMH7nBE(s;H5KxhhRH+&|p_4=sr3g}#-V_k&7!XD2y@?=F
zG$=#^f{KVzMVgn;+Y9RRy|>>tyEC(A&Y9W2Hs0J+pA#$$1^|H5&_KtMenJn8ot3^5
zLPBWtgMnbFuMJcVh<u|5AiRM+0RT974~+rH$rGdl?7gk*h;}CDk#0DDn2S5k6$1<M
z$J5aOfC@s=U4IPG1sde<hb16`G{t@*kaYhr4Htv{gb;l-#q3PXq33V`7^pG~0h1Tg
z0z;utRDin&(o#q7cR4-M6!Rhy@kls4Ffb4ns070Wc)}Ib)z#thif~0mIXXg)5R4_d
z1j%6u;=f4#!=r;CxCMCQiQYIY^pMxZ6?cWGDJFI(^k@C*lj!a7UnMNz_gM4+;fFVH
z1(-bi4>!FOb(lq(1$blV%7^?~3aFpR|I7W>LBS8j|EHN>lm5)oN7VwO;D4S?3w*vy
z(jEZVgbj7hTG@eyZGG_$)_nWxTC-Z|W4Q=UZ*5umqG5%Zv)<mK4c|&9*{x1kQjo}h
zIG*)!A0KiOKF-HO910(X%yGNl=NeFxiIzU+^N>jCz1<k`y4XAIlu43*I-+HeFtC1U
zXJ)J*_XUK<b4+O`uVKV76}Q;1f!qNO244e4+Xtu^PheK9v0J-On*%P=A&%2~++%_G
zs({W7jo18YzF75Qj(xczeUIovnN3(Ny+f_3^!KE!b>km<?s{F=*!&VRAi1CS?F0Xv
zBl&krKXw?Y%81i)b`5Vb%@MXKu1C2xNnJujELZ*0ScCQ6jCmtpHsjttKjfLN%eOYd
zGB_PiPBF=J;;z99)sD{#FI-`jf4D6_K^1jCd;0?DY{pX*s^hz6CYepd<wZaDoW!9)
zarTL0pWR&tPESfCVw|L>B{JS!?yWa)_R|-9Mx9RE-iuwWGSyww`=$)^QcO<IxG}5<
zA@>aUP07Vn%q^x2p?sB*VfFp&V!MqYrL0-?tkFQo*X4GhncXzA12I8kSx(!|&cO?N
zJkR$Vs@9%;S`9BuWyBXVk;2$wFY<h}yq7Psg9=TRVkw<b@<6At3@X+_J|!QO9H`0F
zw!c3mF-ooWW3*>|epcoYtw4fSkQk|IFrK{dw)?>&Y~}u)*F`R5W8y1EcPX?ktEIxl
z_zJmb=WV{Bu;t6ma^G)zI34Ukx^g#Vhqe*AvdJMSa|y|Lpaf<KUL6q4HuQbFIZHK1
zSmvpX@~PXncpdY1D)tPG3l2@TTZ@59M}k`?(aw+NML-t#=F8E6HYZ4MQW>!A-rala
z;Z4II%9)g$Go53SkX_-o%b)$Gr{Czb{vcI#9Ygjq^hd2(=QqZbi+_09Rbg%o49A}_
zV>elD@DR-QiM!;M9acD1uI;_Vn6RMTwA{v)Mzk&jo?KiQc5ZemyKWOF6A{T5Qx;{I
zN~{P}%yDIp84%n5VMf}I!ODhxixyB=?GiOs-5?e(HSSDwD1Z@GW%c=!=Rj((W%n2C
zpRECcV0Cq}3iaf*w95Ojo(0E}a=FvJHoH7YROu{NP|L%Do-yiREmy`w+Q@q6?8Fz8
z6|btBJ6vASA<d-pRlOQl7|4O8TJ=@1{b22AhHm^S?UiRflM;fv=?a@L_B|}*#oi?1
z$?WwTyAXR017qLzV2!_W8$|`5vS;e|Po86>Vm=TX3ixKeli=Ary+(Di<~sX~VU7V^
z67nH_21*^076&)jj`%w2U%6qt6OJJ`7X7n1815Ym8fdsaYrOJgL{>lTaedE4sKrFu
z@=S|M1Wq3q6>`!07`LQ#$8wuVw<kchr$n7qX;r{4FHhUmO(P0@qF>VNJq2uaAA$(H
z+G$c!9f}pcky{xv-W^hB5X2gpF;@g~{MZsyBtEY{HwTUr)tGsp1;-3A|EnRt<>4w#
z{B+|$#b2wR@KhW3(JEIQMqu{sJbU%l8_2U<6xKFUr9{|B1D-m(5hDyR$@atr%-&CW
zqbX|5FMX}AqA2yA`I+lML+fJ{cK#UK?H5wJ+Hc79;a^pD_#Ljx_<;=!d-OQAeQX@a
zehq6C=Hx8H+m`+y-lUq9(5>$Vxa+C;?Ym^C$99N+SZ1;EbC?<iP889KYUExkx?TIe
z3YFATSc7(|8!in_m6Wn0Fh8=)Wpo*RFvMIpxSDrM1ERPwZfFSO@94T4zQKk~V5aR{
zJ=@`{G4>rB^|2;h#5t1?qj+BZ!%}-c)^bRa@50L-b6&p5hQXYp_{i=;9fU(`g7q@(
z2Xt!-E=Fy8?!$L#fV4u@Csn;?RI2S<;gA>D`jm%`SY2AoI(X@3SCmxG*|czGeLr@h
zV?Drppx53=M!C~e?}V~6z-0$S;(A%^!7V|QEV;qc2Sp3w?V+1qx((euO(n_a+AKC<
z{nmisPEWd*hp-y^*n{%In~=NyQ_Lagj9}T?LS0fxys3#e;}$mCB6P(DAqnY63x2oj
z>X7Ke6ydG=ZKBmvnvI#j<U8m8mKpD>hNU?BP^vSoCH<XwmcQTDDV$tL4s#P2-@M?Z
zF^}g2vXj6m=(b6Q{G<(4;dU37NZSmdaTI#m(jXd;f|n*sA2X{m>s92uVi$4xd7^Rn
z@?6bcnLk<0@8C$pd2;eqRo1Dt?pzOFhvO=t=}qOabz~Dt^Ck_{>0r;$qO8tIwn&V$
zwZfnZWb#69mPko%TU=61X;fw50l)0%OctzH&2}MThf?-oi9>tRC+@LKU#oirJP~ax
zCqfe>+taq*E$xEZc#B&}?M<}IjJO)}Ex+=z*(53f|DpZat{l}r#U080bZm5(cc5xN
z610WeF@dh@pF|*zF1PO3g^hgrVwc%^@Y=^%iuO6kSW`frBuBCx*~Bj$59^1d(wZix
ZK0Di&zZs)kSUdc180wnpRBAg%{Tu6W9>@Ry

delta 1288
zcmV+j1^4>e5t<5+BYy<pNkl<Zc-rk(ZERCj7(VOm=2+?NFa!*LCQM+A_MYAih7k#w
zQ6k0#e+a}d<iigVjlqu}(_|qAgNYiW@yC|nFX9hlf{B?SqDG-#TlXnU)WO!<uKQ#&
znYfKP>H7GdQ|~lfZ@VDyizj(=+S}Vc&-<S9y!S1;gBwLZ^M5VrRrs#9#e7%D<6ClD
zNaO6@!i1Ao#}&PSBGK>E(eCDmcz7bBY7OCHUVVn{x!JsViF~dnochtYL+_3&ehe!W
zNGLjb9U3AoFPc@3c8?z<g2ZUu^!{jbG1tX+Z<w{0RhGsb{=<gi4-x6?2$3d<G)4ks
z5V^5zD_TpoAb+^ni;$|xX!%FXY*^)?W>q^J@pwxYL^{kWmnM{oJyhN%iYp@10U|X7
z;dRl+)?(t#MkL;Dz**;NQ^0(LDWdaY_!WBJ)S~+LoN-q!Wp?Ou@I&KDC5DJNE{N<R
zkHc`^k88#dX8H#aSzd+EVxLKFi3mlT>c=^cj<Cmfh=19^P%3IDV+)}*`!ZbK^EyoQ
z9IQhie~lo^7P2BCw^qaK5X;v$5JB3=CcwcFb8^gtyI|r<a~J)vPlPRbIJ2h19`6SG
z3NXE-Pw`L2vu0n8q3UOVxjC3f)9dc-2N1YxZB_w6Rh#^-STD(P@;9k5g(t~kSp`gf
zb{YbI4u6bdc3=bo<DZ`<0cExV$eLnJM(@5)Wp)5#j+jI5B)i#=dyy=E0_o`)2#me)
zA(HhUKp;ieIyUS;a8bGK{?pniI9N6i(WyalLCnT_zrBAVQ}(H=h?j0h=lVyHqSpe0
zADu8QX^B>qi)}c?a)A!uap8Zf^?XR&Q;pQfIDZ7DPJW9^jIu2#!}u59Kwx%s9MM%<
z5p=D$2%vr-9B`cF0&T$&>U#f~{jaaQ3yD+;!w)@+i)<AFY$duMJBT!06NuHlV^+Z;
zAgJ;qxdkZv05u|u^^Bs8nEk0Q!#^~Jk(!q<wC#CZsCf<-cD{(&kueBN|I&x>(n^aZ
z+ka#Qd<SxGfs=3RS9D9`8GZ6KEEGT2zG`VqEvkHKZp$s8ph6?klrf*ZSbezqeJd7<
zi9oA32iNrgo{GA>8q0+w(^nAjMEu{4XY<p*HMz&K2Mj*&6oww$hvb%h=ze%F&Ofpj
zKWy2Jv6EkA976Y=qw8j0h-8FJbQS3<Sbr{@XPS$M4Y>_cz&cER@+Blva~LEsy==7<
zcJXf)1PaS=Hm{UOYmugV1TKHtgh0Vsvk8eVXneg~bFo|i4G}~f6%QrZc-GV)Jvj}5
zKU#l8EMFc<DejWfkBD1lH-G4UZ|}}%otj3w|8WG1%FQMe#X<*^7|jFJ3*_OOIDhsr
zkWS0&$6q)m?MUPn0Tj}HeJ{TyEGfT}eDAnCjP0sleBQ(s3d*o<P|?#ANS5uuK*equ
zhHI0^-cEq5LS)%SbZy=#qoblmc0h_W4X$;}3j1y7B|9c)92;O7`k9w9UvHAz3NS?k
z3)i7}5tY8kE2g1Pfb54GnGZWyWq&@oVSmEu?=c6_90JS%l~%1M;`Z$qzj0Ik1JG1l
zPjlj!5Mo#aNUxjo-xx*xE%~pIVA@KuXCqZ&Mzm{FKwBo`8Opvf;L%pHTMZ+hSCNn=
y!>J?c<`5Gvb-F5cyU|;~YujABmfgYsz+XAJ?qd+1W03#=002ovPDHLkU;%=;j%%d=