From 1dbbe5067c3a18a4387a288b7d725c2ea6db89a5 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Thu, 4 May 2017 21:03:46 +0200
Subject: [PATCH] 2.2.1 release

---
 dist/widgetjs.js     | 2 +-
 dist/widgetjs.min.js | 2 +-
 gulpfile.js          | 2 +-
 package.json         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/widgetjs.js b/dist/widgetjs.js
index e5cfc35b..f45254d3 100644
--- a/dist/widgetjs.js
+++ b/dist/widgetjs.js
@@ -893,7 +893,7 @@ define('htmlCanvas',[
 				}
 
 				else if (key === "klass") {
-					this.addClass(object[key]);
+					this.element.className = object[key];
 				} else {
 					this.setAttribute(key, object[key]);
 				}
diff --git a/dist/widgetjs.min.js b/dist/widgetjs.min.js
index a080b190..5d796a7c 100644
--- a/dist/widgetjs.min.js
+++ b/dist/widgetjs.min.js
@@ -4,4 +4,4 @@
  * see: http://github.com/jrburke/almond for details
  */
 
-!function(t,e){"function"==typeof define&&define.amd?define("widgetjs",["jquery","klassified"],e):t.widgetjs=e(t.$,t.klassified)}(this,function(t,e){var n,r,o;return function(t){function e(t,e){return w.call(t,e)}function i(t,e){var n,r,o,i,u,a,c,s,f,l,p,d=e&&e.split("/"),h=y.map,g=h&&h["*"]||{};if(t&&"."===t.charAt(0))if(e){for(d=d.slice(0,d.length-1),t=t.split("/"),u=t.length-1,y.nodeIdCompat&&k.test(t[u])&&(t[u]=t[u].replace(k,"")),t=d.concat(t),f=0;f<t.length;f+=1)if(p=t[f],"."===p)t.splice(f,1),f-=1;else if(".."===p){if(1===f&&(".."===t[2]||".."===t[0]))break;f>0&&(t.splice(f-1,2),f-=2)}t=t.join("/")}else 0===t.indexOf("./")&&(t=t.substring(2));if((d||g)&&h){for(n=t.split("/"),f=n.length;f>0;f-=1){if(r=n.slice(0,f).join("/"),d)for(l=d.length;l>0;l-=1)if(o=h[d.slice(0,l).join("/")],o&&(o=o[r])){i=o,a=f;break}if(i)break;!c&&g&&g[r]&&(c=g[r],s=f)}!i&&c&&(i=c,a=s),i&&(n.splice(0,a,i),t=n.join("/"))}return t}function u(e,n){return function(){return d.apply(t,T.call(arguments,0).concat([e,n]))}}function a(t){return function(e){return i(e,t)}}function c(t){return function(e){m[t]=e}}function s(n){if(e(v,n)){var r=v[n];delete v[n],b[n]=!0,p.apply(t,r)}if(!e(m,n)&&!e(b,n))throw new Error("No "+n);return m[n]}function f(t){var e,n=t?t.indexOf("!"):-1;return n>-1&&(e=t.substring(0,n),t=t.substring(n+1,t.length)),[e,t]}function l(t){return function(){return y&&y.config&&y.config[t]||{}}}var p,d,h,g,m={},v={},y={},b={},w=Object.prototype.hasOwnProperty,T=[].slice,k=/\.js$/;h=function(t,e){var n,r=f(t),o=r[0];return t=r[1],o&&(o=i(o,e),n=s(o)),o?t=n&&n.normalize?n.normalize(t,a(e)):i(t,e):(t=i(t,e),r=f(t),o=r[0],t=r[1],o&&(n=s(o))),{f:o?o+"!"+t:t,n:t,pr:o,p:n}},g={require:function(t){return u(t)},exports:function(t){var e=m[t];return"undefined"!=typeof e?e:m[t]={}},module:function(t){return{id:t,uri:"",exports:m[t],config:l(t)}}},p=function(n,r,o,i){var a,f,l,p,d,y,w=[],T=typeof o;if(i=i||n,"undefined"===T||"function"===T){for(r=!r.length&&o.length?["require","exports","module"]:r,d=0;d<r.length;d+=1)if(p=h(r[d],i),f=p.f,"require"===f)w[d]=g.require(n);else if("exports"===f)w[d]=g.exports(n),y=!0;else if("module"===f)a=w[d]=g.module(n);else if(e(m,f)||e(v,f)||e(b,f))w[d]=s(f);else{if(!p.p)throw new Error(n+" missing "+f);p.p.load(p.n,u(i,!0),c(f),{}),w[d]=m[f]}l=o?o.apply(m[n],w):void 0,n&&(a&&a.exports!==t&&a.exports!==m[n]?m[n]=a.exports:l===t&&y||(m[n]=l))}else n&&(m[n]=o)},n=r=d=function(e,n,r,o,i){if("string"==typeof e)return g[e]?g[e](n):s(h(e,n).f);if(!e.splice){if(y=e,y.deps&&d(y.deps,y.callback),!n)return;n.splice?(e=n,n=r,r=null):e=t}return n=n||function(){},"function"==typeof r&&(r=o,o=i),o?p(t,e,n,r):setTimeout(function(){p(t,e,n,r)},4),d},d.config=function(t){return d(t)},n._defined=m,o=function(t,n,r){n.splice||(r=n,n=[]),e(m,t)||e(v,t)||(v[t]=[t,n,r])},o.amd={jQuery:!0}}(),o("jquery",function(){return t}),o("klassified",function(){return e}),o("htmlCanvas",["jquery"],function(){function t(t){this.root=r({element:t})}function e(e){return new t(e)}function n(t){if(this.element=t.tag?this.createElement(t.tag):this.getElement(t.element),!this.element)throw new Error("htmlTagBrush requires an element");t.children&&this.append(t.children)}function r(t){return new n(t)}var o="a abbr acronym address area article aside audio b bdi bdo big blockquote body br button canvas caption cite code col colgroup command datalist dd del details dfn div dl dt em embed fieldset figcaption figure footer form frame frameset h1 h2 h3 h4 h5 h6 hr head header hgroup html i iframe img input ins kbd keygen label legend li link map mark meta meter nav noscript object ol optgroup option output p param pre progress q rp rtruby samp script section select small source span strong style sub summarysup table tbody td textarea tfoot th thead time title tr track tt ul varvideo wbr".split(" "),i="href for id media rel src style title type".split(" "),u={},a="blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error dragstart dragenter dragover dragleave drop dragend".split(" ");t.prototype.tag=function(t,e){var n=r({tag:t,children:e});return this.root.appendBrush(n),n},o.forEach(function(e){t.prototype[e]=function(){var t=Array.prototype.slice.call(arguments);return this.tag(e,t)}}),t.prototype.omit=function(){return u},t.prototype.render=function(){var t=Array.prototype.slice.call(arguments);this.root.render(t)},t.prototype.raw=function(t){this.root.raw(t)},t.prototype.renderNonBreaking=function(t){this.raw(t.replace(/\s/g,"&nbsp;"))};var c={};return n.prototype.createElement=function(t){return c[t]||(c[t]=document.createElement(t)),c[t].cloneNode(!1)},n.prototype.append=function(t){if(t.appendToBrush)return void t.appendToBrush(this);if("object"==typeof t)return void this.attr(t);throw new Error("Unsupported data type")},u.appendToBrush=function(t){},String.prototype.appendToBrush=function(t){t.appendString(this)},Function.prototype.appendToBrush=function(t){t.appendFunction(this)},Number.prototype.appendToBrush=function(t){this.toString().appendToBrush(t)},Array.prototype.appendToBrush=function(t){for(var e=this.length,n=e-1;n>=0;n--)t.append(this[e-n-1])},n.prototype.appendChild=function(t){this.element.canHaveChildren!==!1?this.element.appendChild(t):this.element.text=this.element.text+t.innerHTML},n.prototype.appendBrush=function(t){this.appendChild(t.element)},n.prototype.appendString=function(t){jQuery(this.element).append(document.createTextNode(t))},n.prototype.appendFunction=function(e){e(new t(this))},n.prototype.getElement=function(t){return void 0===t||null===t?document.createDocumentFragment():"object"==typeof t&&t.asJQuery?t.asJQuery().get(0):jQuery(t).get(0)},n.prototype.render=function(){for(var t=Array.prototype.slice.call(arguments),e=0;e<t.length;e++)this.append(t[e]);return this},n.prototype.appendToBrush=function(t){t.appendBrush(this)},n.prototype.html=function(t){return this.asJQuery().html(t),this},n.prototype.raw=function(t){return this.asJQuery().append(t),this},n.prototype.renderNonBreaking=function(t){this.raw(t.replace(/\s/g,"&nbsp;"))},n.prototype.on=function(t,e){return this.asJQuery().bind(t,e),this},a.forEach(function(t){n.prototype[t]=function(e){return this.on(t,e)}}),n.prototype.setAttribute=function(t,e){return e===u?this:(this.element.setAttribute(t,e),this)},i.forEach(function(t){n.prototype[t]=function(e){return this.setAttribute(t,e)}}),n.prototype.css=function(t,e){return"string"==typeof t?this.asJQuery().css(t,e):this.asJQuery().css(t),this},n.prototype.attr=function(t){for(var e in t)t.hasOwnProperty(e)&&("function"==typeof t[e]?this.on(e,t[e]):"klass"===e?this.addClass(t[e]):this.setAttribute(e,t[e]));return this},n.prototype.addClass=function(t){return this.asJQuery().addClass(t),this},n.prototype.removeClass=function(t){return this.asJQuery().removeClass(t),this},n.prototype.asJQuery=function(){return jQuery(this.element)},e}),o("widget-extensions",[],function(){return{}}),o("router/url",["klassified"],function(t){function e(t){return t.split(o).filter(Boolean)}function n(t){return t.replace(/\?.*$/g,"")}function r(t){var e,n=/[^?]*\?(.*)$/g.exec(t),r={};return n&&n.length>=2&&n[1].split("&").forEach(function(t){e=t.split("="),r[e[0]]=e[1]}),r}var o="/",i=t.object.subclass(function(t,o){var i,u,a,c;o.initialize=function(t){o.super(t),i=t.rawUrl||"",u=n(i),a=r(i),c=e(u)},t.getPath=function(){return u},t.getQuery=function(){return a},t.getSegments=function(){return c},t.matchRoute=function(e){return e.matchUrl(t)},t.toString=function(){return i}});return i.build=function(t,e){if("undefined"==typeof t||null===t||"string"!=typeof t)throw"accepts only string paths";if(e){var n=decodeURIComponent(jQuery.param(e));if(n)return i({rawUrl:t+"?"+n})}return i({rawUrl:t})},i}),o("router/abstractSegment",["klassified"],function(t){var e=t.object.subclass(function(t,e){e.initialize=function(t){e.super(t),e.segmentString=t.segmentString,e.options=t.options||{}},t.match=function(t){return!1},t.getValue=function(t){return e.segmentString},t.isParameter=function(){return!1},t.isOptional=function(){return!1},t.toString=function(){return e.segmentString}});return e.class(function(t){t.match=function(t){return!1}}),e}),o("router/parameterSegment",["./abstractSegment"],function(t){function e(t){if("function"==typeof t)return t;if(t instanceof RegExp){var e=new RegExp(t);return function(t){return e.test(t)}}if("[object Array]"===Object.prototype.toString.call(t)){var n=t.map(function(t){return t.toLowerCase()});return function(t){var e=t.toLowerCase();return n.indexOf(e)!==-1}}return null}var n=t.subclass(function(t,n){n.initialize=function(t){n.super(t),n.name=n.segmentString.substr(1),n.constraints=n.options.constraints&&n.options.constraints[n.name]&&[n.options.constraints[n.name]]||[],n.validators=n.constraints.map(e).filter(Boolean)},t.getName=function(){return n.name},t.getValue=function(t){return t},t.isParameter=function(){return!0},t.match=function(e){return void 0!==e&&t.validate(e)},t.validate=function(t){return n.validators.every(function(e){return e(t)})},t.toString=function(){return"param("+t.getName()+")"}});return n.class(function(t){t.match=function(t){return"#"===t.substr(0,1)}}),n}),o("router/optionalParameterSegment",["./parameterSegment"],function(t){var e=t.subclass(function(t,e){e.initialize=function(t){e.super(t),e.defaultValue=e.options.defaults&&e.options.defaults[e.name]},t.getValue=function(t){return void 0===t?e.defaultValue:t},t.isOptional=function(){return!0},t.toString=function(){return"optional("+t.getName()+")"}});return e.class(function(t){t.match=function(t){return"?"===t.substr(0,1)}}),e}),o("router/staticSegment",["./abstractSegment"],function(t){var e=t.subclass(function(t,e){return t.match=function(e){return t.getValue()===e},t});return e.class(function(t){t.match=function(t){return["#","?"].indexOf(t[0])===-1}}),e}),o("router/routeFactory",["./abstractSegment","./parameterSegment","./optionalParameterSegment","./staticSegment"],function(t){function e(t,e){if(!t)return[];e=e||{};var o=t.split(r),i=o.map(Function.prototype.call,String.prototype.trim).filter(Boolean),u=i.map(function(t){return n(t,e)});return u}function n(e,n){n=n||{};for(var r=t.allSubclasses(),o=0;o<r.length;o++){var i=r[o];if(i.match(e))return i({segmentString:e,options:n})}return null}var r="/";return e}),o("events",[],function(){function t(t,e){function n(t){return console.warn("Using an event as a function is deprecated. Send register() to the event instead."),n.register(t)}function r(t){t=t||{};var e={},n=t.callback,r=t.event;return e.isBound=function(){return void 0!==r},e.unbind=function(){e.isBound()&&(r.unregister(e),r=void 0)},e.bind=function(t){e.unbind(),t&&(r=t)},e.execute=function(t){n&&n.apply(e,t)},e}function o(t){var e=r({callback:t,event:n});return i.push(e),e}e=e||{};var i=[];return n.on=function(t){return console.warn("Sending on() to an event is deprecated. Send register() instead."),n.register(t)},n.register=function(t){return o(t)},n.onceOn=function(t){return console.warn("Sending onceOn() to an event is deprecated. Send registerOnce() instead."),n.registerOnce(t)},n.registerOnce=function(t){var o=r({callback:function(){e.remove(o),t.apply(n,arguments)}});return i.push(o),o},n.off=function(t){console.warn("Sending off() to an event is deprecated. Send unregister() instead."),n.unregister(t)},n.unregister=function(t){e.remove(t)},n.trigger=function(){var t=Array.prototype.slice.call(arguments);i.forEach(function(e){e.execute(t)})},n.dispose=function(){i.slice().forEach(function(t){t.unbind()})},e.push=function(t){i.push(t),t.bind(n)},e.remove=function(t){i.splice(i.indexOf(t),1)},n}function e(){function e(e){return n(e)||r(t(),e),i[e]}function n(t){return void 0!==i[t]}function r(t,e){return u.push(t),e&&(i[e]=t),t}var o={},i={},u=[];return o.createEvent=function(e){return r(t(),e)},o.on=function(t,e){return console.warn("Sending on() to a category is deprecated. Send register() instead."),o.register(t,e)},o.register=function(t,n){return e(t).register(n)},o.off=function(t,e){return console.warn("Sending off() to a category is deprecated. Send unregister() instead."),o.unregister(t,e)},o.unregister=function(t,n){return e(t).unregister(n)},o.onceOn=function(t,e){return console.warn("Sending onceOn() to a category is deprecated. Send registerOnce() instead."),o.registerOnce(t,e)},o.registerOnce=function(t,n){return e(t).registerOnce(n)},o.trigger=function(t){var n=Array.prototype.slice.call(arguments,1),r=e(t);r.trigger.apply(o,n)},o.dispose=function(){u.forEach(function(t){t.dispose()}),i={},u=[]},o}var n=function(){var t={},n={};return t.register=function(t){if(n[t])throw"A event category is already registered for "+t;return n[t]=e(),n[t]},t.at=function(e){return n[e]||t.register(e),n[e]},t}();return n.eventCategory=e,n.eventhandler=e,n.event=t,n}),o("router/routeMatchResult",["klassified"],function(t){var e=t.object.subclass(function(t,e){function n(t,e){var n={};for(var r in t)t.hasOwnProperty(r)&&(n[r]=t[r]);for(var o in e)e.hasOwnProperty(o)&&(n[o]=e[o]);return n}var r,o,i,u,a;e.initialize=function(t){e.super(t),r=t.url,o=t.route,i=r&&r.getQuery&&r.getQuery()||{},u=t.values||{},a=n(u,i)},t.getRoute=function(){return o},t.getUrl=function(){return r},t.isMatch=function(){return!0},t.getRouteParameters=function(){return u},t.getQueryParameters=function(){return r.getQuery()},t.getParameters=function(){return a},t.getActionArguments=function(){var t=Object.keys(u).map(function(t){return u[t]});return t.push(r.getQuery()),t}});return e.class(function(t){t.routeNoMatchResult=function(){var e=t();return e.isMatch=function(){return!1},e}()}),e}),o("router/route",["./routeFactory","events","./routeMatchResult","./url","klassified","jquery"],function(t,e,n,r,o){function i(t){var e,n,r=[],o=Math.pow(2,t.length);for(n=1;n<o;n++){e=[];var i=t.length-1;do 0!==(n&1<<i)&&e.unshift(t[i]);while(i--);r.unshift(e)}return r}var u=o.object.subclass(function(o,u){function a(t,e){return e=e||l,!(t.length!==e.length&&!p)&&e.every(function(e,n){var r=t[n];return void 0!==r&&e.match(r)})}function c(t){var e=t.getSegments();if(a(e))return l;var n;for(n=0;n<d.length;n++)if(a(e,d[n]))return d[n];return null}function s(){var t=[];if(l.forEach(function(e,n){e.isOptional()&&t.push(n)}),t.length>15)throw new Error('Too many optional arguments. "'+t.length+'" optionals would generate  '+Math.pow(2,t.length)+" optional sequences.");var e=i(t);e.forEach(function(t){var e=l.slice();t.forEach(function(t,n){e.splice(t-n,1)}),d.push(e)})}function f(t,e){var r=e.getSegments(),i={};return l.forEach(function(e){if(e.isParameter()){var n=t.indexOf(e);n>=0?i[e.getName()]=e.getValue(r[n]):i[e.getName()]=e.getValue()}}),n({route:o,url:e,values:i})}var l,p,d;u.initialize=function(e){u.super(),l=t(e.pattern,e.options),p=e.options&&e.options.ignoreTrailingSegments||!1,d=[],s()},u.events=e.eventCategory(),o.matched=u.events.createEvent("matched"),o.onMatched=o.matched,o.on=u.events.register,o.matchUrl=function(t){var e=c(t);if(!e)return n.routeNoMatchResult;var r=f(e,t);return u.events.trigger("matched",r),r},o.expand=function(t){t=t||{};var e=[];l.forEach(function(n){var r;if(r=n.isParameter()?t[n.getName()]:n.getValue(),void 0!==r||!n.isOptional()){if(!n.match(r))throw new Error("Could not generate a valid URL");e.push(r)}});var n={};return Object.keys(t).forEach(function(e){o.hasParameter(e)||(n[e]=t[e],n[e]instanceof Array&&(n[e]=n[e].join(",")))}),r.build(e.join("/"),n).toString()},o.hasParameter=function(t){return l.some(function(e){return e.isParameter()&&e.getName()===t})},o.toString=function(){return"route("+l.join("/")+")"}});return u}),o("router/hashLocation",["jquery","events","./url","klassified"],function(t,e,n,r){var o=!("onhashchange"in window),i=25,u=r.object.subclass(function(r,u){function a(){return window.location.hash}function c(t){window.location.hash=t}function s(t){return"string"==typeof t&&(t=n({rawUrl:t})),"#!/"+t.toString()}function f(t){return n({rawUrl:t.replace(/^#!?[\/]?/,"")})}function l(t){t=t||a(),u.currentHash!==t&&(u.currentHash=t,u.history.push(u.currentHash)),r.changed.trigger(f(u.currentHash))}function p(){var t=a(),e=u.currentHash!==t;e&&l(t)}var d=null;u.currentHash=void 0,u.history=[],u.events=e.eventCategory(),r.changed=u.events.createEvent("changed"),r.onChanged=r.changed,r.setUrl=function(t){var e=s(t);c(e),l(e)},r.getUrl=function(){return f(a())},r.linkToUrl=function(t){return s(t)},r.back=function(t){r.isHistoryEmpty()?t&&c(s(t)):(u.history.pop(),c(u.history.pop())),l()},r.isHistoryEmpty=function(){return u.history.length<=1},r.start=function(){r.stop(),u.currentHash=a(),u.history=[u.currentHash],o?d=setInterval(p,i):t(window).bind("hashchange",p)},r.stop=function(){d&&(clearInterval(d),d=null),t(window).unbind("hashchange",p)}});return u}),o("router/router",["events","./route","./url","./hashLocation","klassified","jquery"],function(t,e,n,r,o){function i(){return i.instance||(i.instance=r()),i.instance}var u=o.object.subclass(function(r,o){function u(){var t=Array.prototype.slice.call(arguments),e={};return t.forEach(function(t){Object.keys(t).forEach(function(n){e[n]=t[n]})}),e}o.initialize=function(t){o.super(t),o.location=t.locationHandler||i(),o.routeTable=[],o.lastMatch=void 0,o.defaultParameters={},o.location.changed.register(function(){o.resolveUrl()})},o.events=t.eventCategory(),r.routeMatched=o.events.createEvent("routeMatched"),r.onRouteMatched=r.routeMatched,r.routeNotFound=o.events.createEvent("routeNotFound"),r.onRouteNotFound=r.routeNotFound,r.onResolveUrl=o.events.createEvent("resolveUrl"),r.on=o.events.register,r.resolveUrl=function(t){"string"==typeof t&&(t=n({rawUrl:t})),o.resolveUrl(t)},r.addRoute=function(t){t=t||{};var n=e({pattern:t.pattern,options:t});return t.action&&n.matched.register(function(e){t.action.apply(this,e.getActionArguments())}),n.name=t.name,n.fallThrough=t.fallThrough,n.priority=t.priority,o.addRoute(n),n},r.findRoute=function(t){for(var e=o.routeTable.length,n=0;n<e;n++){var r=o.routeTable[n];if(t(r))return r}return null},r.getRouteByName=function(t){return r.findRoute(function(e){return e.name&&e.name===t})},r.removeRoute=function(t){var e=o.routeTable.indexOf(t);if(e===-1)throw new Error("Route not in route table");o.routeTable.splice(e,1)},r.clear=function(){o.routeTable=[],o.lastMatch=void 0},r.pipeRoute=function(t,e){if(!t||!t.pattern)throw new Error("Route pattern required");var n=r.addRoute(t);return n.matched.register(function(t){e.resolveUrl(t.getUrl())}),n},r.pipeNotFound=function(t){return r.routeNotFound.register(function(e){t.resolveUrl(e)})},r.getUrl=function(){return o.location.getUrl()},r.linkTo=function(t,e,n){var i=r.getRouteByName(t);return i?o.location.linkToUrl(r.expand({routeName:i.name,parameters:e,excludeCurrentParameters:!n})):r.linkToPath(t,e)},r.linkToPath=function(t,e){return r.linkToUrl(n.build(t,e))},r.linkToUrl=function(t){return o.location.linkToUrl(t)},r.redirectTo=function(t,e,n){var i=r.getRouteByName(t);return i?o.location.setUrl(r.expand({routeName:i.name,parameters:e,excludeCurrentParameters:!n})):r.redirectToPath(t,e)},r.redirectToPath=function(t,e){return r.redirectToUrl(n.build(t,e))},r.redirectToUrl=function(t){return o.location.setUrl(t)},r.expand=function(t){var i,a=t.routeName,c=t.parameters||{},s=t.excludeCurrentParameters||!1;i=a?r.getRouteByName(a)||e():o.lastMatch?o.lastMatch.getRoute():e();var f=s?{}:r.getParameters(),l=u(f,c);Object.keys(o.defaultParameters).forEach(function(t){t in l||(l[t]="function"==typeof o.defaultParameters[t]?o.defaultParameters[t]():o.defaultParameters[t])});var p=i.expand(l);return n({rawUrl:p})},r.linkToParameters=function(t,e){return o.location.linkToUrl(r.expand({parameters:t,excludeCurrentParameters:e}))},r.setParameters=function(t,e){r.redirectToUrl(r.expand({parameters:t,excludeCurrentParameters:e}))},r.getParameters=function(){return o.lastMatch?o.lastMatch.getParameters():o.location.getUrl().getQuery()},r.getParameter=function(t){var e=r.getParameters();return e[t]},r.setDefaultParameter=function(t,e){o.defaultParameters[t]=e},r.back=function(t){return o.location.back(t)},r.isHistoryEmpty=function(){return o.location.isHistoryEmpty()},r.start=function(){o.location.start(),o.resolveUrl()},r.stop=function(){o.location.stop()},o.resolveUrl=function(t){var e=void 0===t?o.location.getUrl():t;r.onResolveUrl.trigger(e);var n=0;o.routeTable.some(function(t){var i=e.matchRoute(t);return!(!i.isMatch()||(o.lastMatch=i,n++,r.routeMatched.trigger(i),void 0!==t.fallThrough&&t.fallThrough!==!1))||null}),0===n&&r.routeNotFound.trigger(e.toString())},o.addRoute=function(t){var e=o.routeTable.length;if(void 0!==t.priority){do--e;while(o.routeTable[e]&&(void 0===o.routeTable[e].priority||t.priority<o.routeTable[e].priority));e+=1}o.routeTable.splice(e,0,t)}});return u}),o("router",["./router/url","./router/route","./router/router"],function(t,e,n){var r=n();return{url:t,route:e,router:n,getRouter:function(){return r},setRouter:function(t){r=t}}}),o("widget",["klassified","./widget-extensions","./router","./events","./htmlCanvas","jquery"],function(t,e,n,r,o){function i(){return!!c.get()}function u(t,e){var n=c.get();try{c.set(e),t()}finally{c.set(n)}}var a=function(){var t={},e=0;return t.newId=function(){return e+=1,e.toString()},t}(),c=function(){var t;return{get:function(){return t},set:function(e){t=e}}}(),s=t.object.subclass(function(t,s){function f(e){s.withChildrenRegistration(function(){t.renderOn(e)})}var l,p;s.initialize=function(t){s.super(t),p=t.id||a.newId(),s.inUpdateTransaction=!1,l=[]},s.initializeSubwidgets=function(t){},s.postInitialize=function(t){s.initializeSubwidgets(t)},s.events=r.eventCategory(),t.onAttach=s.events.createEvent(),t.onDetach=s.events.createEvent(),t.getId=function(){return p},t.id=t.getId,t.dispose=function(){l.forEach(function(t){t.dispose()}),s.dispose(),s.events.dispose()},t.willDetach=function(){l.forEach(function(t){t.willDetach()}),s.willDetach(),t.onDetach.trigger()},t.appendTo=function(t){s.withAttachHooks(function(){f(o(t))})},t.replace=function(t){s.withAttachHooks(function(){var e=o(t);e.root.asJQuery().empty(),f(e)})},t.asJQuery=function(){return jQuery("#"+t.getId())},t.isRendered=function(){return t.asJQuery().length>0},t.appendToBrush=function(t){s.withAttachHooks(function(){f(o(t.asJQuery()))})},t.triggerWillAttach=function(){s.willAttach(),l.forEach(function(t){t.triggerWillAttach()})},t.triggerDidAttach=function(){s.didAttach(),l.forEach(function(t){t.triggerDidAttach()}),t.onAttach.trigger()},s.withAttachHooks=function(e){var n=i();n||t.triggerWillAttach(),e(),n||t.triggerDidAttach()},s.createEvent=function(e){t[e]=s.events.createEvent()},s.createEvents=function(){var t=Array.prototype.slice.apply(arguments);t.forEach(s.createEvent)},t.on=s.events.on,t.onceOn=s.events.onceOn,t.off=s.events.off,t.register=s.events.register,t.registerOnce=s.events.registerOnce,t.unregister=s.events.unregister,t.trigger=s.events.trigger,s.nextId=function(){return a.newId()},s.dispose=function(){},s.router=n.getRouter(),s.linkTo=s.router.linkTo,s.linkToPath=s.router.linkToPath,s.linkToUrl=s.router.linkToUrl,s.redirectTo=s.router.redirectTo,s.redirectToPath=s.router.redirectToPath,s.redirectToUrl=s.router.redirectToUrl,s.getParameters=s.router.getParameters,s.getParameter=s.router.getParameter,s.setParameters=s.router.setParameters,t.renderOn=function(e){s.renderRootOn(e).render(t.renderContentOn)},s.withChildrenRegistration=function(e){var n=c.get();n&&n.registerChild(t),u(function(){l=[],e()},t)},t.registerChild=function(t){l.push(t)},s.renderRootOn=function(t){return t.tag("widgetjs-widget").id(p)},t.renderContentOn=function(t){return s.subclassResponsibility()},s.willAttach=function(){},s.didAttach=function(){},s.willDetach=function(){},s.willUpdate=function(){},t.update=function(){!s.inUpdateTransaction&&t.isRendered()&&(s.willUpdate(),s.withAttachHooks(function(){var e=o();f(e);var n=document.getElementById(t.getId());n.parentNode.replaceChild(e.root.element,n)}))},t.withinTransaction=function(t,e){if(s.inUpdateTransaction)t();else try{s.inUpdateTransaction=!0,t()}finally{s.inUpdateTransaction=!1,e&&e()}},t.withUpdate=function(e){t.withinTransaction(e,t.update)},t.withNoUpdate=function(e){t.withinTransaction(e)};for(var d in e)e.hasOwnProperty(d)&&(s[d]=e[d]);return t});return s}),o("widgetjs",["./htmlCanvas","./widget","./widget-extensions","./router","./events"],function(t,e,n,r,o){return{htmlCanvas:t,widget:e,ext:n,router:r,events:o}}),r(["widgetjs"]),r("widgetjs")});
\ No newline at end of file
+!function(t,e){"function"==typeof define&&define.amd?define("widgetjs",["jquery","klassified"],e):t.widgetjs=e(t.$,t.klassified)}(this,function(t,e){var n,r,o;return function(t){function e(t,e){return w.call(t,e)}function i(t,e){var n,r,o,i,u,a,c,s,f,l,p,d=e&&e.split("/"),h=y.map,g=h&&h["*"]||{};if(t&&"."===t.charAt(0))if(e){for(d=d.slice(0,d.length-1),t=t.split("/"),u=t.length-1,y.nodeIdCompat&&k.test(t[u])&&(t[u]=t[u].replace(k,"")),t=d.concat(t),f=0;f<t.length;f+=1)if(p=t[f],"."===p)t.splice(f,1),f-=1;else if(".."===p){if(1===f&&(".."===t[2]||".."===t[0]))break;f>0&&(t.splice(f-1,2),f-=2)}t=t.join("/")}else 0===t.indexOf("./")&&(t=t.substring(2));if((d||g)&&h){for(n=t.split("/"),f=n.length;f>0;f-=1){if(r=n.slice(0,f).join("/"),d)for(l=d.length;l>0;l-=1)if(o=h[d.slice(0,l).join("/")],o&&(o=o[r])){i=o,a=f;break}if(i)break;!c&&g&&g[r]&&(c=g[r],s=f)}!i&&c&&(i=c,a=s),i&&(n.splice(0,a,i),t=n.join("/"))}return t}function u(e,n){return function(){return d.apply(t,T.call(arguments,0).concat([e,n]))}}function a(t){return function(e){return i(e,t)}}function c(t){return function(e){m[t]=e}}function s(n){if(e(v,n)){var r=v[n];delete v[n],b[n]=!0,p.apply(t,r)}if(!e(m,n)&&!e(b,n))throw new Error("No "+n);return m[n]}function f(t){var e,n=t?t.indexOf("!"):-1;return n>-1&&(e=t.substring(0,n),t=t.substring(n+1,t.length)),[e,t]}function l(t){return function(){return y&&y.config&&y.config[t]||{}}}var p,d,h,g,m={},v={},y={},b={},w=Object.prototype.hasOwnProperty,T=[].slice,k=/\.js$/;h=function(t,e){var n,r=f(t),o=r[0];return t=r[1],o&&(o=i(o,e),n=s(o)),o?t=n&&n.normalize?n.normalize(t,a(e)):i(t,e):(t=i(t,e),r=f(t),o=r[0],t=r[1],o&&(n=s(o))),{f:o?o+"!"+t:t,n:t,pr:o,p:n}},g={require:function(t){return u(t)},exports:function(t){var e=m[t];return"undefined"!=typeof e?e:m[t]={}},module:function(t){return{id:t,uri:"",exports:m[t],config:l(t)}}},p=function(n,r,o,i){var a,f,l,p,d,y,w=[],T=typeof o;if(i=i||n,"undefined"===T||"function"===T){for(r=!r.length&&o.length?["require","exports","module"]:r,d=0;d<r.length;d+=1)if(p=h(r[d],i),f=p.f,"require"===f)w[d]=g.require(n);else if("exports"===f)w[d]=g.exports(n),y=!0;else if("module"===f)a=w[d]=g.module(n);else if(e(m,f)||e(v,f)||e(b,f))w[d]=s(f);else{if(!p.p)throw new Error(n+" missing "+f);p.p.load(p.n,u(i,!0),c(f),{}),w[d]=m[f]}l=o?o.apply(m[n],w):void 0,n&&(a&&a.exports!==t&&a.exports!==m[n]?m[n]=a.exports:l===t&&y||(m[n]=l))}else n&&(m[n]=o)},n=r=d=function(e,n,r,o,i){if("string"==typeof e)return g[e]?g[e](n):s(h(e,n).f);if(!e.splice){if(y=e,y.deps&&d(y.deps,y.callback),!n)return;n.splice?(e=n,n=r,r=null):e=t}return n=n||function(){},"function"==typeof r&&(r=o,o=i),o?p(t,e,n,r):setTimeout(function(){p(t,e,n,r)},4),d},d.config=function(t){return d(t)},n._defined=m,o=function(t,n,r){n.splice||(r=n,n=[]),e(m,t)||e(v,t)||(v[t]=[t,n,r])},o.amd={jQuery:!0}}(),o("jquery",function(){return t}),o("klassified",function(){return e}),o("htmlCanvas",["jquery"],function(){function t(t){this.root=r({element:t})}function e(e){return new t(e)}function n(t){if(this.element=t.tag?this.createElement(t.tag):this.getElement(t.element),!this.element)throw new Error("htmlTagBrush requires an element");t.children&&this.append(t.children)}function r(t){return new n(t)}var o="a abbr acronym address area article aside audio b bdi bdo big blockquote body br button canvas caption cite code col colgroup command datalist dd del details dfn div dl dt em embed fieldset figcaption figure footer form frame frameset h1 h2 h3 h4 h5 h6 hr head header hgroup html i iframe img input ins kbd keygen label legend li link map mark meta meter nav noscript object ol optgroup option output p param pre progress q rp rtruby samp script section select small source span strong style sub summarysup table tbody td textarea tfoot th thead time title tr track tt ul varvideo wbr".split(" "),i="href for id media rel src style title type".split(" "),u={},a="blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error dragstart dragenter dragover dragleave drop dragend".split(" ");t.prototype.tag=function(t,e){var n=r({tag:t,children:e});return this.root.appendBrush(n),n},o.forEach(function(e){t.prototype[e]=function(){var t=Array.prototype.slice.call(arguments);return this.tag(e,t)}}),t.prototype.omit=function(){return u},t.prototype.render=function(){var t=Array.prototype.slice.call(arguments);this.root.render(t)},t.prototype.raw=function(t){this.root.raw(t)},t.prototype.renderNonBreaking=function(t){this.raw(t.replace(/\s/g,"&nbsp;"))};var c={};return n.prototype.createElement=function(t){return c[t]||(c[t]=document.createElement(t)),c[t].cloneNode(!1)},n.prototype.append=function(t){if(t.appendToBrush)return void t.appendToBrush(this);if("object"==typeof t)return void this.attr(t);throw new Error("Unsupported data type")},u.appendToBrush=function(t){},String.prototype.appendToBrush=function(t){t.appendString(this)},Function.prototype.appendToBrush=function(t){t.appendFunction(this)},Number.prototype.appendToBrush=function(t){this.toString().appendToBrush(t)},Array.prototype.appendToBrush=function(t){for(var e=this.length,n=e-1;n>=0;n--)t.append(this[e-n-1])},n.prototype.appendChild=function(t){this.element.canHaveChildren!==!1?this.element.appendChild(t):this.element.text=this.element.text+t.innerHTML},n.prototype.appendBrush=function(t){this.appendChild(t.element)},n.prototype.appendString=function(t){jQuery(this.element).append(document.createTextNode(t))},n.prototype.appendFunction=function(e){e(new t(this))},n.prototype.getElement=function(t){return void 0===t||null===t?document.createDocumentFragment():"object"==typeof t&&t.asJQuery?t.asJQuery().get(0):jQuery(t).get(0)},n.prototype.render=function(){for(var t=Array.prototype.slice.call(arguments),e=0;e<t.length;e++)this.append(t[e]);return this},n.prototype.appendToBrush=function(t){t.appendBrush(this)},n.prototype.html=function(t){return this.asJQuery().html(t),this},n.prototype.raw=function(t){return this.asJQuery().append(t),this},n.prototype.renderNonBreaking=function(t){this.raw(t.replace(/\s/g,"&nbsp;"))},n.prototype.on=function(t,e){return this.asJQuery().bind(t,e),this},a.forEach(function(t){n.prototype[t]=function(e){return this.on(t,e)}}),n.prototype.setAttribute=function(t,e){return e===u?this:(this.element.setAttribute(t,e),this)},i.forEach(function(t){n.prototype[t]=function(e){return this.setAttribute(t,e)}}),n.prototype.css=function(t,e){return"string"==typeof t?this.asJQuery().css(t,e):this.asJQuery().css(t),this},n.prototype.attr=function(t){for(var e in t)t.hasOwnProperty(e)&&("function"==typeof t[e]?this.on(e,t[e]):"klass"===e?this.element.className=t[e]:this.setAttribute(e,t[e]));return this},n.prototype.addClass=function(t){return this.asJQuery().addClass(t),this},n.prototype.removeClass=function(t){return this.asJQuery().removeClass(t),this},n.prototype.asJQuery=function(){return jQuery(this.element)},e}),o("widget-extensions",[],function(){return{}}),o("router/url",["klassified"],function(t){function e(t){return t.split(o).filter(Boolean)}function n(t){return t.replace(/\?.*$/g,"")}function r(t){var e,n=/[^?]*\?(.*)$/g.exec(t),r={};return n&&n.length>=2&&n[1].split("&").forEach(function(t){e=t.split("="),r[e[0]]=e[1]}),r}var o="/",i=t.object.subclass(function(t,o){var i,u,a,c;o.initialize=function(t){o.super(t),i=t.rawUrl||"",u=n(i),a=r(i),c=e(u)},t.getPath=function(){return u},t.getQuery=function(){return a},t.getSegments=function(){return c},t.matchRoute=function(e){return e.matchUrl(t)},t.toString=function(){return i}});return i.build=function(t,e){if("undefined"==typeof t||null===t||"string"!=typeof t)throw"accepts only string paths";if(e){var n=decodeURIComponent(jQuery.param(e));if(n)return i({rawUrl:t+"?"+n})}return i({rawUrl:t})},i}),o("router/abstractSegment",["klassified"],function(t){var e=t.object.subclass(function(t,e){e.initialize=function(t){e.super(t),e.segmentString=t.segmentString,e.options=t.options||{}},t.match=function(t){return!1},t.getValue=function(t){return e.segmentString},t.isParameter=function(){return!1},t.isOptional=function(){return!1},t.toString=function(){return e.segmentString}});return e.class(function(t){t.match=function(t){return!1}}),e}),o("router/parameterSegment",["./abstractSegment"],function(t){function e(t){if("function"==typeof t)return t;if(t instanceof RegExp){var e=new RegExp(t);return function(t){return e.test(t)}}if("[object Array]"===Object.prototype.toString.call(t)){var n=t.map(function(t){return t.toLowerCase()});return function(t){var e=t.toLowerCase();return n.indexOf(e)!==-1}}return null}var n=t.subclass(function(t,n){n.initialize=function(t){n.super(t),n.name=n.segmentString.substr(1),n.constraints=n.options.constraints&&n.options.constraints[n.name]&&[n.options.constraints[n.name]]||[],n.validators=n.constraints.map(e).filter(Boolean)},t.getName=function(){return n.name},t.getValue=function(t){return t},t.isParameter=function(){return!0},t.match=function(e){return void 0!==e&&t.validate(e)},t.validate=function(t){return n.validators.every(function(e){return e(t)})},t.toString=function(){return"param("+t.getName()+")"}});return n.class(function(t){t.match=function(t){return"#"===t.substr(0,1)}}),n}),o("router/optionalParameterSegment",["./parameterSegment"],function(t){var e=t.subclass(function(t,e){e.initialize=function(t){e.super(t),e.defaultValue=e.options.defaults&&e.options.defaults[e.name]},t.getValue=function(t){return void 0===t?e.defaultValue:t},t.isOptional=function(){return!0},t.toString=function(){return"optional("+t.getName()+")"}});return e.class(function(t){t.match=function(t){return"?"===t.substr(0,1)}}),e}),o("router/staticSegment",["./abstractSegment"],function(t){var e=t.subclass(function(t,e){return t.match=function(e){return t.getValue()===e},t});return e.class(function(t){t.match=function(t){return["#","?"].indexOf(t[0])===-1}}),e}),o("router/routeFactory",["./abstractSegment","./parameterSegment","./optionalParameterSegment","./staticSegment"],function(t){function e(t,e){if(!t)return[];e=e||{};var o=t.split(r),i=o.map(Function.prototype.call,String.prototype.trim).filter(Boolean),u=i.map(function(t){return n(t,e)});return u}function n(e,n){n=n||{};for(var r=t.allSubclasses(),o=0;o<r.length;o++){var i=r[o];if(i.match(e))return i({segmentString:e,options:n})}return null}var r="/";return e}),o("events",[],function(){function t(t,e){function n(t){return console.warn("Using an event as a function is deprecated. Send register() to the event instead."),n.register(t)}function r(t){t=t||{};var e={},n=t.callback,r=t.event;return e.isBound=function(){return void 0!==r},e.unbind=function(){e.isBound()&&(r.unregister(e),r=void 0)},e.bind=function(t){e.unbind(),t&&(r=t)},e.execute=function(t){n&&n.apply(e,t)},e}function o(t){var e=r({callback:t,event:n});return i.push(e),e}e=e||{};var i=[];return n.on=function(t){return console.warn("Sending on() to an event is deprecated. Send register() instead."),n.register(t)},n.register=function(t){return o(t)},n.onceOn=function(t){return console.warn("Sending onceOn() to an event is deprecated. Send registerOnce() instead."),n.registerOnce(t)},n.registerOnce=function(t){var o=r({callback:function(){e.remove(o),t.apply(n,arguments)}});return i.push(o),o},n.off=function(t){console.warn("Sending off() to an event is deprecated. Send unregister() instead."),n.unregister(t)},n.unregister=function(t){e.remove(t)},n.trigger=function(){var t=Array.prototype.slice.call(arguments);i.forEach(function(e){e.execute(t)})},n.dispose=function(){i.slice().forEach(function(t){t.unbind()})},e.push=function(t){i.push(t),t.bind(n)},e.remove=function(t){i.splice(i.indexOf(t),1)},n}function e(){function e(e){return n(e)||r(t(),e),i[e]}function n(t){return void 0!==i[t]}function r(t,e){return u.push(t),e&&(i[e]=t),t}var o={},i={},u=[];return o.createEvent=function(e){return r(t(),e)},o.on=function(t,e){return console.warn("Sending on() to a category is deprecated. Send register() instead."),o.register(t,e)},o.register=function(t,n){return e(t).register(n)},o.off=function(t,e){return console.warn("Sending off() to a category is deprecated. Send unregister() instead."),o.unregister(t,e)},o.unregister=function(t,n){return e(t).unregister(n)},o.onceOn=function(t,e){return console.warn("Sending onceOn() to a category is deprecated. Send registerOnce() instead."),o.registerOnce(t,e)},o.registerOnce=function(t,n){return e(t).registerOnce(n)},o.trigger=function(t){var n=Array.prototype.slice.call(arguments,1),r=e(t);r.trigger.apply(o,n)},o.dispose=function(){u.forEach(function(t){t.dispose()}),i={},u=[]},o}var n=function(){var t={},n={};return t.register=function(t){if(n[t])throw"A event category is already registered for "+t;return n[t]=e(),n[t]},t.at=function(e){return n[e]||t.register(e),n[e]},t}();return n.eventCategory=e,n.eventhandler=e,n.event=t,n}),o("router/routeMatchResult",["klassified"],function(t){var e=t.object.subclass(function(t,e){function n(t,e){var n={};for(var r in t)t.hasOwnProperty(r)&&(n[r]=t[r]);for(var o in e)e.hasOwnProperty(o)&&(n[o]=e[o]);return n}var r,o,i,u,a;e.initialize=function(t){e.super(t),r=t.url,o=t.route,i=r&&r.getQuery&&r.getQuery()||{},u=t.values||{},a=n(u,i)},t.getRoute=function(){return o},t.getUrl=function(){return r},t.isMatch=function(){return!0},t.getRouteParameters=function(){return u},t.getQueryParameters=function(){return r.getQuery()},t.getParameters=function(){return a},t.getActionArguments=function(){var t=Object.keys(u).map(function(t){return u[t]});return t.push(r.getQuery()),t}});return e.class(function(t){t.routeNoMatchResult=function(){var e=t();return e.isMatch=function(){return!1},e}()}),e}),o("router/route",["./routeFactory","events","./routeMatchResult","./url","klassified","jquery"],function(t,e,n,r,o){function i(t){var e,n,r=[],o=Math.pow(2,t.length);for(n=1;n<o;n++){e=[];var i=t.length-1;do 0!==(n&1<<i)&&e.unshift(t[i]);while(i--);r.unshift(e)}return r}var u=o.object.subclass(function(o,u){function a(t,e){return e=e||l,!(t.length!==e.length&&!p)&&e.every(function(e,n){var r=t[n];return void 0!==r&&e.match(r)})}function c(t){var e=t.getSegments();if(a(e))return l;var n;for(n=0;n<d.length;n++)if(a(e,d[n]))return d[n];return null}function s(){var t=[];if(l.forEach(function(e,n){e.isOptional()&&t.push(n)}),t.length>15)throw new Error('Too many optional arguments. "'+t.length+'" optionals would generate  '+Math.pow(2,t.length)+" optional sequences.");var e=i(t);e.forEach(function(t){var e=l.slice();t.forEach(function(t,n){e.splice(t-n,1)}),d.push(e)})}function f(t,e){var r=e.getSegments(),i={};return l.forEach(function(e){if(e.isParameter()){var n=t.indexOf(e);n>=0?i[e.getName()]=e.getValue(r[n]):i[e.getName()]=e.getValue()}}),n({route:o,url:e,values:i})}var l,p,d;u.initialize=function(e){u.super(),l=t(e.pattern,e.options),p=e.options&&e.options.ignoreTrailingSegments||!1,d=[],s()},u.events=e.eventCategory(),o.matched=u.events.createEvent("matched"),o.onMatched=o.matched,o.on=u.events.register,o.matchUrl=function(t){var e=c(t);if(!e)return n.routeNoMatchResult;var r=f(e,t);return u.events.trigger("matched",r),r},o.expand=function(t){t=t||{};var e=[];l.forEach(function(n){var r;if(r=n.isParameter()?t[n.getName()]:n.getValue(),void 0!==r||!n.isOptional()){if(!n.match(r))throw new Error("Could not generate a valid URL");e.push(r)}});var n={};return Object.keys(t).forEach(function(e){o.hasParameter(e)||(n[e]=t[e],n[e]instanceof Array&&(n[e]=n[e].join(",")))}),r.build(e.join("/"),n).toString()},o.hasParameter=function(t){return l.some(function(e){return e.isParameter()&&e.getName()===t})},o.toString=function(){return"route("+l.join("/")+")"}});return u}),o("router/hashLocation",["jquery","events","./url","klassified"],function(t,e,n,r){var o=!("onhashchange"in window),i=25,u=r.object.subclass(function(r,u){function a(){return window.location.hash}function c(t){window.location.hash=t}function s(t){return"string"==typeof t&&(t=n({rawUrl:t})),"#!/"+t.toString()}function f(t){return n({rawUrl:t.replace(/^#!?[\/]?/,"")})}function l(t){t=t||a(),u.currentHash!==t&&(u.currentHash=t,u.history.push(u.currentHash)),r.changed.trigger(f(u.currentHash))}function p(){var t=a(),e=u.currentHash!==t;e&&l(t)}var d=null;u.currentHash=void 0,u.history=[],u.events=e.eventCategory(),r.changed=u.events.createEvent("changed"),r.onChanged=r.changed,r.setUrl=function(t){var e=s(t);c(e),l(e)},r.getUrl=function(){return f(a())},r.linkToUrl=function(t){return s(t)},r.back=function(t){r.isHistoryEmpty()?t&&c(s(t)):(u.history.pop(),c(u.history.pop())),l()},r.isHistoryEmpty=function(){return u.history.length<=1},r.start=function(){r.stop(),u.currentHash=a(),u.history=[u.currentHash],o?d=setInterval(p,i):t(window).bind("hashchange",p)},r.stop=function(){d&&(clearInterval(d),d=null),t(window).unbind("hashchange",p)}});return u}),o("router/router",["events","./route","./url","./hashLocation","klassified","jquery"],function(t,e,n,r,o){function i(){return i.instance||(i.instance=r()),i.instance}var u=o.object.subclass(function(r,o){function u(){var t=Array.prototype.slice.call(arguments),e={};return t.forEach(function(t){Object.keys(t).forEach(function(n){e[n]=t[n]})}),e}o.initialize=function(t){o.super(t),o.location=t.locationHandler||i(),o.routeTable=[],o.lastMatch=void 0,o.defaultParameters={},o.location.changed.register(function(){o.resolveUrl()})},o.events=t.eventCategory(),r.routeMatched=o.events.createEvent("routeMatched"),r.onRouteMatched=r.routeMatched,r.routeNotFound=o.events.createEvent("routeNotFound"),r.onRouteNotFound=r.routeNotFound,r.onResolveUrl=o.events.createEvent("resolveUrl"),r.on=o.events.register,r.resolveUrl=function(t){"string"==typeof t&&(t=n({rawUrl:t})),o.resolveUrl(t)},r.addRoute=function(t){t=t||{};var n=e({pattern:t.pattern,options:t});return t.action&&n.matched.register(function(e){t.action.apply(this,e.getActionArguments())}),n.name=t.name,n.fallThrough=t.fallThrough,n.priority=t.priority,o.addRoute(n),n},r.findRoute=function(t){for(var e=o.routeTable.length,n=0;n<e;n++){var r=o.routeTable[n];if(t(r))return r}return null},r.getRouteByName=function(t){return r.findRoute(function(e){return e.name&&e.name===t})},r.removeRoute=function(t){var e=o.routeTable.indexOf(t);if(e===-1)throw new Error("Route not in route table");o.routeTable.splice(e,1)},r.clear=function(){o.routeTable=[],o.lastMatch=void 0},r.pipeRoute=function(t,e){if(!t||!t.pattern)throw new Error("Route pattern required");var n=r.addRoute(t);return n.matched.register(function(t){e.resolveUrl(t.getUrl())}),n},r.pipeNotFound=function(t){return r.routeNotFound.register(function(e){t.resolveUrl(e)})},r.getUrl=function(){return o.location.getUrl()},r.linkTo=function(t,e,n){var i=r.getRouteByName(t);return i?o.location.linkToUrl(r.expand({routeName:i.name,parameters:e,excludeCurrentParameters:!n})):r.linkToPath(t,e)},r.linkToPath=function(t,e){return r.linkToUrl(n.build(t,e))},r.linkToUrl=function(t){return o.location.linkToUrl(t)},r.redirectTo=function(t,e,n){var i=r.getRouteByName(t);return i?o.location.setUrl(r.expand({routeName:i.name,parameters:e,excludeCurrentParameters:!n})):r.redirectToPath(t,e)},r.redirectToPath=function(t,e){return r.redirectToUrl(n.build(t,e))},r.redirectToUrl=function(t){return o.location.setUrl(t)},r.expand=function(t){var i,a=t.routeName,c=t.parameters||{},s=t.excludeCurrentParameters||!1;i=a?r.getRouteByName(a)||e():o.lastMatch?o.lastMatch.getRoute():e();var f=s?{}:r.getParameters(),l=u(f,c);Object.keys(o.defaultParameters).forEach(function(t){t in l||(l[t]="function"==typeof o.defaultParameters[t]?o.defaultParameters[t]():o.defaultParameters[t])});var p=i.expand(l);return n({rawUrl:p})},r.linkToParameters=function(t,e){return o.location.linkToUrl(r.expand({parameters:t,excludeCurrentParameters:e}))},r.setParameters=function(t,e){r.redirectToUrl(r.expand({parameters:t,excludeCurrentParameters:e}))},r.getParameters=function(){return o.lastMatch?o.lastMatch.getParameters():o.location.getUrl().getQuery()},r.getParameter=function(t){var e=r.getParameters();return e[t]},r.setDefaultParameter=function(t,e){o.defaultParameters[t]=e},r.back=function(t){return o.location.back(t)},r.isHistoryEmpty=function(){return o.location.isHistoryEmpty()},r.start=function(){o.location.start(),o.resolveUrl()},r.stop=function(){o.location.stop()},o.resolveUrl=function(t){var e=void 0===t?o.location.getUrl():t;r.onResolveUrl.trigger(e);var n=0;o.routeTable.some(function(t){var i=e.matchRoute(t);return!(!i.isMatch()||(o.lastMatch=i,n++,r.routeMatched.trigger(i),void 0!==t.fallThrough&&t.fallThrough!==!1))||null}),0===n&&r.routeNotFound.trigger(e.toString())},o.addRoute=function(t){var e=o.routeTable.length;if(void 0!==t.priority){do--e;while(o.routeTable[e]&&(void 0===o.routeTable[e].priority||t.priority<o.routeTable[e].priority));e+=1}o.routeTable.splice(e,0,t)}});return u}),o("router",["./router/url","./router/route","./router/router"],function(t,e,n){var r=n();return{url:t,route:e,router:n,getRouter:function(){return r},setRouter:function(t){r=t}}}),o("widget",["klassified","./widget-extensions","./router","./events","./htmlCanvas","jquery"],function(t,e,n,r,o){function i(){return!!c.get()}function u(t,e){var n=c.get();try{c.set(e),t()}finally{c.set(n)}}var a=function(){var t={},e=0;return t.newId=function(){return e+=1,e.toString()},t}(),c=function(){var t;return{get:function(){return t},set:function(e){t=e}}}(),s=t.object.subclass(function(t,s){function f(e){s.withChildrenRegistration(function(){t.renderOn(e)})}var l,p;s.initialize=function(t){s.super(t),p=t.id||a.newId(),s.inUpdateTransaction=!1,l=[]},s.initializeSubwidgets=function(t){},s.postInitialize=function(t){s.initializeSubwidgets(t)},s.events=r.eventCategory(),t.onAttach=s.events.createEvent(),t.onDetach=s.events.createEvent(),t.getId=function(){return p},t.id=t.getId,t.dispose=function(){l.forEach(function(t){t.dispose()}),s.dispose(),s.events.dispose()},t.willDetach=function(){l.forEach(function(t){t.willDetach()}),s.willDetach(),t.onDetach.trigger()},t.appendTo=function(t){s.withAttachHooks(function(){f(o(t))})},t.replace=function(t){s.withAttachHooks(function(){var e=o(t);e.root.asJQuery().empty(),f(e)})},t.asJQuery=function(){return jQuery("#"+t.getId())},t.isRendered=function(){return t.asJQuery().length>0},t.appendToBrush=function(t){s.withAttachHooks(function(){f(o(t.asJQuery()))})},t.triggerWillAttach=function(){s.willAttach(),l.forEach(function(t){t.triggerWillAttach()})},t.triggerDidAttach=function(){s.didAttach(),l.forEach(function(t){t.triggerDidAttach()}),t.onAttach.trigger()},s.withAttachHooks=function(e){var n=i();n||t.triggerWillAttach(),e(),n||t.triggerDidAttach()},s.createEvent=function(e){t[e]=s.events.createEvent()},s.createEvents=function(){var t=Array.prototype.slice.apply(arguments);t.forEach(s.createEvent)},t.on=s.events.on,t.onceOn=s.events.onceOn,t.off=s.events.off,t.register=s.events.register,t.registerOnce=s.events.registerOnce,t.unregister=s.events.unregister,t.trigger=s.events.trigger,s.nextId=function(){return a.newId()},s.dispose=function(){},s.router=n.getRouter(),s.linkTo=s.router.linkTo,s.linkToPath=s.router.linkToPath,s.linkToUrl=s.router.linkToUrl,s.redirectTo=s.router.redirectTo,s.redirectToPath=s.router.redirectToPath,s.redirectToUrl=s.router.redirectToUrl,s.getParameters=s.router.getParameters,s.getParameter=s.router.getParameter,s.setParameters=s.router.setParameters,t.renderOn=function(e){s.renderRootOn(e).render(t.renderContentOn)},s.withChildrenRegistration=function(e){var n=c.get();n&&n.registerChild(t),u(function(){l=[],e()},t)},t.registerChild=function(t){l.push(t)},s.renderRootOn=function(t){return t.tag("widgetjs-widget").id(p)},t.renderContentOn=function(t){return s.subclassResponsibility()},s.willAttach=function(){},s.didAttach=function(){},s.willDetach=function(){},s.willUpdate=function(){},t.update=function(){!s.inUpdateTransaction&&t.isRendered()&&(s.willUpdate(),s.withAttachHooks(function(){var e=o();f(e);var n=document.getElementById(t.getId());n.parentNode.replaceChild(e.root.element,n)}))},t.withinTransaction=function(t,e){if(s.inUpdateTransaction)t();else try{s.inUpdateTransaction=!0,t()}finally{s.inUpdateTransaction=!1,e&&e()}},t.withUpdate=function(e){t.withinTransaction(e,t.update)},t.withNoUpdate=function(e){t.withinTransaction(e)};for(var d in e)e.hasOwnProperty(d)&&(s[d]=e[d]);return t});return s}),o("widgetjs",["./htmlCanvas","./widget","./widget-extensions","./router","./events"],function(t,e,n,r,o){return{htmlCanvas:t,widget:e,ext:n,router:r,events:o}}),r(["widgetjs"]),r("widgetjs")});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 63dcdcf5..78d9bf96 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -32,7 +32,7 @@ var wrap = {
 	"}));"
 };
 
-var sources = ["./src/[!test]/**/*.js"];
+var sources = ["./src/**/*.js", "!src/test/"];
 var misc = ["./gulpfile.js", "./eslintrc.js"];
 var tests = ["./src/test/**/*.js"];
 var all = sources.slice().concat(misc).concat(tests);
diff --git a/package.json b/package.json
index 2c8f4248..57ddacb4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "widgetjs",
   "description": "A framework for building JavaScript applications with widgets.",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "homepage": "http://github.com/foretagsplatsen/widgetjs",
   "author": "Företagsplatsen A.B.",
   "contributors": [