From 3bfd75ab445ee2f1dd55275465059ed116b10b27 Mon Sep 17 00:00:00 2001
From: christopherthielen <github@sandgnat.com>
Date: Thu, 20 Nov 2014 18:09:28 -0600
Subject: [PATCH] fix($urlMatcherFactory): add 'any' Type for non-encoding
 non-url params

- Allow arbitrary data be passed to a state as a parameter. Do not attempt to encode/decode the parameter.
- Store the location of the parameter: either "search", "path", or "config" (non-url params are "config")

Closes #1562
---
 src/state.js             |  2 +-
 src/urlMatcherFactory.js | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/state.js b/src/state.js
index 117e3952b..f55d9634b 100644
--- a/src/state.js
+++ b/src/state.js
@@ -68,7 +68,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
     ownParams: function(state) {
       var params = state.url && state.url.params || new $$UMFP.ParamSet();
       forEach(state.params || {}, function(config, id) {
-        if (!params[id]) params[id] = new $$UMFP.Param(id, null, config);
+        if (!params[id]) params[id] = new $$UMFP.Param(id, null, config, "config");
       });
       return params;
     },
diff --git a/src/urlMatcherFactory.js b/src/urlMatcherFactory.js
index 4ea8a8a87..ae750ec44 100644
--- a/src/urlMatcherFactory.js
+++ b/src/urlMatcherFactory.js
@@ -611,6 +611,13 @@ function $UrlMatcherFactory() {
       is: angular.isObject,
       equals: angular.equals,
       pattern: /[^/]*/
+    },
+    any: { // does not encode/decode
+      encode: angular.identity,
+      decode: angular.identity,
+      is: angular.identity,
+      equals: angular.equals,
+      pattern: /.*/
     }
   };
 
@@ -878,7 +885,7 @@ function $UrlMatcherFactory() {
   this.Param = function Param(id, type, config, location) {
     var self = this;
     config = unwrapShorthand(config);
-    type = getType(config, type);
+    type = getType(config, type, location);
     var arrayMode = getArrayMode();
     type = arrayMode ? type.$asArray(arrayMode, location === "search") : type;
     if (type.name === "string" && !arrayMode && location === "path" && config.value === undefined)
@@ -896,10 +903,10 @@ function $UrlMatcherFactory() {
       return config;
     }
 
-    function getType(config, urlType) {
+    function getType(config, urlType, location) {
       if (config.type && urlType) throw new Error("Param '"+id+"' has two type configurations.");
       if (urlType) return urlType;
-      if (!config.type) return $types.string;
+      if (!config.type) return (location === "config" ? $types.any : $types.string);
       return config.type instanceof Type ? config.type : new Type(config.type);
     }
 
@@ -960,13 +967,14 @@ function $UrlMatcherFactory() {
     extend(this, {
       id: id,
       type: type,
+      location: location,
       array: arrayMode,
-      config: config,
       squash: squash,
       replace: replace,
       isOptional: isOptional,
-      dynamic: undefined,
       value: $value,
+      dynamic: undefined,
+      config: config,
       toString: toString
     });
   };
@@ -1013,7 +1021,7 @@ function $UrlMatcherFactory() {
         param = self[key];
         val = paramValues[key];
         isOptional = !val && param.isOptional;
-        result = result && (isOptional || param.type.is(val));
+        result = result && (isOptional || !!param.type.is(val));
       });
       return result;
     },