govuk_admin_template 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b446a77b5540fe25898d6d3d4ddb8d1d019e98
-  data.tar.gz: 41e69f7e09148dd7127e1eaea2a5aff923d8530f
+  metadata.gz: 5dcd6d554293f6eb45fa6666b54ee2066b517c50
+  data.tar.gz: 4f965d6a42d966acb878a495d886d25cb743e339
 SHA512:
-  metadata.gz: 5b18bfbc9babd4668e0e83f5809b126a1a0a4088534bfb8e21ecc85fea7bf8779c142510620f8a5cd71f65c71c478ebc318582662b8c9fab5dc98c31706af105
-  data.tar.gz: b2b2d9ed13c2a77ae1f728f437f65de8084b711f29ca0f61cd97654431d918adf0fe357d4dac48147cc5632c1250470b03bbfcd17d0851c059be99973f8e6190
+  metadata.gz: 364d87846817a5f58d08d2a91bcba0e4abdbec0817c72edc72b0e236137af6de8febb1798e35417feb91a282c61ed3597e3b3069fbe94593fb6b89d07998de4f
+  data.tar.gz: 6d08370f1075f350aa38c17f138283d522947f9ccad72b7b3e903bb1997a018ce1723ec4f2bead3c2827cb86667cb4d7cc7572cd1713f11545156c185c8d5955

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.5.0
+
+* Allow apps to disable Google Analytics
+* Fix table filtering for queries containing special characters
+
 # 2.4.0
 
 * Add a table filter partial for re-use in apps

data/README.md

@@ -82,7 +82,8 @@ The gem [uses nested layouts](http://guides.rubyonrails.org/layouts_and_renderin
 `:footer_top` (optional) | Footer content before copyright text
 `:footer_version` (optional) | Text indicating the release, eg commit SHA
 `:body_end` (optional) | Just before the `</body>` tag
-`:full_width` (optional, boolean) | Expand content to edges of screen. Must be used on a per-page basis. Apps must not be full width by default.
+`:full_width` (optional, boolean) | Expand content to edges of screen.
+`:exclude_analytics` (optional, boolean) | Don’t use the default Google Analytics snippet and profile.
 `:navbar` (optional) | Custom navbar content, overrides default navbar
 
 Example navbar_items:

data/app/assets/javascripts/govuk-admin-template/modules/filterable_table.js

@@ -20,7 +20,7 @@
 
       function filterTableBasedOnInput(event) {
         var searchString = $.trim(tableInput.val()),
-            regExp = new RegExp(searchString, 'i');
+            regExp = new RegExp(escapeStringForRegexp(searchString), 'i');
 
         rows.each(function() {
           var row = $(this);
@@ -37,6 +37,13 @@
         var link = element.find('a.js-open-on-submit:visible').first();
         GOVUKAdmin.redirect(link.attr('href'));
       }
+
+      // http://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
+      // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/regexp
+      // Escape ~!@#$%^&*(){}[]`/=?+\|-_;:'",<.>
+      function escapeStringForRegexp(str) {
+        return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+      }
     }
   };
 

data/app/views/layouts/govuk_admin_template.html.erb

@@ -96,17 +96,19 @@
       </footer>
     </section>
     <%= yield :body_end %>
-    <% if Rails.env.production? %>
-      <script class="analytics">
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <% unless content_for?(:exclude_analytics) %>
+      <% if Rails.env.production? %>
+        <script class="analytics">
+          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-        ga('create', 'UA-26179049-6', 'alphagov.co.uk');
-        ga('set', 'anonymizeIp', true);
-        ga('send', 'pageview');
-      </script>
+          ga('create', 'UA-26179049-6', 'alphagov.co.uk');
+          ga('set', 'anonymizeIp', true);
+          ga('send', 'pageview');
+        </script>
+      <% end %>
     <% end %>
   </body>
 </html>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Styles, scripts and templates for GOV.UK admin applications