Merge branch 'dev-2.11'

src/index.html

@@ -11,7 +11,7 @@
 
 
   <!-- Pull in correct theme configuration, then use Require.js to manage dependencies -->
-  <script id="loader" type="text/javascript" src="/metacatui/loader.js?v=2.11.4"
+  <script id="loader" type="text/javascript" src="/metacatui/loader.js?v=2.11.5"
   	data-theme="default"
   	data-metacat-context="metacat"
   	data-map-key="YOUR-GOOGLE-MAPS-API-KEY"

src/js/models/filters/Filter.js

@@ -337,13 +337,12 @@ define(['jquery', 'underscore', 'backbone'],
         //Trim off whitespace
         value = value.trim();
 
-        //Escape special characters
-        value = this.escapeSpecialChar(value);
-
-
         var dateRangeRegEx = /^\[((\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d*Z)|\*)( |%20)TO( |%20)((\d{4}-[01]\d-[0-3]\dT[0-2]\d(:|\\:)[0-5]\d(:|\\:)[0-5]\d\.\d*Z)|\*)\]/,
             isDateRange = dateRangeRegEx.test(value);
 
+        //Escape special characters
+        value = this.escapeSpecialChar(value);
+
         //If the value is a search phrase (more than one word), and not a date range string, wrap in quotes
         if( value.indexOf(" ") > -1 && !isDateRange ){
           valuesQueryString += "\"" + value + "\"";

src/js/views/filters/FilterGroupsView.js

@@ -758,6 +758,13 @@ define(['jquery', 'underscore', 'backbone',
           var modelValues = filterModel.get("values"),
               thisValue   = $(appliedFilterEl).data("value");
 
+          //Numbers that are set on the element `data` are stored as type `number`, but when `number`s are
+          // set on Backbone models, they are converted to `string`s. So we need to check for this use case.
+          if( typeof thisValue == "number" ){
+            //Convert the number to a string
+            thisValue = thisValue.toString();
+          }
+
           //Remove the value that was in this applied filter
           var newValues = _.without(modelValues, thisValue);
 

src/loader.js

@@ -24,7 +24,7 @@ MetacatUI.root = "/metacatui"
 MetacatUI.root = MetacatUI.root.replace(/\/$/, "");
 
 //This version of Metacat UI - used for cache busting
-MetacatUI.metacatUIVersion = "2.11.4";
+MetacatUI.metacatUIVersion = "2.11.5";
 
 MetacatUI.loadTheme = function(theme) {
     var script = document.createElement("script");