diff options
| author | Zandra <[email protected]> | 2016-02-04 15:53:46 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2016-02-04 15:53:46 +0100 |
| commit | ccef211bd8e365d8ed2f601b8896ac4d4475e283 (patch) | |
| tree | 239d8812c98a488ec7c58bc9168c695e6747aa77 | |
| parent | 3b5ab49296287c38185c415da74e6858352c2df4 (diff) | |
| parent | a03b7add86b92d0d7d2d744e5555314bedbc2197 (diff) | |
| download | otp-ccef211bd8e365d8ed2f601b8896ac4d4475e283.tar.gz otp-ccef211bd8e365d8ed2f601b8896ac4d4475e283.tar.bz2 otp-ccef211bd8e365d8ed2f601b8896ac4d4475e283.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/edoc/src/edoc_layout.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl index b67ec31ae3..f723cd8373 100644 --- a/lib/edoc/src/edoc_layout.erl +++ b/lib/edoc/src/edoc_layout.erl @@ -180,7 +180,9 @@ layout_module(#xmlElement{name = module, content = Es}=E, Opts) -> FullDesc = get_content(fullDescription, Desc), Functions = [{function_name(E), E} || E <- get_content(functions, Es)], Types = [{type_name(E), E} || E <- get_content(typedecls, Es)], - SortedFs = lists:sort(Functions), + SortedFs = if Opts#opts.sort_functions -> lists:sort(Functions); + true -> Functions + end, Body = (navigation("top") ++ [?NL, hr, ?NL, ?NL, {h1, Title}, ?NL] ++ doc_index(FullDesc, Functions, Types) @@ -204,9 +206,7 @@ layout_module(#xmlElement{name = module, content = Es}=E, Opts) -> end ++ types(lists:sort(Types), Opts) ++ function_index(SortedFs, Opts#opts.index_columns) - ++ if Opts#opts.sort_functions -> functions(SortedFs, Opts); - true -> functions(Functions, Opts) - end + ++ functions(SortedFs, Opts) ++ [hr, ?NL] ++ navigation("bottom") ++ timestamp()), |