From 9fd6464a746187faad61b92bafcf98410f6f88d3 Mon Sep 17 00:00:00 2001 From: Grzegorz Adam Hankiewicz Date: Sat, 2 Aug 2014 20:44:37 +0200 Subject: [PATCH 1/3] Updates js.high usage for line ending dots. Refs #1291 and #1292. --- web/babelpkglist.nim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/babelpkglist.nim b/web/babelpkglist.nim index 8745c9f99..8de6047ef 100644 --- a/web/babelpkglist.nim +++ b/web/babelpkglist.nim @@ -38,8 +38,7 @@ proc processContent(content: string) = else: pkg["url"].str let desc = pkg["description"].str - # Review array index access when #1291 is solved. - dot = if desc.high > 0 and desc[ 0 and desc[desc.high] in endings: "" else: "." listItem = li(a(href=pkgWeb, pkg["name"].str), " ", desc & dot) if pkg["url"].str.startsWith("git://github.com/nimrod-code") or "official" in pkg["tags"].elems: From bddfe007b6975687102e924cebab0497ea93584f Mon Sep 17 00:00:00 2001 From: Grzegorz Adam Hankiewicz Date: Sat, 2 Aug 2014 20:51:21 +0200 Subject: [PATCH 2/3] Adds placeholder text for js disabled browsers. Refs #1292. --- doc/lib.txt | 6 ++++-- web/babelpkglist.nim | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/lib.txt b/doc/lib.txt index 2da753007..5bacfcc4f 100644 --- a/doc/lib.txt +++ b/doc/lib.txt @@ -594,7 +594,8 @@ compiler. .. raw:: html -
+
If you are reading this you are missing + babelpkglist.js or have javascript disabled in your browser.
Unofficial packages ------------------- @@ -605,7 +606,8 @@ Nimrod programming language. .. raw:: html -
+
If you are reading this you are missing + babelpkglist.js or have javascript disabled in your browser.
diff --git a/web/babelpkglist.nim b/web/babelpkglist.nim index 8de6047ef..e8f9efc1b 100644 --- a/web/babelpkglist.nim +++ b/web/babelpkglist.nim @@ -50,19 +50,17 @@ proc processContent(content: string) = var officialPkgListDiv = document.getElementById("officialPkgList") - officialPkgListDiv.innerHTML.add( + officialPkgListDiv.innerHTML = p("There are currently " & $officialCount & " official packages in the Babel package repository.") & ul(officialList) - ) var unofficialPkgListDiv = document.getElementById("unofficialPkgList") - unofficialPkgListDiv.innerHTML.add( + unofficialPkgListDiv.innerHTML = p("There are currently " & $unofficialCount & " unofficial packages in the Babel package repository.") & ul(unofficialList) - ) proc gotPackageList(apiReply: TData) {.exportc.} = let decoded = decodeContent($apiReply.content) From ca937cdba8246eb21357e4147a568709c62a5463 Mon Sep 17 00:00:00 2001 From: Grzegorz Adam Hankiewicz Date: Sat, 2 Aug 2014 20:53:56 +0200 Subject: [PATCH 3/3] Uses case insensitive comparison for sorting. Refs #1292. --- web/babelpkglist.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/babelpkglist.nim b/web/babelpkglist.nim index e8f9efc1b..5da7d60a9 100644 --- a/web/babelpkglist.nim +++ b/web/babelpkglist.nim @@ -21,7 +21,7 @@ proc processContent(content: string) = var jsonArr = jsonDoc.elems jsonArr.sort do (x, y: PJsonNode) -> int: - system.cmp(x["name"].str, y["name"].str) + strutils.cmpIgnoreCase(x["name"].str, y["name"].str) var officialList = ""