From 7d0819a65e32601f481ecf501b086f1fabaf67ae Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Wed, 3 Jan 2018 10:51:17 +0000 Subject: [PATCH 1/2] Sort components by name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Components were being ordered by their filename but displayed their name in the component list. For some components such as “Form label” (label.html.erb), the component wasn’t appearing where expected. * Always sort the list of components by name --- .../govuk_publishing_components/component_doc_resolver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/govuk_publishing_components/component_doc_resolver.rb b/app/models/govuk_publishing_components/component_doc_resolver.rb index 1108f39c90..be36d7895c 100644 --- a/app/models/govuk_publishing_components/component_doc_resolver.rb +++ b/app/models/govuk_publishing_components/component_doc_resolver.rb @@ -10,7 +10,7 @@ def get(id) end def all - fetch_component_docs.map { |component| build(component) } + fetch_component_docs.map { |component| build(component) }.sort_by(&:name) end private From 5d22d75d79010ed3a4d746d3edfbddb0c1dee80c Mon Sep 17 00:00:00 2001 From: Paul Hayes Date: Wed, 3 Jan 2018 12:26:16 +0000 Subject: [PATCH 2/2] Change const to var in visual regression script Fixes error with Uglifier as we have not set a Harmony preference. --- .../govuk_publishing_components/visual-regression.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/govuk_publishing_components/visual-regression.js b/app/assets/javascripts/govuk_publishing_components/visual-regression.js index 48839181ea..65e3c8f2d5 100644 --- a/app/assets/javascripts/govuk_publishing_components/visual-regression.js +++ b/app/assets/javascripts/govuk_publishing_components/visual-regression.js @@ -2,7 +2,7 @@ window.GOVUK = window.GOVUK || {} window.GOVUK.VisualDiffTool = function (currentWindowLocation) { - const visualDiffSelector = 'visual-diff'; + var visualDiffSelector = 'visual-diff'; var existingIframe = document.getElementById(visualDiffSelector); var windowLocation = currentWindowLocation || window.location;