Parser fix, don't treat & as a separator.

Author: jcbrand

changes.md

@@ -10,6 +10,7 @@
 - New pattern: `pat-tabs`. See the relevant documentation.
 - Bugfix: `pat-validation` still validates removed clones from `pat-clone`.
 - Let the next-href option of pat-inject work as advertised.
+- Parser fix: don't treat `&` as a separator
 - #436 Remove `pat-bumper` restriction that scroll container must be the direct parent.
 
 ## 2.0.12 - Oct. 9, 2015

src/core/parser.js

@@ -229,7 +229,7 @@ define([
 
         _parseExtendedNotation: function argParserParseExtendedNotation(argstring) {
             var opts = {};
-            var parts = argstring.replace(";;", "\xff").split(";")
+            var parts = argstring.replace(";;", "\xff").replace("&", "&amp\xff").split(/;/)
                         .map(function(el) { return el.replace("\xff", ";"); });
             _.each(parts, function (part, i) {
                 if (!part) { return; }

tests/specs/core/parser.js

@@ -234,6 +234,16 @@ define(["underscore", "pat-parser"], function(_, ArgumentParser) {
                     expect(opts).toEqual({foo: "bar"});
                 });
 
+                it("doesn't treat an escaped ampersand as a semicolon", function() {
+                    var parser=new ArgumentParser();
+                    parser.addArgument("foo");
+                    parser.addArgument("bar");
+                    parser.addArgument("baz");
+                    var opts = parser._parse("foo: one&bar: still one;baz: three");
+                    expect(opts).toEqual({foo: "one&bar: still one",
+                                          baz: "three"});
+                });
+
                 it("treats semicolons as escaped when duplicated", function() {
                     var parser=new ArgumentParser();
                     parser.addArgument("foo");